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

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

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

uspace/srv/net/inetsrv/icmp.c

@@ -120 +120 @@
 static int icmp_recv_echo_reply(inet_dgram_t *dgram)
 {
-        icmp_echo_t *reply;
-        inetping_sdu_t sdu;
-        uint16_t ident;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_reply()");
-
+        
         if (dgram->size < sizeof(icmp_echo_t))
                 return EINVAL;
-
-        reply = (icmp_echo_t *)dgram->data;
-
-        sdu.src = dgram->src;
-        sdu.dest = dgram->dest;
+        
+        icmp_echo_t *reply = (icmp_echo_t *) dgram->data;
+        
+        inetping_sdu_t sdu;
+        
+        int rc = inet_addr_pack(&dgram->src, &sdu.src);
+        if (rc != EOK)
+                return rc;
+        
+        rc = inet_addr_pack(&dgram->dest, &sdu.dest);
+        if (rc != EOK)
+                return rc;
+        
         sdu.seq_no = uint16_t_be2host(reply->seq_no);
         sdu.data = reply + sizeof(icmp_echo_t);
         sdu.size = dgram->size - sizeof(icmp_echo_t);
-        ident = uint16_t_be2host(reply->ident);
+        
+        uint16_t ident = uint16_t_be2host(reply->ident);
 
         return inetping_recv(ident, &sdu);
@@ -143 +148 @@
 int icmp_ping_send(uint16_t ident, inetping_sdu_t *sdu)
 {
-        inet_dgram_t dgram;
-        icmp_echo_t *request;
-        void *rdata;
-        size_t rsize;
-        uint16_t checksum;
-        int rc;
-
-        rsize = sizeof(icmp_echo_t) + sdu->size;
-        rdata = calloc(rsize, 1);
+        size_t rsize = sizeof(icmp_echo_t) + sdu->size;
+        void *rdata = calloc(rsize, 1);
         if (rdata == NULL)
                 return ENOMEM;
-
-        request = (icmp_echo_t *)rdata;
-
+        
+        icmp_echo_t *request = (icmp_echo_t *)rdata;
+        
         request->type = ICMP_ECHO_REQUEST;
         request->code = 0;
@@ -162 +160 @@
         request->ident = host2uint16_t_be(ident);
         request->seq_no = host2uint16_t_be(sdu->seq_no);
-
+        
         memcpy(rdata + sizeof(icmp_echo_t), sdu->data, sdu->size);
-
-        checksum = inet_checksum_calc(INET_CHECKSUM_INIT, rdata, rsize);
+        
+        uint16_t checksum = inet_checksum_calc(INET_CHECKSUM_INIT, rdata, rsize);
         request->checksum = host2uint16_t_be(checksum);
-
-        dgram.src = sdu->src;
-        dgram.dest = sdu->dest;
+        
+        inet_dgram_t dgram;
+        
+        inet_addr_unpack(sdu->src, &dgram.src);
+        inet_addr_unpack(sdu->dest, &dgram.dest);
+        
         dgram.tos = ICMP_TOS;
         dgram.data = rdata;
         dgram.size = rsize;
-
-        rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
-
+        
+        int rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
+        
         free(rdata);
         return rc;