Changes in uspace/srv/net/tcp/pdu.c [12df1f1:4a0bc99] in mainline

File:

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

uspace/srv/net/tcp/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <inet/endpoint.h>
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "pdu.h"
 #include "segment.h"
@@ -126 +126 @@
 }
 
-static void tcp_header_setup(tcp_sockpair_t *sp, tcp_segment_t *seg, tcp_header_t *hdr)
+static void tcp_header_setup(inet_ep2_t *epp, tcp_segment_t *seg, tcp_header_t *hdr)
 {
         uint16_t doff_flags;
         uint16_t doff;
 
-        hdr->src_port = host2uint16_t_be(sp->local.port);
-        hdr->dest_port = host2uint16_t_be(sp->foreign.port);
+        hdr->src_port = host2uint16_t_be(epp->local.port);
+        hdr->dest_port = host2uint16_t_be(epp->remote.port);
         hdr->seq = host2uint32_t_be(seg->seq);
         hdr->ack = host2uint32_t_be(seg->ack);
@@ -145 +145 @@
 }
 
-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 +167 @@
                     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 +178 @@
                 assert(false);
         }
-        
-        return src_af;
+
+        return src_ver;
 }
 
@@ -191 +191 @@
 }
 
-static int tcp_header_encode(tcp_sockpair_t *sp, tcp_segment_t *seg,
+static int tcp_header_encode(inet_ep2_t *epp, tcp_segment_t *seg,
     void **header, size_t *size)
 {
@@ -200 +200 @@
                 return ENOMEM;
 
-        tcp_header_setup(sp, seg, hdr);
+        tcp_header_setup(epp, seg, hdr);
         *header = hdr;
         *size = sizeof(tcp_header_t);
@@ -249 +249 @@
         if (pdu->text != NULL)
                 free(pdu->text);
+        free(pdu);
 
         return NULL;
@@ -266 +267 @@
         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 +281 @@
                 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);
@@ -294 +295 @@
 
 /** Decode incoming PDU */
-int tcp_pdu_decode(tcp_pdu_t *pdu, tcp_sockpair_t *sp, tcp_segment_t **seg)
+int tcp_pdu_decode(tcp_pdu_t *pdu, inet_ep2_t *epp, tcp_segment_t **seg)
 {
         tcp_segment_t *nseg;
@@ -308 +309 @@
         hdr = (tcp_header_t *)pdu->header;
 
-        sp->local.port = uint16_t_be2host(hdr->dest_port);
-        sp->local.addr = pdu->dest;
-        sp->foreign.port = uint16_t_be2host(hdr->src_port);
-        sp->foreign.addr = pdu->src;
+        epp->local.port = uint16_t_be2host(hdr->dest_port);
+        epp->local.addr = pdu->dest;
+        epp->remote.port = uint16_t_be2host(hdr->src_port);
+        epp->remote.addr = pdu->src;
 
         *seg = nseg;
@@ -318 +319 @@
 
 /** Encode outgoing PDU */
-int tcp_pdu_encode(tcp_sockpair_t *sp, tcp_segment_t *seg, tcp_pdu_t **pdu)
+int tcp_pdu_encode(inet_ep2_t *epp, tcp_segment_t *seg, tcp_pdu_t **pdu)
 {
         tcp_pdu_t *npdu;
         size_t text_size;
         uint16_t checksum;
+        int rc;
 
         npdu = tcp_pdu_new();
@@ -328 +330 @@
                 return ENOMEM;
 
-        npdu->src = sp->local.addr;
-        npdu->dest = sp->foreign.addr;
-        tcp_header_encode(sp, seg, &npdu->header, &npdu->header_size);
+        npdu->src = epp->local.addr;
+        npdu->dest = epp->remote.addr;
+        rc = tcp_header_encode(epp, seg, &npdu->header, &npdu->header_size);
+        if (rc != EOK) {
+                free(npdu);
+                return rc;
+        }
 
         text_size = tcp_segment_text_size(seg);
         npdu->text = calloc(1, text_size);
-        if (npdu->text == NULL)
+        if (npdu->text == NULL) {
+                free(npdu->header);
+                free(npdu);
                 return ENOMEM;
+        }
 
         npdu->text_size = text_size;