Changeset 02a09ed in mainline for uspace/srv/net/inetsrv/pdu.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/srv/net/inetsrv/pdu.c (modified) (8 diffs)

uspace/srv/net/inetsrv/pdu.c

@@ -44 +44 @@
 #include <mem.h>
 #include <stdlib.h>
-
+#include <net/socket_codes.h>
 #include "inetsrv.h"
 #include "inet_std.h"
@@ -106 +106 @@
     void **rdata, size_t *rsize, size_t *roffs)
 {
-        uint32_t src_addr;
-        int rc = inet_addr_pack(&packet->src, &src_addr);
-        if (rc != EOK)
-                return rc;
-        
-        uint32_t dest_addr;
-        rc = inet_addr_pack(&packet->dest, &dest_addr);
-        if (rc != EOK)
-                return rc;
+        addr32_t src_v4;
+        addr128_t src_v6;
+        uint16_t src_af = inet_addr_get(&packet->src, &src_v4, &src_v6);
+        
+        addr32_t dest_v4;
+        addr128_t dest_v6;
+        uint16_t dest_af = inet_addr_get(&packet->dest, &dest_v4, &dest_v6);
+        
+        if (src_af != dest_af)
+                return EINVAL;
         
         /* Upper bound for fragment offset field */
@@ -123 +124 @@
                 return ELIMIT;
         
-        size_t hdr_size = sizeof(ip_header_t);
+        size_t hdr_size;
+        
+        switch (src_af) {
+        case AF_INET:
+                hdr_size = sizeof(ip_header_t);
+                break;
+        case AF_INET6:
+                // FIXME TODO
+                assert(false);
+        default:
+                assert(false);
+        }
+        
         size_t data_offs = ROUND_UP(hdr_size, 4);
         
@@ -164 +177 @@
         
         /* Encode header fields */
-        ip_header_t *hdr = (ip_header_t *) data;
-        
-        hdr->ver_ihl = (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t));
-        hdr->tos = packet->tos;
-        hdr->tot_len = host2uint16_t_be(size);
-        hdr->id = host2uint16_t_be(ident);
-        hdr->flags_foff = host2uint16_t_be(flags_foff);
-        hdr->ttl = packet->ttl;
-        hdr->proto = packet->proto;
-        hdr->chksum = 0;
-        hdr->src_addr = host2uint32_t_be(src_addr);
-        hdr->dest_addr = host2uint32_t_be(dest_addr);
-        
-        /* Compute checksum */
-        uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT, (void *) hdr,
-            hdr_size);
-        hdr->chksum = host2uint16_t_be(chksum);
+        ip_header_t *hdr;
+        
+        switch (src_af) {
+        case AF_INET:
+                hdr = (ip_header_t *) data;
+                
+                hdr->ver_ihl =
+                    (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t));
+                hdr->tos = packet->tos;
+                hdr->tot_len = host2uint16_t_be(size);
+                hdr->id = host2uint16_t_be(ident);
+                hdr->flags_foff = host2uint16_t_be(flags_foff);
+                hdr->ttl = packet->ttl;
+                hdr->proto = packet->proto;
+                hdr->chksum = 0;
+                hdr->src_addr = host2uint32_t_be(src_v4);
+                hdr->dest_addr = host2uint32_t_be(dest_v4);
+                
+                /* Compute checksum */
+                uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT,
+                    (void *) hdr, hdr_size);
+                hdr->chksum = host2uint16_t_be(chksum);
+                
+                break;
+        case AF_INET6:
+                // FIXME TODO
+                return ENOTSUP;
+        default:
+                assert(false);
+        }
         
         /* Copy payload */
@@ -194 +220 @@
 int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet)
 {
-        ip_header_t *hdr;
-        size_t tot_len;
-        size_t data_offs;
-        uint8_t version;
-        uint16_t ident;
-        uint16_t flags_foff;
-        uint16_t foff;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode()");
         
@@ -208 +226 @@
                 return EINVAL;
         }
-
-        hdr = (ip_header_t *)data;
-
-        version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h, VI_VERSION_l,
-            hdr->ver_ihl);
+        
+        ip_header_t *hdr = (ip_header_t *) data;
+        
+        uint8_t version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h,
+            VI_VERSION_l, hdr->ver_ihl);
         if (version != 4) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Version (%d) != 4", version);
                 return EINVAL;
         }
-
-        tot_len = uint16_t_be2host(hdr->tot_len);
+        
+        size_t tot_len = uint16_t_be2host(hdr->tot_len);
         if (tot_len < sizeof(ip_header_t)) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length too small (%zu)", tot_len);
@@ -229 +247 @@
                 return EINVAL;
         }
-
-        ident = uint16_t_be2host(hdr->id);
-        flags_foff = uint16_t_be2host(hdr->flags_foff);
-        foff = BIT_RANGE_EXTRACT(uint16_t, FF_FRAGOFF_h, FF_FRAGOFF_l,
+        
+        uint16_t ident = uint16_t_be2host(hdr->id);
+        uint16_t flags_foff = uint16_t_be2host(hdr->flags_foff);
+        uint16_t foff = BIT_RANGE_EXTRACT(uint16_t, FF_FRAGOFF_h, FF_FRAGOFF_l,
             flags_foff);
         /* XXX Checksum */
-
-        inet_addr_unpack(uint32_t_be2host(hdr->src_addr), &packet->src);
-        inet_addr_unpack(uint32_t_be2host(hdr->dest_addr), &packet->dest);
+        
+        inet_addr_set(uint32_t_be2host(hdr->src_addr), &packet->src);
+        inet_addr_set(uint32_t_be2host(hdr->dest_addr), &packet->dest);
         packet->tos = hdr->tos;
         packet->proto = hdr->proto;
@@ -248 +266 @@
         
         /* XXX IP options */
-        data_offs = sizeof(uint32_t) * BIT_RANGE_EXTRACT(uint8_t, VI_IHL_h,
-            VI_IHL_l, hdr->ver_ihl);
-
+        size_t data_offs = sizeof(uint32_t) *
+            BIT_RANGE_EXTRACT(uint8_t, VI_IHL_h, VI_IHL_l, hdr->ver_ihl);
+        
         packet->size = tot_len - data_offs;
         packet->data = calloc(packet->size, 1);