Changeset df3c6f02 in mainline for uspace/lib/net

Timestamp:

2011-05-31T22:58:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/lib/net

Files:

• generic/net_checksum.c (modified) (1 diff)
• il/ip_client.c (modified) (6 diffs)
• include/ip_client.h (modified) (1 diff)
• include/ip_header.h (modified) (5 diffs)
• tl/socket_core.c (modified) (3 diffs)

uspace/lib/net/generic/net_checksum.c

@@ -106 +106 @@
                                 seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
                         } else {
-                                /* shift otherwise */
+                                /* Shift otherwise */
                                 seed <<= 1;
                         }

uspace/lib/net/il/ip_client.c

@@ -123 +123 @@
                 return EOK;
 
-        /* TODO IPv6 */
-/*      case AF_INET6:
+        // TODO IPv6
+#if 0
+        case AF_INET6:
                 if (addrlen != sizeof(struct sockaddr_in6))
                         return EINVAL;
@@ -130 +131 @@
                 address_in6 = (struct sockaddr_in6 *) addr;
                 return EOK;
-*/
+#endif
 
         default:
@@ -180 +181 @@
         /* Set the header */
         header = (ip_header_t *) data;
-        header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
-            ipopt_length);
+        SET_IP_HEADER_LENGTH(header,
+            (IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + ipopt_length)));
         header->ttl = (ttl ? ttl : IPDEFTTL);
         header->tos = tos;
@@ -187 +188 @@
 
         if (dont_fragment)
-                header->flags = IPFLAG_DONT_FRAGMENT;
+                SET_IP_HEADER_FLAGS(header, IPFLAG_DONT_FRAGMENT);
 
         return EOK;
@@ -226 +227 @@
                 *tos = header->tos;
         if (dont_fragment)
-                *dont_fragment = header->flags & IPFLAG_DONT_FRAGMENT;
+                *dont_fragment = GET_IP_HEADER_FLAGS(header) & IPFLAG_DONT_FRAGMENT;
         if (ipopt_length) {
                 *ipopt_length = IP_HEADER_LENGTH(header) - sizeof(ip_header_t);
@@ -258 +259 @@
                 header_in->data_length = htons(data_length);
                 return EOK;
-        /* TODO IPv6 */
+        // TODO IPv6
         } else {
                 return EINVAL;

uspace/lib/net/include/ip_client.h

@@ -54 +54 @@
     socklen_t, struct sockaddr *, socklen_t, size_t, void **, size_t *);
 
-/* TODO ipopt manipulation */
+// TODO ipopt manipulation
 
 #endif

uspace/lib/net/include/ip_header.h

@@ -64 +64 @@
  */
 #define IP_FRAGMENT_OFFSET(header) \
-        ((((header)->fragment_offset_high << 8) + \
+        (((GET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header) << 8) + \
             (header)->fragment_offset_low) * 8U)
 
@@ -83 +83 @@
  */
 #define IP_HEADER_LENGTH(header) \
-        ((header)->header_length * 4U)
+        (GET_IP_HEADER_LENGTH(header) * 4U)
 
 /** Returns the actual IP packet total length.
@@ -143 +143 @@
  */
 struct ip_header {
-#ifdef ARCH_IS_BIG_ENDIAN
-        uint8_t version : 4;
-        uint8_t header_length : 4;
-#else
-        uint8_t header_length : 4;
-        uint8_t version : 4;
-#endif
+        uint8_t vhl; /* version, header_length */
+
+#define GET_IP_HEADER_VERSION(header) \
+        (((header)->vhl & 0xf0) >> 4)
+#define SET_IP_HEADER_VERSION(header, version) \
+        ((header)->vhl = \
+         ((version & 0x0f) << 4) | ((header)->vhl & 0x0f))
+
+#define GET_IP_HEADER_LENGTH(header) \
+        ((header)->vhl & 0x0f)
+#define SET_IP_HEADER_LENGTH(header, length) \
+        ((header)->vhl = \
+         (length & 0x0f) | ((header)->vhl & 0xf0))
 
         uint8_t tos;
@@ -155 +161 @@
         uint16_t identification;
 
-#ifdef ARCH_IS_BIG_ENDIAN
-        uint8_t flags : 3;
-        uint8_t fragment_offset_high : 5;
-#else
-        uint8_t fragment_offset_high : 5;
-        uint8_t flags : 3;
-#endif
+        uint8_t ffoh; /* flags, fragment_offset_high */
+
+#define GET_IP_HEADER_FLAGS(header) \
+        (((header)->ffoh & 0xe0) >> 5)
+#define SET_IP_HEADER_FLAGS(header, flags) \
+        ((header)->ffoh = \
+         ((flags & 0x07) << 5) | ((header)->ffoh & 0x1f))
+
+#define GET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header) \
+        ((header)->ffoh & 0x1f)
+#define SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header, fragment_offset_high) \
+        ((header)->ffoh = \
+         (fragment_offset_high & 0x1f) | ((header)->ffoh & 0xe0))
 
         uint8_t fragment_offset_low;
@@ -181 +193 @@
         uint8_t pointer;
 
-#ifdef ARCH_IS_BIG_ENDIAN
-        uint8_t overflow : 4;
-        uint8_t flags : 4;
-#else
-        uint8_t flags : 4;
-        uint8_t overflow : 4;
-#endif
+        uint8_t of; /* overflow, flags */
+
+#define GET_IP_OPTION_OVERFLOW(option) \
+        (((option)->of & 0xf0) >> 4)
+#define SET_IP_OPTION_OVERFLOW(option, overflow) \
+        ((option)->of = \
+         ((overflow & 0x0f) << 4) | ((option)->of & 0x0f))
+
+#define GET_IP_OPTION_FLAGS(option) \
+        ((option)->of & 0x0f)
+#define SET_IP_OPTION_FLAGS(option, flags) \
+        ((option)->of = \
+         (flags & 0x0f) | ((option)->of & 0xf0))
+
 } __attribute__ ((packed));
 

uspace/lib/net/tl/socket_core.c

@@ -306 +306 @@
                 
         case AF_INET6:
-                /* TODO IPv6 */
+                // TODO IPv6
                 break;
         }
@@ -376 +376 @@
 
         count = 0;
-//      socket_id = socket_globals.last_id;
+#if 0
+        socket_id = socket_globals.last_id;
+#endif
         do {
                 if (count < SOCKET_ID_TRIES) {
@@ -388 +390 @@
                         if (socket_id < INT_MAX) {
                                 ++ socket_id;
-/*                      } else if(socket_globals.last_id) {
-*                               socket_globals.last_id = 0;
-*                               socket_id = 1;
-*/                      } else {
+#if 0
+                        } else if(socket_globals.last_id) {
+                                socket_globals.last_id = 0;
+                                socket_id = 1;
+#endif
+                        } else {
                                 return ELIMIT;
                         }