Add ethernet attributes

diff --git a/share/dictionary.ethernet b/share/dictionary.ethernet
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d60ed83252bb79cb0d8b661377710a697de0cef4 100644 (file)
--- a/share/dictionary.ethernet
+++ b/share/dictionary.ethernet
@@ -0,0 +1,41 @@
+# -*- text -*-
+# Copyright (C) 2017 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#      Internal representation of Ethernet addresses and VLAN tags
+#
+##############################################################################
+
+#
+#      All of these attributes are internal.
+#
+FLAGS  internal
+
+ATTRIBUTE      Ethernet-TLV                            1194    tlv
+BEGIN-TLV      Ethernet-TLV
+
+# Must be the same value as PROTO_OPT_GROUP_CUSTOM
+ATTRIBUTE      Ethernet-Custom-TLV                     1       tlv
+
+BEGIN-TLV      Ethernet-Custom-TLV
+ATTRIBUTE      Ethernet-SVLAN-TPID                     0       uint16
+ATTRIBUTE      Ethernet-SVLAN-PCP                      1       uint8
+ATTRIBUTE      Ethernet-SVLAN-DEI                      2       bool
+ATTRIBUTE      Ethernet-SVLAN-VID                      3       uint16
+ATTRIBUTE      Ethernet-CVLAN-TPID                     4       uint16
+ATTRIBUTE      Ethernet-CVLAN-PCP                      5       uint8
+ATTRIBUTE      Ethernet-CVLAN-DEI                      6       bool
+ATTRIBUTE      Ethernet-CVLAN-VID                      7       uint16
+END-TLV                Ethernet-Custom-TLV
+
+# Must be the same value as PROTO_OPT_GROUP_L2
+ATTRIBUTE      Ethernet-L2-TLV                         2       tlv
+BEGIN-TLV      Ethernet-L2-TLV
+
+ATTRIBUTE      Ethernet-L2-Payload-Len                 0       uint16
+ATTRIBUTE      Ethernet-Src-Address                    1       ether
+ATTRIBUTE      Ethernet-Dst-Address                    2       ether
+ATTRIBUTE      Ethernet-Next-Protocol                  2       uint16
+END-TLV                Ethernet-L2-TLV
+
+END-TLV                Ethernet-TLV

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 59aa59522f2e95b27fcb608936cd289f03e01685..195e57eb8e27ffa87eab96cddeb4bd5fb4957bbd 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -347,6 +347,11 @@ ATTRIBUTE  LDAP-Sync-Entry-DN                      7       string
 ATTRIBUTE      LDAP-Sync-Entry-UUID                    8       octets
 END-TLV                LDAP-Sync-TLV
 
+#
+#      Consumes attribute 1194
+#
+$INCLUDE dictionary.ethernet
+
 #
 #      Range:  1200-1210
 #