Changes in uspace/srv/net/il/ip/ip.c [79ae36dd:ccca251] in mainline

File:

• uspace/srv/net/il/ip/ip.c (modified) (16 diffs)

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

@@ -77 +77 @@
 #include <il_skel.h>
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
 /** IP module name. */
 #define NAME                    "ip"
@@ -204 +201 @@
 
         /* Set the destination address */
-        switch (GET_IP_HEADER_VERSION(header)) {
+        switch (header->version) {
         case IPVERSION:
                 addrlen = sizeof(dest_in);
@@ -638 +635 @@
 
         /* Process all IP options */
-        while (next < GET_IP_HEADER_LENGTH(first)) {
+        while (next < first->header_length) {
                 option = (ip_option_t *) (((uint8_t *) first) + next);
                 /* Skip end or noop */
@@ -659 +656 @@
         if (length % 4) {
                 bzero(((uint8_t *) last) + length, 4 - (length % 4));
-                SET_IP_HEADER_LENGTH(last, (length / 4 + 1));
+                last->header_length = length / 4 + 1;
         } else {
-                SET_IP_HEADER_LENGTH(last, (length / 4));
+                last->header_length = length / 4;
         }
 
@@ -709 +706 @@
                 return rc;
         
-        SET_IP_HEADER_VERSION(header, IPV4);
-        SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header, 0);
+        header->version = IPV4;
+        header->fragment_offset_high = 0;
         header->fragment_offset_low = 0;
         header->header_checksum = 0;
@@ -738 +735 @@
                         memcpy(middle_header, last_header,
                             IP_HEADER_LENGTH(last_header));
-                        SET_IP_HEADER_FLAGS(header,
-                            (GET_IP_HEADER_FLAGS(header) | IPFLAG_MORE_FRAGMENTS));
+                        header->flags |= IPFLAG_MORE_FRAGMENTS;
                         middle_header->total_length =
                             htons(packet_get_data_length(next));
-                        SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(middle_header,
-                            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length));
+                        middle_header->fragment_offset_high =
+                            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length);
                         middle_header->fragment_offset_low =
                             IP_COMPUTE_FRAGMENT_OFFSET_LOW(length);
@@ -772 +768 @@
                 middle_header->total_length =
                     htons(packet_get_data_length(next));
-                SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(middle_header,
-                    IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length));
+                middle_header->fragment_offset_high =
+                    IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length);
                 middle_header->fragment_offset_low =
                     IP_COMPUTE_FRAGMENT_OFFSET_LOW(length);
@@ -789 +785 @@
                 length += packet_get_data_length(next);
                 free(last_header);
-                SET_IP_HEADER_FLAGS(header,
-                    (GET_IP_HEADER_FLAGS(header) | IPFLAG_MORE_FRAGMENTS));
+                header->flags |= IPFLAG_MORE_FRAGMENTS;
         }
 
@@ -839 +834 @@
         new_header->total_length = htons(IP_HEADER_LENGTH(new_header) + length);
         offset = IP_FRAGMENT_OFFSET(header) + IP_HEADER_DATA_LENGTH(header);
-        SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(new_header,
-            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(offset));
+        new_header->fragment_offset_high =
+            IP_COMPUTE_FRAGMENT_OFFSET_HIGH(offset);
         new_header->fragment_offset_low =
             IP_COMPUTE_FRAGMENT_OFFSET_LOW(offset);
@@ -870 +865 @@
                 return NULL;
         memcpy(middle, last, IP_HEADER_LENGTH(last));
-        SET_IP_HEADER_FLAGS(middle,
-            (GET_IP_HEADER_FLAGS(middle) | IPFLAG_MORE_FRAGMENTS));
+        middle->flags |= IPFLAG_MORE_FRAGMENTS;
         return middle;
 }
@@ -928 +922 @@
 
         /* Fragmentation forbidden? */
-        if(GET_IP_HEADER_FLAGS(header) & IPFLAG_DONT_FRAGMENT)
+        if(header->flags & IPFLAG_DONT_FRAGMENT)
                 return EPERM;
 
@@ -964 +958 @@
 
         /* Mark the first as fragmented */
-        SET_IP_HEADER_FLAGS(header,
-            (GET_IP_HEADER_FLAGS(header) | IPFLAG_MORE_FRAGMENTS));
+        header->flags |= IPFLAG_MORE_FRAGMENTS;
 
         /* Create middle fragments */
@@ -1326 +1319 @@
         int rc;
 
-        if ((GET_IP_HEADER_FLAGS(header) & IPFLAG_MORE_FRAGMENTS) ||
+        if ((header->flags & IPFLAG_MORE_FRAGMENTS) ||
             IP_FRAGMENT_OFFSET(header)) {
                 // TODO fragmented
@@ -1332 +1325 @@
         }
         
-        switch (GET_IP_HEADER_VERSION(header)) {
+        switch (header->version) {
         case IPVERSION:
                 addrlen = sizeof(src_in);
@@ -1454 +1447 @@
 
         /* Set the destination address */
-        switch (GET_IP_HEADER_VERSION(header)) {
+        switch (header->version) {
         case IPVERSION:
                 addrlen = sizeof(addr_in);
@@ -1916 +1909 @@
         
         *answer_count = 0;
-        
-        if (!IPC_GET_IMETHOD(*call))
+        switch (IPC_GET_IMETHOD(*call)) {
+        case IPC_M_PHONE_HUNGUP:
                 return EOK;
         
-        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_CONNECT_TO_ME:
                 return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call),