Changeset b86a32e in mainline for uspace/srv/net/inetsrv/icmpv6_std.h

Timestamp:

2013-07-15T12:14:55Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

c84146d3

Parents:

87159eb8 (diff), 956d4281 (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 with mainline changes.

File:

• uspace/srv/net/inetsrv/icmpv6_std.h (modified) (6 diffs)

uspace/srv/net/inetsrv/icmpv6_std.h

@@ -47 +47 @@
 #define INET6_HOP_LIMIT_MAX  255
 
+#define NDP_FLAG_ROUTER     0x80
+#define NDP_FLAG_OVERRIDE   0x40
+#define NDP_FLAG_SOLICITED  0x20
+
 /** ICMPv6 message type */
 enum icmpv6_type {
@@ -83 +87 @@
                         uint8_t flags;
                         /** Reserved bytes */
-                        uint8_t reserved [3];
+                        uint8_t reserved[3];
                 } ndp;
         } un;
@@ -91 +95 @@
 typedef struct {
         /** Source IPv6 address */
-        uint8_t src_addr [16];
+        uint8_t src_addr[16];
         /** Target IPv6 address */
-        uint8_t dest_addr [16];
+        uint8_t dest_addr[16];
         /** ICMPv6 length */
         uint32_t length;
         /** Zeroes */
-        uint8_t zeroes [3];
+        uint8_t zeroes[3];
         /** Next header */
         uint8_t next;
@@ -105 +109 @@
 typedef struct {
         /** Target IPv6 address */
-        uint8_t target_address [16];
+        uint8_t target_address[16];
         /** Option code */
         uint8_t option;
@@ -111 +115 @@
         uint8_t length;
         /** MAC address */
-        uint8_t mac [6];
+        uint8_t mac[6];
 } ndp_message_t;
 
@@ -131 +135 @@
         uint32_t reserved;
         /** Prefix */
-        uint8_t prefix [16];
+        uint8_t prefix[16];
 } ndp_prefix_t;