Changeset 47f5a77 in mainline for uspace/srv/net/inetsrv/icmpv6.c

Timestamp:

2013-07-17T08:46:06Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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) (7 diffs)

uspace/srv/net/inetsrv/icmpv6.c

@@ -47 +47 @@
 #include "pdu.h"
 
-static int ndp_received(inet_dgram_t *dgram)
-{
-        // FIXME TODO
-        return ENOTSUP;
-}
-
 static int icmpv6_recv_echo_request(inet_dgram_t *dgram)
 {
@@ -84 +78 @@
         inet_dgram_t rdgram;
         
-        rdgram.src = dgram->dest;
+        inet_get_srcaddr(&dgram->src, 0, &rdgram.src);
         rdgram.dest = dgram->src;
         rdgram.tos = 0;
@@ -90 +84 @@
         rdgram.size = size;
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(dest_v6, phdr.src_addr);
@@ -100 +94 @@
         uint16_t cs_phdr =
             inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-            sizeof(icmpv6_pseudo_header));
+            sizeof(icmpv6_phdr_t));
         
         uint16_t cs_all = inet_checksum_calc(cs_phdr, reply, size);
@@ -156 +150 @@
         case ICMPV6_NEIGHBOUR_SOLICITATION:
         case ICMPV6_NEIGHBOUR_ADVERTISEMENT:
-#ifdef ACCEPT_RA
         case ICMPV6_ROUTER_ADVERTISEMENT:
-#endif
                 return ndp_received(dgram);
         default:
@@ -192 +184 @@
         dgram.size = rsize;
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(sdu->src, phdr.src_addr);
@@ -202 +194 @@
         uint16_t cs_phdr =
             inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-            sizeof(icmpv6_pseudo_header));
+            sizeof(icmpv6_phdr_t));
         
         uint16_t cs_all = inet_checksum_calc(cs_phdr, rdata, rsize);