more convert octets to struct

diff --git a/share/dictionary/dhcpv6/dictionary.rfc7600 b/share/dictionary/dhcpv6/dictionary.rfc7600
index 404da7882878b3289e6434e53c6895b422bf02db..e06cf531993b674d4a7da7d1d87ea9745e30361a 100644 (file)
--- a/share/dictionary/dhcpv6/dictionary.rfc7600
+++ b/share/dictionary/dhcpv6/dictionary.rfc7600
@@ -10,6 +10,24 @@
 #
 ##############################################################################
 
+#  This is really "group" of 4RD-Map-Rule
 ATTRIBUTE      4RD                                     97      octets          # Complex struct see RFC 7600
-ATTRIBUTE      4RD-Map-Rule                            98      octets          # Complex struct see RFC 7600
-ATTRIBUTE      4RD-Non-Map-Rule                        99      octets          # Complex struct see RFC 7600
+
+ATTRIBUTE      4RD-Map-Rule                            98      struct
+MEMBER         4RD-Map-Rule-IPv4-Prefix-Len            uint8
+MEMBER         4RD-Map-Rule-IPv6-Prefix-Len            uint8
+MEMBER         4RD-Map-Rule-EA-Len                     uint8
+MEMBER         4RD-Map-Rule-WPK-Authorized             uint8   # only high bit used
+MEMBER         4RD-Map-Rule-IPv4-Prefix                octets[4]
+MEMBER         4RD-Map-Rule-IPv6-Prefix                octets[12]
+
+VALUE 4RD-Map-Rule-WPK-Authorized Authorized 0x80
+VALUE 4RD-Map-Rule-WPK-Authorized Not-Authorized 0x00
+
+ATTRIBUTE      4RD-Non-Map-Rule                        99      struct
+MEMBER         4RD-Non-Map-Rule-Flag                   uint8
+MEMBER         4RD-Non-Map-Rule-Domain-PMTU            uint8
+
+#  Really bit masks
+VALUE 4RD-Non-Map-Rule-Flag Tunnel-Traffic-Class-Provided 0x01
+VALUE 4RD-Non-Map-Rule-Flag Hub-And-Spoke              0x80