Changes in uspace/srv/net/udp/pdu.c [69a93df7:695b6ff] in mainline

File:

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

uspace/srv/net/udp/pdu.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdlib.h>
-
+#include <inet/addr.h>
+#include <net/socket_codes.h>
 #include "msg.h"
 #include "pdu.h"
@@ -84 +85 @@
 }
 
-static void udp_phdr_setup(udp_pdu_t *pdu, udp_phdr_t *phdr)
-{
-        phdr->src_addr = host2uint32_t_be(pdu->src.ipv4);
-        phdr->dest_addr = host2uint32_t_be(pdu->dest.ipv4);
-        phdr->zero = 0;
-        phdr->protocol = IP_PROTO_UDP;
-        phdr->udp_length = host2uint16_t_be(pdu->data_size);
+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;
+        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_addr = host2uint32_t_be(src_v4);
+                phdr->dest_addr = host2uint32_t_be(dest_v4);
+                phdr->zero = 0;
+                phdr->protocol = IP_PROTO_UDP;
+                phdr->udp_length = host2uint16_t_be(pdu->data_size);
+                break;
+        case AF_INET6:
+                host2addr128_t_be(src_v6, phdr6->src_addr);
+                host2addr128_t_be(dest_v6, phdr6->dest_addr);
+                phdr6->udp_length = host2uint32_t_be(pdu->data_size);
+                memset(phdr6->zeroes, 0, 3);
+                phdr6->next = IP_PROTO_UDP;
+                break;
+        default:
+                assert(false);
+        }
+        
+        return src_af;
 }
 
@@ -107 +134 @@
 {
         uint16_t cs_phdr;
-        uint16_t cs_all;
         udp_phdr_t phdr;
-
-        udp_phdr_setup(pdu, &phdr);
-        cs_phdr = udp_checksum_calc(UDP_CHECKSUM_INIT, (void *)&phdr,
-            sizeof(udp_phdr_t));
-        cs_all = udp_checksum_calc(cs_phdr, pdu->data, pdu->data_size);
-
-        return cs_all;
+        udp_phdr6_t phdr6;
+        
+        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 AF_INET6:
+                cs_phdr = udp_checksum_calc(UDP_CHECKSUM_INIT, (void *) &phdr6,
+                    sizeof(udp_phdr6_t));
+                break;
+        default:
+                assert(false);
+        }
+        
+        return udp_checksum_calc(cs_phdr, pdu->data, pdu->data_size);
 }
 
@@ -179 +215 @@
                 return ENOMEM;
 
+        npdu->iplink = sp->iplink;
         npdu->src = sp->local.addr;
         npdu->dest = sp->foreign.addr;