Changes in uspace/srv/net/tcp/pdu.c [5a324d99:69a93df7] in mainline

File:

• uspace/srv/net/tcp/pdu.c (modified) (4 diffs)

uspace/srv/net/tcp/pdu.c

@@ -144 +144 @@
 }
 
-static ip_ver_t tcp_phdr_setup(tcp_pdu_t *pdu, tcp_phdr_t *phdr,
-    tcp_phdr6_t *phdr6)
-{
-        addr32_t src_v4;
-        addr128_t src_v6;
-        uint16_t src_ver = inet_addr_get(&pdu->src, &src_v4, &src_v6);
-
-        addr32_t dest_v4;
-        addr128_t dest_v6;
-        uint16_t dest_ver = inet_addr_get(&pdu->dest, &dest_v4, &dest_v6);
-
-        assert(src_ver == dest_ver);
-
-        switch (src_ver) {
-        case ip_v4:
-                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 ip_v6:
-                host2addr128_t_be(src_v6, phdr6->src);
-                host2addr128_t_be(dest_v6, phdr6->dest);
-                phdr6->tcp_length =
-                    host2uint32_t_be(pdu->header_size + pdu->text_size);
-                memset(phdr6->zeroes, 0, 3);
-                phdr6->next = IP_PROTO_TCP;
-                break;
-        default:
-                assert(false);
-        }
-
-        return src_ver;
+static void tcp_phdr_setup(tcp_pdu_t *pdu, tcp_phdr_t *phdr)
+{
+        phdr->src_addr = host2uint32_t_be(pdu->src_addr.ipv4);
+        phdr->dest_addr = host2uint32_t_be(pdu->dest_addr.ipv4);
+        phdr->zero = 0;
+        phdr->protocol = 6; /* XXX Magic number */
+        phdr->tcp_length = host2uint16_t_be(pdu->header_size + pdu->text_size);
 }
 
@@ -263 +235 @@
         uint16_t cs_phdr;
         uint16_t cs_headers;
+        uint16_t cs_all;
         tcp_phdr_t phdr;
-        tcp_phdr6_t phdr6;
-
-        ip_ver_t ver = tcp_phdr_setup(pdu, &phdr, &phdr6);
-        switch (ver) {
-        case ip_v4:
-                cs_phdr = tcp_checksum_calc(TCP_CHECKSUM_INIT, (void *) &phdr,
-                    sizeof(tcp_phdr_t));
-                break;
-        case ip_v6:
-                cs_phdr = tcp_checksum_calc(TCP_CHECKSUM_INIT, (void *) &phdr6,
-                    sizeof(tcp_phdr6_t));
-                break;
-        default:
-                assert(false);
-        }
-
+
+        tcp_phdr_setup(pdu, &phdr);
+        cs_phdr = tcp_checksum_calc(TCP_CHECKSUM_INIT, (void *)&phdr,
+            sizeof(tcp_phdr_t));
         cs_headers = tcp_checksum_calc(cs_phdr, pdu->header, pdu->header_size);
-        return tcp_checksum_calc(cs_headers, pdu->text, pdu->text_size);
+        cs_all = tcp_checksum_calc(cs_headers, pdu->text, pdu->text_size);
+
+        return cs_all;
 }
 
@@ -308 +271 @@
 
         sp->local.port = uint16_t_be2host(hdr->dest_port);
-        sp->local.addr = pdu->dest;
+        sp->local.addr = pdu->dest_addr;
         sp->foreign.port = uint16_t_be2host(hdr->src_port);
-        sp->foreign.addr = pdu->src;
+        sp->foreign.addr = pdu->src_addr;
 
         *seg = nseg;
@@ -327 +290 @@
                 return ENOMEM;
 
-        npdu->src = sp->local.addr;
-        npdu->dest = sp->foreign.addr;
+        npdu->src_addr = sp->local.addr;
+        npdu->dest_addr = sp->foreign.addr;
         tcp_header_encode(sp, seg, &npdu->header, &npdu->header_size);