Changeset 02a09ed in mainline for uspace/srv/net/inetsrv/icmp.c

Timestamp:

2013-06-28T20:20:03Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/srv/net/inetsrv/icmp.c (modified) (3 diffs)

uspace/srv/net/inetsrv/icmp.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdlib.h>
-
+#include <net/socket_codes.h>
 #include "icmp.h"
 #include "icmp_std.h"
@@ -129 +129 @@
         inetping_sdu_t sdu;
         
-        int rc = inet_addr_pack(&dgram->src, &sdu.src);
-        if (rc != EOK)
-                return rc;
+        uint16_t family = inet_addr_get(&dgram->src, &sdu.src, NULL);
+        if (family != AF_INET)
+                return EINVAL;
         
-        rc = inet_addr_pack(&dgram->dest, &sdu.dest);
-        if (rc != EOK)
-                return rc;
+        family = inet_addr_get(&dgram->dest, &sdu.dest, NULL);
+        if (family != AF_INET)
+                return EINVAL;
         
         sdu.seq_no = uint16_t_be2host(reply->seq_no);
@@ -168 +168 @@
         inet_dgram_t dgram;
         
-        inet_addr_unpack(sdu->src, &dgram.src);
-        inet_addr_unpack(sdu->dest, &dgram.dest);
+        inet_addr_set(sdu->src, &dgram.src);
+        inet_addr_set(sdu->dest, &dgram.dest);
         
         dgram.tos = ICMP_TOS;