Changeset 52543 in vbox for trunk/include/iprt

Timestamp:

Aug 31, 2014 11:48:41 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95798

Message:

IntNet: follow up to r85262 - refactor rewriting of link-level address
option in IPv6 Neighbor Discovery datagrams when bridging to wireless.

Ok bird@

File:

• trunk/include/iprt/net.h (modified) (3 diffs)

trunk/include/iprt/net.h

@@ -801 +801 @@
 
 
-/** @todo add ICMPv6 when needed. */
+/**
+ * IPv6 ICMP packet header.
+ */
+#pragma pack(1)
+typedef struct RTNETICMPV6HDR
+{
+    /** 00 - The ICMPv6 message type. */
+    uint8_t         icmp6_type;
+    /** 01 - Type specific code that further qualifies the message. */
+    uint8_t         icmp6_code;
+    /** 02 - Checksum of the ICMPv6 message. */
+    uint16_t        icmp6_cksum;
+} RTNETICMPV6HDR;
+#pragma pack()
+AssertCompileSize(RTNETICMPV6HDR, 4);
+/** Pointer to an ICMPv6 packet header. */
+typedef RTNETICMPV6HDR *PRTNETICMPV6HDR;
+/** Pointer to a const ICMP packet header. */
+typedef RTNETICMPV6HDR const *PCRTNETICMPV6HDR;
 
 #define RTNETIPV6_PROT_ICMPV6       (58)
-#define RTNETIPV6_ICMPV6_CODE_0     (0)
 
 /** @name Internet Control Message Protocol version 6 (ICMPv6) message types.
@@ -815 +832 @@
 /** @} */
 
-/** @deprecated */
-#define RTNETIPV6_ICMP_NS_TYPE      (RTNETIPV6_ICMP_TYPE_NS)
-/** @deprecated */
-#define RTNETIPV6_ICMP_NA_TYPE      (RTNETIPV6_ICMP_TYPE_NA)
-
+/** @name Neighbor Discovery option types
+ * @{ */
 #define RTNETIPV6_ICMP_ND_SLLA_OPT  (1)
 #define RTNETIPV6_ICMP_ND_TLLA_OPT  (2)
-#define RTNETIPV6_ICMP_ND_LLA_LEN   (1)
-
-/** ICMPv6 ND Source Link Layer Address option */
-#pragma pack(1)
-typedef struct RTNETNDP_SLLA_OPT
+/** @} */
+
+/** ICMPv6 ND Source/Target Link Layer Address option */
+#pragma pack(1)
+typedef struct RTNETNDP_LLA_OPT
 {
     uint8_t type;
     uint8_t len;
-    RTMAC slla;
-} RTNETNDP_SLLA_OPT;
-#pragma pack()
-
-AssertCompileSize(RTNETNDP_SLLA_OPT, 1+1+6);
-
-typedef RTNETNDP_SLLA_OPT *PRTNETNDP_SLLA_OPT;
-typedef RTNETNDP_SLLA_OPT const *PCRTNETNDP_SLLA_OPT;
+    RTMAC lla;
+} RTNETNDP_LLA_OPT;
+#pragma pack()
+
+AssertCompileSize(RTNETNDP_LLA_OPT, 1+1+6);
+
+typedef RTNETNDP_LLA_OPT *PRTNETNDP_LLA_OPT;
+typedef RTNETNDP_LLA_OPT const *PCRTNETNDP_LLA_OPT;
 
 /** ICMPv6 ND Neighbor Sollicitation */
@@ -843 +857 @@
 typedef struct RTNETNDP
 {
-    /** ICMPv6 type. */
-    uint8_t icmp6_type;
-    /** ICMPv6 code. */
-    uint8_t icmp6_code;
-    /** ICMPv6 checksum */
-    uint16_t icmp6_cksum;
-    /** reserved */
+    /** 00 - The ICMPv6 header. */
+    RTNETICMPV6HDR Hdr;
+    /** 04 - reserved */
     uint32_t reserved;
-    /** target address */
+    /** 08 - target address */
     RTNETADDRIPV6 target_address;
 } RTNETNDP;
 #pragma pack()
-AssertCompileSize(RTNETNDP, 1+1+2+4+16);
+AssertCompileSize(RTNETNDP, 4+4+16);
 /** Pointer to a NDP ND packet. */
 typedef RTNETNDP *PRTNETNDP;