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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/icmp.c (modified) (5 diffs)

uspace/srv/net/inetsrv/icmp.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
+#include <types/inetping.h>
 #include "icmp.h"
 #include "icmp_std.h"
@@ -105 +105 @@
         reply->checksum = host2uint16_t_be(checksum);
 
+        rdgram.iplink = 0;
         rdgram.src = dgram->dest;
         rdgram.dest = dgram->src;
@@ -121 +122 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_reply()");
-        
+
         if (dgram->size < sizeof(icmp_echo_t))
                 return EINVAL;
-        
+
         icmp_echo_t *reply = (icmp_echo_t *) dgram->data;
-        
+
         inetping_sdu_t sdu;
-        
-        uint16_t family = inet_addr_get(&dgram->src, &sdu.src, NULL);
-        if (family != AF_INET)
-                return EINVAL;
-        
-        family = inet_addr_get(&dgram->dest, &sdu.dest, NULL);
-        if (family != AF_INET)
-                return EINVAL;
-        
+
+        sdu.src = dgram->src;
+        sdu.dest = dgram->dest;
         sdu.seq_no = uint16_t_be2host(reply->seq_no);
         sdu.data = reply + sizeof(icmp_echo_t);
         sdu.size = dgram->size - sizeof(icmp_echo_t);
-        
+
         uint16_t ident = uint16_t_be2host(reply->ident);
 
@@ -152 +147 @@
         if (rdata == NULL)
                 return ENOMEM;
-        
+
         icmp_echo_t *request = (icmp_echo_t *) rdata;
-        
+
         request->type = ICMP_ECHO_REQUEST;
         request->code = 0;
@@ -160 +155 @@
         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);
-        
+
         uint16_t checksum = inet_checksum_calc(INET_CHECKSUM_INIT, rdata, rsize);
         request->checksum = host2uint16_t_be(checksum);
-        
+
         inet_dgram_t dgram;
-        
-        inet_addr_set(sdu->src, &dgram.src);
-        inet_addr_set(sdu->dest, &dgram.dest);
-        
+
+        dgram.src = sdu->src;
+        dgram.dest = sdu->dest;
+        dgram.iplink = 0;
         dgram.tos = ICMP_TOS;
         dgram.data = rdata;
         dgram.size = rsize;
-        
+
         int rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
-        
+
         free(rdata);
         return rc;