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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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 mainline changes

File:

• uspace/srv/net/tcp/pdu.c (modified) (6 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"
@@ -145 +144 @@
 }
 
-static uint16_t tcp_phdr_setup(tcp_pdu_t *pdu, tcp_phdr_t *phdr,
+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_af = inet_addr_get(&pdu->src, &src_v4, &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_af = inet_addr_get(&pdu->dest, &dest_v4, &dest_v6);
-        
-        assert(src_af == dest_af);
-        
-        switch (src_af) {
-        case AF_INET:
+        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);
@@ -167 +166 @@
                     host2uint16_t_be(pdu->header_size + pdu->text_size);
                 break;
-        case AF_INET6:
+        case ip_v6:
                 host2addr128_t_be(src_v6, phdr6->src);
                 host2addr128_t_be(dest_v6, phdr6->dest);
@@ -178 +177 @@
                 assert(false);
         }
-        
-        return src_af;
+
+        return src_ver;
 }
 
@@ -266 +265 @@
         tcp_phdr_t phdr;
         tcp_phdr6_t phdr6;
-        
-        uint16_t af = tcp_phdr_setup(pdu, &phdr, &phdr6);
-        switch (af) {
-        case AF_INET:
+
+        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 AF_INET6:
+        case ip_v6:
                 cs_phdr = tcp_checksum_calc(TCP_CHECKSUM_INIT, (void *) &phdr6,
                     sizeof(tcp_phdr6_t));
@@ -280 +279 @@
                 assert(false);
         }
-        
+
         cs_headers = tcp_checksum_calc(cs_phdr, pdu->header, pdu->header_size);
         return tcp_checksum_calc(cs_headers, pdu->text, pdu->text_size);