Changeset 60ab6c3 in mainline for uspace/srv/net/il/ip/ip_client.c

Timestamp:

2010-03-10T05:46:54Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5782081

Parents:

71b00dcc (diff), b48ebd19 (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 from lp:~lukasmejdrech/helenos/network.

File:

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

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

@@ -48 +48 @@
 #include "ip_header.h"
 
-int ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, size_t ipopt_length){
-        ip_header_ref header;
-        uint8_t * data;
-        size_t padding;
-
-        padding =  ipopt_length % 4;
-        if(padding){
-                padding = 4 - padding;
-                ipopt_length += padding;
-        }
-        data = (uint8_t *) packet_prefix(packet, sizeof(ip_header_t) + padding);
-        if(! data){
-                return ENOMEM;
-        }
-        while(padding --){
-                data[sizeof(ip_header_t) + padding] = IPOPT_NOOP;
-        }
-        header = (ip_header_ref) data;
-        header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + ipopt_length);
-        header->ttl = (ttl ? ttl : IPDEFTTL); //(((ttl) <= MAXTTL) ? ttl : MAXTTL) : IPDEFTTL;
-        header->tos = tos;
-        header->protocol = protocol;
-        if(dont_fragment){
-                header->flags = IPFLAG_DONT_FRAGMENT;
-        }
-        return EOK;
-}
-
-int ip_client_process_packet(packet_t packet, ip_protocol_t * protocol, ip_ttl_t * ttl, ip_tos_t * tos, int * dont_fragment, size_t * ipopt_length){
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
-        if((! header)
-                || (packet_get_data_length(packet) < sizeof(ip_header_t))){
-                return ENOMEM;
-        }
-        if(protocol){
-                *protocol = header->protocol;
-        }
-        if(ttl){
-                *ttl = header->ttl;
-        }
-        if(tos){
-                *tos = header->tos;
-        }
-        if(dont_fragment){
-                *dont_fragment = header->flags &IPFLAG_DONT_FRAGMENT;
-        }
-        if(ipopt_length){
-                *ipopt_length = IP_HEADER_LENGTH(header) - sizeof(ip_header_t);
-                return sizeof(ip_header_t);
-        }else{
-                return IP_HEADER_LENGTH(header);
-        }
-}
-
 size_t ip_client_header_length(packet_t packet){
         ip_header_ref header;
@@ -113 +57 @@
         }
         return IP_HEADER_LENGTH(header);
-}
-
-int ip_client_set_pseudo_header_data_length(ip_pseudo_header_ref header, size_t headerlen, size_t data_length){
-        ipv4_pseudo_header_ref header_in;
-
-        if(! header){
-                return EBADMEM;
-        }
-        if(headerlen == sizeof(ipv4_pseudo_header_t)){
-                header_in = (ipv4_pseudo_header_ref) header;
-                header_in->data_length = htons(data_length);
-                return EOK;
-        }else{
-                return EINVAL;
-        }
 }
 
@@ -140 +69 @@
                 return EINVAL;
         }
+
         switch(src->sa_family){
                 case AF_INET:
@@ -171 +101 @@
 }
 
+int ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, size_t ipopt_length){
+        ip_header_ref header;
+        uint8_t * data;
+        size_t padding;
+
+        // compute the padding if IP options are set
+        // multiple of 4 bytes
+        padding =  ipopt_length % 4;
+        if(padding){
+                padding = 4 - padding;
+                ipopt_length += padding;
+        }
+
+        // prefix the header
+        data = (uint8_t *) packet_prefix(packet, sizeof(ip_header_t) + padding);
+        if(! data){
+                return ENOMEM;
+        }
+
+        // add the padding
+        while(padding --){
+                data[sizeof(ip_header_t) + padding] = IPOPT_NOOP;
+        }
+
+        // set the header
+        header = (ip_header_ref) data;
+        header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + ipopt_length);
+        header->ttl = (ttl ? ttl : IPDEFTTL); //(((ttl) <= MAXTTL) ? ttl : MAXTTL) : IPDEFTTL;
+        header->tos = tos;
+        header->protocol = protocol;
+
+        if(dont_fragment){
+                header->flags = IPFLAG_DONT_FRAGMENT;
+        }
+        return EOK;
+}
+
+int ip_client_process_packet(packet_t packet, ip_protocol_t * protocol, ip_ttl_t * ttl, ip_tos_t * tos, int * dont_fragment, size_t * ipopt_length){
+        ip_header_ref header;
+
+        header = (ip_header_ref) packet_get_data(packet);
+        if((! header)
+                || (packet_get_data_length(packet) < sizeof(ip_header_t))){
+                return ENOMEM;
+        }
+
+        if(protocol){
+                *protocol = header->protocol;
+        }
+        if(ttl){
+                *ttl = header->ttl;
+        }
+        if(tos){
+                *tos = header->tos;
+        }
+        if(dont_fragment){
+                *dont_fragment = header->flags &IPFLAG_DONT_FRAGMENT;
+        }
+        if(ipopt_length){
+                *ipopt_length = IP_HEADER_LENGTH(header) - sizeof(ip_header_t);
+                return sizeof(ip_header_t);
+        }else{
+                return IP_HEADER_LENGTH(header);
+        }
+}
+
+int ip_client_set_pseudo_header_data_length(ip_pseudo_header_ref header, size_t headerlen, size_t data_length){
+        ipv4_pseudo_header_ref header_in;
+
+        if(! header){
+                return EBADMEM;
+        }
+
+        if(headerlen == sizeof(ipv4_pseudo_header_t)){
+                header_in = (ipv4_pseudo_header_ref) header;
+                header_in->data_length = htons(data_length);
+                return EOK;
+        // TODO IPv6
+        }else{
+                return EINVAL;
+        }
+}
+
 /** @}
  */