Changeset df3c6f02 in mainline for uspace/lib/net/il/ip_client.c

Timestamp:

2011-05-31T22:58:56Z (13 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.

File:

• uspace/lib/net/il/ip_client.c (modified) (6 diffs)

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;