Changeset df3c6f02 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2011-05-31T22:58:56Z (14 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/srv/net/il/ip/ip.c (modified) (21 diffs)

uspace/srv/net/il/ip/ip.c

@@ -201 +201 @@
 
         /* Set the destination address */
-        switch (header->version) {
+        switch (GET_IP_HEADER_VERSION(header)) {
         case IPVERSION:
                 addrlen = sizeof(dest_in);
@@ -365 +365 @@
                 
                 if (ip_netif->dhcp) {
-                        /* TODO dhcp */
+                        // TODO dhcp
                         net_free_settings(configuration, data);
                         return ENOTSUP;
@@ -398 +398 @@
                         }
                 } else {
-                        /* TODO ipv6 in separate module */
+                        // TODO ipv6 in separate module
                         net_free_settings(configuration, data);
                         return ENOTSUP;
@@ -517 +517 @@
             ip_netif->dhcp ? "dhcp" : "static");
         
-        /* TODO ipv6 addresses */
+        // TODO ipv6 addresses
         
         char address[INET_ADDRSTRLEN];
@@ -635 +635 @@
 
         /* Process all IP options */
-        while (next < first->header_length) {
+        while (next < GET_IP_HEADER_LENGTH(first)) {
                 option = (ip_option_t *) (((uint8_t *) first) + next);
                 /* Skip end or noop */
@@ -656 +656 @@
         if (length % 4) {
                 bzero(((uint8_t *) last) + length, 4 - (length % 4));
-                last->header_length = length / 4 + 1;
+                SET_IP_HEADER_LENGTH(last, (length / 4 + 1));
         } else {
-                last->header_length = length / 4;
+                SET_IP_HEADER_LENGTH(last, (length / 4));
         }
 
@@ -706 +706 @@
                 return rc;
         
-        header->version = IPV4;
-        header->fragment_offset_high = 0;
+        SET_IP_HEADER_VERSION(header, IPV4);
+        SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header, 0);
         header->fragment_offset_low = 0;
         header->header_checksum = 0;
@@ -735 +735 @@
                         memcpy(middle_header, last_header,
                             IP_HEADER_LENGTH(last_header));
-                        header->flags |= IPFLAG_MORE_FRAGMENTS;
+                        SET_IP_HEADER_FLAGS(header,
+                            (GET_IP_HEADER_FLAGS(header) | IPFLAG_MORE_FRAGMENTS));
                         middle_header->total_length =
                             htons(packet_get_data_length(next));
-                        middle_header->fragment_offset_high =
-                            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length);
+                        SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(middle_header,
+                            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length));
                         middle_header->fragment_offset_low =
                             IP_COMPUTE_FRAGMENT_OFFSET_LOW(length);
@@ -768 +769 @@
                 middle_header->total_length =
                     htons(packet_get_data_length(next));
-                middle_header->fragment_offset_high =
-                    IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length);
+                SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(middle_header,
+                    IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length));
                 middle_header->fragment_offset_low =
                     IP_COMPUTE_FRAGMENT_OFFSET_LOW(length);
@@ -785 +786 @@
                 length += packet_get_data_length(next);
                 free(last_header);
-                header->flags |= IPFLAG_MORE_FRAGMENTS;
+                SET_IP_HEADER_FLAGS(header,
+                    (GET_IP_HEADER_FLAGS(header) | IPFLAG_MORE_FRAGMENTS));
         }
 
@@ -834 +836 @@
         new_header->total_length = htons(IP_HEADER_LENGTH(new_header) + length);
         offset = IP_FRAGMENT_OFFSET(header) + IP_HEADER_DATA_LENGTH(header);
-        new_header->fragment_offset_high =
-            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(offset);
+        SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(new_header,
+            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(offset));
         new_header->fragment_offset_low =
             IP_COMPUTE_FRAGMENT_OFFSET_LOW(offset);
@@ -865 +867 @@
                 return NULL;
         memcpy(middle, last, IP_HEADER_LENGTH(last));
-        middle->flags |= IPFLAG_MORE_FRAGMENTS;
+        SET_IP_HEADER_FLAGS(middle,
+            (GET_IP_HEADER_FLAGS(middle) | IPFLAG_MORE_FRAGMENTS));
         return middle;
 }
@@ -922 +925 @@
 
         /* Fragmentation forbidden? */
-        if(header->flags & IPFLAG_DONT_FRAGMENT)
+        if(GET_IP_HEADER_FLAGS(header) & IPFLAG_DONT_FRAGMENT)
                 return EPERM;
 
@@ -946 +949 @@
 
         /* Greatest multiple of 8 lower than content */
-        /* TODO even fragmentation? */
+        // TODO even fragmentation?
         length = length & ~0x7;
         
@@ -958 +961 @@
 
         /* Mark the first as fragmented */
-        header->flags |= IPFLAG_MORE_FRAGMENTS;
+        SET_IP_HEADER_FLAGS(header,
+            (GET_IP_HEADER_FLAGS(header) | IPFLAG_MORE_FRAGMENTS));
 
         /* Create middle fragments */
@@ -1212 +1216 @@
         }
         
-        /* Ff the local host is the destination */
+        /* If the local host is the destination */
         if ((route->address.s_addr == dest->s_addr) &&
             (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) {
@@ -1279 +1283 @@
         in_addr_t destination;
 
-        /* TODO search set ipopt route? */
+        // TODO search set ipopt route?
         destination.s_addr = header->destination_address;
         return destination;
@@ -1319 +1323 @@
         int rc;
 
-        if ((header->flags & IPFLAG_MORE_FRAGMENTS) ||
+        if ((GET_IP_HEADER_FLAGS(header) & IPFLAG_MORE_FRAGMENTS) ||
             IP_FRAGMENT_OFFSET(header)) {
-                /* TODO fragmented */
+                // TODO fragmented
                 return ENOTSUP;
         }
         
-        switch (header->version) {
+        switch (GET_IP_HEADER_VERSION(header)) {
         case IPVERSION:
                 addrlen = sizeof(src_in);
@@ -1437 +1441 @@
                 phone = ip_prepare_icmp_and_get_phone(0, packet, header);
                 if (phone >= 0) {
-                        /* ttl exceeded ICMP */
+                        /* TTL exceeded ICMP */
                         icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet);
                 }
@@ -1447 +1451 @@
 
         /* Set the destination address */
-        switch (header->version) {
+        switch (GET_IP_HEADER_VERSION(header)) {
         case IPVERSION:
                 addrlen = sizeof(addr_in);
@@ -1777 +1781 @@
                 if ((type != ICMP_DEST_UNREACH) ||
                     (code != ICMP_HOST_UNREACH)) {
-                        /* No, something else */
+                        /* No, something else */
                         break;
                 }