Changeset 12df1f1 in mainline for uspace/srv/net/inetsrv

Timestamp:

2013-07-15T16:42:08Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a940f1d

Parents:

956d4281

Message:

cherrypick trivial changes from lp:~as-s/helenos/ipv6

Location:

uspace/srv/net/inetsrv

Files:

• icmpv6.c (modified) (4 diffs)
• icmpv6_std.h (modified) (1 diff)
• ndp.h (modified) (1 diff)
• pdu.c (modified) (2 diffs)

uspace/srv/net/inetsrv/icmpv6.c

@@ -84 +84 @@
         rdgram.size = size;
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(dest_v6, phdr.src_addr);
@@ -94 +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);
@@ -186 +186 @@
         dgram.size = rsize;
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(sdu->src, phdr.src_addr);
@@ -196 +196 @@
         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);

uspace/srv/net/inetsrv/icmpv6_std.h

@@ -104 +104 @@
         /** Next header */
         uint8_t next;
-} icmpv6_pseudo_header;
+} icmpv6_phdr_t;
 
 /** NDP neighbour body */

uspace/srv/net/inetsrv/ndp.h

@@ -35 +35 @@
  */
 
-#ifndef ETH_NDP_H_
-#define ETH_NDP_H_
+#ifndef NDP_H_
+#define NDP_H_
 
 #include <sys/types.h>

uspace/srv/net/inetsrv/pdu.c

@@ -464 +464 @@
         addr48(ndp->sender_hw_addr, message->mac);
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(ndp->sender_proto_addr, phdr.src_addr);
@@ -474 +474 @@
         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, dgram->data,