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

Timestamp:

2013-06-28T20:20:03Z (12 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/tcp/pdu.c (modified) (5 diffs)

uspace/srv/net/tcp/pdu.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <net/socket_codes.h>
 #include "pdu.h"
 #include "segment.h"
@@ -144 +145 @@
 }
 
-static void tcp_phdr_setup(tcp_pdu_t *pdu, tcp_phdr_t *phdr)
-{
-        // FIXME: Check for correctness
-        
-        uint32_t src_addr;
-        inet_addr_pack(&pdu->src_addr, &src_addr);
-        
-        uint32_t dest_addr;
-        inet_addr_pack(&pdu->dest_addr, &dest_addr);
-        
-        phdr->src_addr = host2uint32_t_be(src_addr);
-        phdr->dest_addr = host2uint32_t_be(dest_addr);
-        phdr->zero = 0;
-        phdr->protocol = 6; /* XXX Magic number */
-        phdr->tcp_length = host2uint16_t_be(pdu->header_size + pdu->text_size);
+static uint16_t tcp_phdr_setup(tcp_pdu_t *pdu, tcp_phdr_t *phdr)
+{
+        addr32_t src_v4;
+        addr128_t src_v6;
+        uint16_t src_af = inet_addr_get(&pdu->src, &src_v4, &src_v6);
+        
+        addr32_t dest_v4;
+        addr128_t dest_v6;
+        uint16_t dest_af = inet_addr_get(&pdu->dest, &dest_v4, &dest_v6);
+        
+        assert(src_af == dest_af);
+        
+        switch (src_af) {
+        case AF_INET:
+                phdr->src = host2uint32_t_be(src_v4);
+                phdr->dest = host2uint32_t_be(dest_v4);
+                phdr->zero = 0;
+                phdr->protocol = IP_PROTO_TCP;
+                phdr->tcp_length =
+                    host2uint16_t_be(pdu->header_size + pdu->text_size);
+                break;
+        case AF_INET6:
+                // FIXME TODO
+                assert(false);
+        default:
+                assert(false);
+        }
+        
+        return src_af;
 }
 
@@ -243 +258 @@
         uint16_t cs_phdr;
         uint16_t cs_headers;
-        uint16_t cs_all;
         tcp_phdr_t phdr;
-
-        tcp_phdr_setup(pdu, &phdr);
-        cs_phdr = tcp_checksum_calc(TCP_CHECKSUM_INIT, (void *)&phdr,
-            sizeof(tcp_phdr_t));
+        
+        uint16_t af = tcp_phdr_setup(pdu, &phdr);
+        switch (af) {
+        case AF_INET:
+                cs_phdr = tcp_checksum_calc(TCP_CHECKSUM_INIT, (void *) &phdr,
+                    sizeof(tcp_phdr_t));
+                break;
+        case AF_INET6:
+                // FIXME TODO
+                assert(false);
+        default:
+                assert(false);
+        }
+        
         cs_headers = tcp_checksum_calc(cs_phdr, pdu->header, pdu->header_size);
-        cs_all = tcp_checksum_calc(cs_headers, pdu->text, pdu->text_size);
-
-        return cs_all;
+        return tcp_checksum_calc(cs_headers, pdu->text, pdu->text_size);
 }
 
@@ -279 +301 @@
 
         sp->local.port = uint16_t_be2host(hdr->dest_port);
-        sp->local.addr = pdu->dest_addr;
+        sp->local.addr = pdu->dest;
         sp->foreign.port = uint16_t_be2host(hdr->src_port);
-        sp->foreign.addr = pdu->src_addr;
+        sp->foreign.addr = pdu->src;
 
         *seg = nseg;
@@ -298 +320 @@
                 return ENOMEM;
 
-        npdu->src_addr = sp->local.addr;
-        npdu->dest_addr = sp->foreign.addr;
+        npdu->src = sp->local.addr;
+        npdu->dest = sp->foreign.addr;
         tcp_header_encode(sp, seg, &npdu->header, &npdu->header_size);