Changeset 0c2d9bb in mainline for uspace/srv/net/inetsrv/icmpv6.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/inetsrv/icmpv6.c (modified) (8 diffs)

uspace/srv/net/inetsrv/icmpv6.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
+#include <types/inetping.h>
 #include "icmpv6.h"
 #include "icmpv6_std.h"
 #include "inetsrv.h"
-#include "inetping6.h"
+#include "inetping.h"
 #include "pdu.h"
 
@@ -58 +58 @@
         
         addr128_t src_v6;
-        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &src_v6);
+        ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6);
         
         addr128_t dest_v6;
-        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &dest_v6);
-        
-        if ((src_af != dest_af) || (src_af != AF_INET6))
+        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6);
+        
+        if ((src_ver != dest_ver) || (src_ver != ip_v6))
                 return EINVAL;
         
@@ -80 +80 @@
         inet_get_srcaddr(&dgram->src, 0, &rdgram.src);
         rdgram.dest = dgram->src;
+        rdgram.iplink = 0;
         rdgram.tos = 0;
         rdgram.data = reply;
@@ -115 +116 @@
                 return EINVAL;
         
-        inetping6_sdu_t sdu;
-        
-        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &sdu.src);
-        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &sdu.dest);
-        
-        if ((src_af != dest_af) || (src_af != AF_INET6))
-                return EINVAL;
+        inetping_sdu_t sdu;
+        
+        sdu.src = dgram->src;
+        sdu.dest = dgram->dest;
         
         icmpv6_message_t *reply = (icmpv6_message_t *) dgram->data;
@@ -131 +129 @@
         uint16_t ident = uint16_t_be2host(reply->un.echo.ident);
         
-        return inetping6_recv(ident, &sdu);
+        return inetping_recv(ident, &sdu);
 }
 
@@ -159 +157 @@
 }
 
-int icmpv6_ping_send(uint16_t ident, inetping6_sdu_t *sdu)
+int icmpv6_ping_send(uint16_t ident, inetping_sdu_t *sdu)
 {
         size_t rsize = sizeof(icmpv6_message_t) + sdu->size;
@@ -178 +176 @@
         inet_dgram_t dgram;
         
-        inet_addr_set6(sdu->src, &dgram.src);
-        inet_addr_set6(sdu->dest, &dgram.dest);
+        dgram.src = sdu->src;
+        dgram.dest = sdu->dest;
+        dgram.iplink = 0;
         dgram.tos = 0;
         dgram.data = rdata;
@@ -186 +185 @@
         icmpv6_phdr_t phdr;
         
-        host2addr128_t_be(sdu->src, phdr.src_addr);
-        host2addr128_t_be(sdu->dest, phdr.dest_addr);
+        assert(sdu->src.version == ip_v6);
+        assert(sdu->dest.version == ip_v6);
+        
+        host2addr128_t_be(sdu->src.addr6, phdr.src_addr);
+        host2addr128_t_be(sdu->dest.addr6, phdr.dest_addr);
         phdr.length = host2uint32_t_be(dgram.size);
         memset(phdr.zeroes, 0, 3);