Pulled dictionary.rfc4679 from CVS head

diff --git a/share/dictionary b/share/dictionary
index 4298012..3e685a3 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -71,6 +71,7 @@ $INCLUDE dictionary.rfc3576
 $INCLUDE dictionary.rfc3580
 $INCLUDE dictionary.rfc4372
 $INCLUDE dictionary.rfc4675
+$INCLUDE dictionary.rfc4679
 
 #
 #      Include vendor dictionaries after the standard ones.

diff --git a/share/dictionary.rfc4679 b/share/dictionary.rfc4679
new file mode 100644 (file)
index 0000000..d410d7c
--- /dev/null
+++ b/share/dictionary.rfc4679
@@ -0,0 +1,62 @@
+# -*- text -*-
+#
+#      Attributes and values defined in RFC 4679.
+#      http://www.ietf.org/rfc/4679.txt
+#
+#      $Id$
+#
+
+VENDOR         ADSL-Forum                      3561
+
+BEGIN-VENDOR   ADSL-Forum
+
+#
+#  The first two attributes are prefixed with "ADSL-" because of
+#  conflicting names in dictionary.redback.
+#
+ATTRIBUTE      ADSL-Agent-Circuit-Id                   1       string
+ATTRIBUTE      ADSL-Agent-Remote-Id                    2       string
+ATTRIBUTE      Actual-Data-Rate-Upstream               129     integer
+ATTRIBUTE      Actual-Data-Rate-Downstream             130     integer
+ATTRIBUTE      Minimum-Data-Rate-Upstream              131     integer
+ATTRIBUTE      Minimum-Data-Rate-Downstream            132     integer
+ATTRIBUTE      Attainable-Data-Rate-Upstream           133     integer
+ATTRIBUTE      Attainable-Data-Rate-Downstream         134     integer
+ATTRIBUTE      Maximum-Data-Rate-Upstream              135     integer
+ATTRIBUTE      Maximum-Data-Rate-Downstream            136     integer
+ATTRIBUTE      Minimum-Data-Rate-Upstream-Low-Power    137     integer
+ATTRIBUTE      Minimum-Data-Rate-Downstream-Low-Power  138     integer
+ATTRIBUTE      Maximum-Interleaving-Delay-Upstream     139     integer
+ATTRIBUTE      Actual-Interleaving-Delay-Upstream      140     integer
+ATTRIBUTE      Maximum-Interleaving-Delay-Downstream   141     integer
+ATTRIBUTE      Actual-Interleaving-Delay-Downstream    142     integer
+
+#
+#  This next attribute has a weird encoding.
+#
+#  Octet[0] - 0x01     AAL5
+#  Octet[0] - 0x02     Ethernet
+
+#  Octet[1] - 0x00     Not Available
+#  Octet[1] - 0x01     Untagged Ethernet
+#  Octet[1] - 0x02     Single-Tagged Ethernet
+
+#  Octet[2] - 0x00     Not available
+#  Octet[2] - 0x01     PPPoA LLC
+#  Octet[2] - 0x02     PPPoA Null
+#  Octet[2] - 0x03     IPoA LLC
+#  Octet[2] - 0x04     IPoA NULL
+#  Octet[2] - 0x05     Ethernet over AAL5 LLC with FCS
+#  Octet[2] - 0x06     Ethernet over AAL5 LLC without FCS
+#  Octet[2] - 0x07     Ethernet over AAL5 Null with FCS
+#  Octet[2] - 0x08     Ethernet over AAL5 Null without FCS
+#
+ATTRIBUTE      Access-Loop-Encapsulation               144     octets # 3
+
+#
+#  If this attribute exists, it means that IFW has been performed
+#  for the subscribers session.
+#
+ATTRIBUTE      IWF-Session                             252     octets # 0
+
+END-VENDOR ADSL-Forum