Changes in uspace/srv/net/udp/pdu.c [8d48c7e:12df1f1] in mainline

File:

• uspace/srv/net/udp/pdu.c (modified) (13 diffs)

uspace/srv/net/udp/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <stdlib.h>
 #include <inet/addr.h>
+#include <net/socket_codes.h>
 #include "msg.h"
 #include "pdu.h"
@@ -84 +85 @@
 }
 
-static ip_ver_t udp_phdr_setup(udp_pdu_t *pdu, udp_phdr_t *phdr,
+static uint16_t udp_phdr_setup(udp_pdu_t *pdu, udp_phdr_t *phdr,
     udp_phdr6_t *phdr6)
 {
         addr32_t src_v4;
         addr128_t src_v6;
-        ip_ver_t src_ver = inet_addr_get(&pdu->src, &src_v4, &src_v6);
-
+        uint16_t src_af = inet_addr_get(&pdu->src, &src_v4, &src_v6);
+        
         addr32_t dest_v4;
         addr128_t dest_v6;
-        ip_ver_t dest_ver = inet_addr_get(&pdu->dest, &dest_v4, &dest_v6);
-
-        assert(src_ver == dest_ver);
-
-        switch (src_ver) {
-        case ip_v4:
+        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_addr = host2uint32_t_be(src_v4);
                 phdr->dest_addr = host2uint32_t_be(dest_v4);
@@ -105 +106 @@
                 phdr->udp_length = host2uint16_t_be(pdu->data_size);
                 break;
-        case ip_v6:
+        case AF_INET6:
                 host2addr128_t_be(src_v6, phdr6->src_addr);
                 host2addr128_t_be(dest_v6, phdr6->dest_addr);
@@ -115 +116 @@
                 assert(false);
         }
-
-        return src_ver;
+        
+        return src_af;
 }
 
@@ -135 +136 @@
         udp_phdr_t phdr;
         udp_phdr6_t phdr6;
-
-        ip_ver_t ver = udp_phdr_setup(pdu, &phdr, &phdr6);
-        switch (ver) {
-        case ip_v4:
+        
+        uint16_t af = udp_phdr_setup(pdu, &phdr, &phdr6);
+        switch (af) {
+        case AF_INET:
                 cs_phdr = udp_checksum_calc(UDP_CHECKSUM_INIT, (void *) &phdr,
                     sizeof(udp_phdr_t));
                 break;
-        case ip_v6:
+        case AF_INET6:
                 cs_phdr = udp_checksum_calc(UDP_CHECKSUM_INIT, (void *) &phdr6,
                     sizeof(udp_phdr6_t));
@@ -149 +150 @@
                 assert(false);
         }
-
+        
         return udp_checksum_calc(cs_phdr, pdu->data, pdu->data_size);
 }
@@ -162 +163 @@
 
 /** Decode incoming PDU */
-int udp_pdu_decode(udp_pdu_t *pdu, inet_ep2_t *epp, udp_msg_t **msg)
+int udp_pdu_decode(udp_pdu_t *pdu, udp_sockpair_t *sp, udp_msg_t **msg)
 {
         udp_msg_t *nmsg;
@@ -179 +180 @@
         hdr = (udp_header_t *)pdu->data;
 
-        epp->local_link = pdu->iplink;
-        epp->remote.port = uint16_t_be2host(hdr->src_port);
-        epp->remote.addr = pdu->src;
-        epp->local.port = uint16_t_be2host(hdr->dest_port);
-        epp->local.addr = pdu->dest;
+        sp->foreign.port = uint16_t_be2host(hdr->src_port);
+        sp->foreign.addr = pdu->src;
+        sp->local.port = uint16_t_be2host(hdr->dest_port);
+        sp->local.addr = pdu->dest;
 
         length = uint16_t_be2host(hdr->length);
@@ -197 +197 @@
                 return ENOMEM;
 
+        nmsg->data = text;
         nmsg->data_size = length - sizeof(udp_header_t);
-        nmsg->data = malloc(nmsg->data_size);
-        if (nmsg->data == NULL)
-                return ENOMEM;
-
-        memcpy(nmsg->data, text, nmsg->data_size);
 
         *msg = nmsg;
@@ -209 +205 @@
 
 /** Encode outgoing PDU */
-int udp_pdu_encode(inet_ep2_t *epp, udp_msg_t *msg, udp_pdu_t **pdu)
+int udp_pdu_encode(udp_sockpair_t *sp, udp_msg_t *msg, udp_pdu_t **pdu)
 {
         udp_pdu_t *npdu;
@@ -219 +215 @@
                 return ENOMEM;
 
-        npdu->iplink = epp->local_link;
-        npdu->src = epp->local.addr;
-        npdu->dest = epp->remote.addr;
+        npdu->src = sp->local.addr;
+        npdu->dest = sp->foreign.addr;
 
         npdu->data_size = sizeof(udp_header_t) + msg->data_size;
@@ -231 +226 @@
 
         hdr = (udp_header_t *)npdu->data;
-        hdr->src_port = host2uint16_t_be(epp->local.port);
-        hdr->dest_port = host2uint16_t_be(epp->remote.port);
+        hdr->src_port = host2uint16_t_be(sp->local.port);
+        hdr->dest_port = host2uint16_t_be(sp->foreign.port);
         hdr->length = host2uint16_t_be(npdu->data_size);
         hdr->checksum = 0;