defintions: define ND Route Information option

We can't express a 2-bit integer at a 3 bit offset yet
so just print the reserved value.

Also allows this option to be excluded, fixing #506.

diff --git a/src/dhcpcd-definitions-small.conf b/src/dhcpcd-definitions-small.conf
index 6d7eeb14b0147b37cfd73a4ccc344ef39b999290..3a9b24d8d0964db95184305c11aa292c2ace45eb 100644 (file)
--- a/src/dhcpcd-definitions-small.conf
+++ b/src/dhcpcd-definitions-small.conf
@@ -61,7 +61,7 @@ embed         bitflags=LAH            flags
 embed          uint32                  vltime
 embed          uint32                  pltime
 embed          uint32                  reserved
-embed          array ip6address        prefix
+embed          ip6address              prefix
 
 # option 4 is only for Redirect messages
 
@@ -69,6 +69,13 @@ definend 5   embed                   mtu
 embed          uint16                  reserved
 embed          uint32                  mtu
 
+definend 24    index embed             route_information
+embed          byte                    length
+# bits 4 and 5 are route preference, but we can't express this
+embed          byte                    reserved
+embed          uint32                  lifetime
+embed          ip6address              prefix
+
 # ND6 options, RFC6101
 definend 25    index embed             rdnss
 embed          uint16                  reserved

diff --git a/src/dhcpcd-definitions.conf b/src/dhcpcd-definitions.conf
index 9002435d6dc92e77d63fa9af86d3816bc007fe60..bf172018ca9626128fd5f58a6bbaf60d2494b899 100644 (file)
--- a/src/dhcpcd-definitions.conf
+++ b/src/dhcpcd-definitions.conf
@@ -398,7 +398,7 @@ embed               bitflags=LAH            flags
 embed          uint32                  vltime
 embed          uint32                  pltime
 embed          uint32                  reserved
-embed          array ip6address        prefix
+embed          ip6address              prefix
 
 # option 4 is only for Redirect messages
 
@@ -412,6 +412,13 @@ embed              uint16                  reserved
 embed          uint16                  preference
 embed          uint16                  lifetime
 
+definend 24    index embed             route_information
+embed          byte                    length
+# bits 4 and 5 are route preference, but we can't express this
+embed          byte                    reserved
+embed          uint32                  lifetime
+embed          ip6address              prefix
+
 # ND6 options, RFC6101
 definend 25    index embed             rdnss
 embed          uint16                  reserved