Dictionary formatting

diff --git a/share/dictionary.3gpp b/share/dictionary.3gpp
index 0d8bd43507d1ab4a5947d27a370a5713d3ace52e..22e9890538dc009125a4db9e465b02418e16b1eb 100644 (file)
--- a/share/dictionary.3gpp
+++ b/share/dictionary.3gpp
@@ -49,13 +49,13 @@ ATTRIBUTE   3GPP-Packet-Filter                      25      octets
 ATTRIBUTE      3GPP-Negotiated-DSCP                    26      byte
 ATTRIBUTE      3GPP-Allocate-IP-Type                   27      byte
 
-VALUE  3GPP-RAT-Type                   UTRAN                   1
-VALUE  3GPP-RAT-TYPE                   GERAN                   2
-VALUE  3GPP-RAT-TYPE                   WLAN                    3
-VALUE  3GPP-RAT-TYPE                   GAN                     4
-VALUE  3GPP-RAT-TYPE                   HSPA-Evolution          5
-VALUE  3GPP-RAT-TYPE                   EUTRAN                  6
-VALUE  3GPP-RAT-TYPE                   Virtual                 7
+VALUE  3GPP-RAT-Type                   UTRAN                   1
+VALUE  3GPP-RAT-TYPE                   GERAN                   2
+VALUE  3GPP-RAT-TYPE                   WLAN                    3
+VALUE  3GPP-RAT-TYPE                   GAN                     4
+VALUE  3GPP-RAT-TYPE                   HSPA-Evolution          5
+VALUE  3GPP-RAT-TYPE                   EUTRAN                  6
+VALUE  3GPP-RAT-TYPE                   Virtual                 7
 VALUE  3GPP-RAT-Type                   IEEE-802.16e            101
 VALUE  3GPP-RAT-Type                   3GPP2-eHRPD             102
 VALUE  3GPP-RAT-Type                   3GPP2-HRPD              103

diff --git a/share/dictionary.3gpp2 b/share/dictionary.3gpp2
index de2be6dd03cb67ff819730c38de491f52f984a77..0476dac6a2d17cb68a8e4ead8d38794000a56070 100644 (file)
--- a/share/dictionary.3gpp2
+++ b/share/dictionary.3gpp2
@@ -133,9 +133,9 @@ ATTRIBUTE   3GPP2-Carrier-ID                        142     string
 # More sub-types
 ATTRIBUTE      3GPP2-GMT-Time-Zone-Offset              143     signed
 
-ATTRIBUTE       3GPP2-HA-Request                        168     integer
-ATTRIBUTE       3GPP2-HA-Authorised                     169     integer
-ATTRIBUTE       3GPP2-IP-Ver-Authorised                 172     integer
-ATTRIBUTE       3GPP2-MIPv4-Mesg-Id                     173     string
+ATTRIBUTE      3GPP2-HA-Request                        168     integer
+ATTRIBUTE      3GPP2-HA-Authorised                     169     integer
+ATTRIBUTE      3GPP2-IP-Ver-Authorised                 172     integer
+ATTRIBUTE      3GPP2-MIPv4-Mesg-Id                     173     string
 
 END-VENDOR 3GPP2

diff --git a/share/dictionary.alcatel.sr b/share/dictionary.alcatel.sr
index d0db9ef0bec6f5f4e62dfd441c2404545c624fc8..dbab7487cc4cb09d7838ca9a3a250d835ff69f9a 100644 (file)
--- a/share/dictionary.alcatel.sr
+++ b/share/dictionary.alcatel.sr
@@ -87,7 +87,7 @@ ATTRIBUTE     Alc-App-Prof-Str                        45      string
 ATTRIBUTE      Alc-Tunnel-Group                        46      string
 ATTRIBUTE      Alc-Tunnel-Algorithm                    47      integer
 
-VALUE  Alc-Tunnel-Algorithm            weighted-access         1
+VALUE  Alc-Tunnel-Algorithm            weighted-access         1
 VALUE  Alc-Tunnel-Algorithm            existing-first          2
 
 ATTRIBUTE      Alc-Tunnel-Max-Sessions                 48      integer has_tag
@@ -175,8 +175,8 @@ ATTRIBUTE   Alc-Credit-Control-Quota                96      string
 ATTRIBUTE      Alc-Tunnel-Challenge                    97      integer has_tag
 ATTRIBUTE      Alc-Force-Nak                           98      string  # CoA
 
-VALUE  Alc-Tunnel-Challenge             never                  1
-VALUE  Alc-Tunnel-Challenge             always                 2
+VALUE  Alc-Tunnel-Challenge            never                   1
+VALUE  Alc-Tunnel-Challenge            always                  2
 
 ATTRIBUTE      Alc-Ipv6-Address                        99      ipv6addr
 ATTRIBUTE      Alc-Serv-Id                             100     integer
@@ -243,84 +243,84 @@ ATTRIBUTE Alc-Acct-O-statmode                     127     string
 # ATM Traffic Descriptor Profiles
 ATTRIBUTE      Alc-ATM-Ingress-TD-Profile              128     integer
 ATTRIBUTE      Alc-ATM-Egress-TD-Profile               129     integer
- 
+
 # Application-assurance transit ip (CoA)
 ATTRIBUTE      Alc-AA-Transit-IP                       130     integer # CoA
- 
+
 VALUE  Alc-AA-Transit-IP               host                    1
 VALUE  Alc-AA-Transit-IP               audit-start             2
 VALUE  Alc-AA-Transit-IP               audit-end               3
- 
+
 # DHCPv6 Relay pool selection attributes
 ATTRIBUTE      Alc-Delegated-IPv6-Pool                 131     string
- 
+
 ATTRIBUTE      Alc-Access-Loop-Rate-Down               132     integer
 ATTRIBUTE      Alc-Access-Loop-Encap-Offset            133     octets
- 
+
 # Submgt SLA-profile filter overrrule
 ATTRIBUTE      Alc-Subscriber-Filter                   134     string
- 
+
 ATTRIBUTE      Alc-PPP-Force-IPv6CP                    135     integer
- 
+
 # One-Time HTTP Redirection
 ATTRIBUTE      Alc-Onetime-Http-Redirection-Filter-Id  136     string
- 
+
 # Used when clearing all radius li triggered sources from a mirror destination
 # via CoA. The value of this attribute is used to authenticate the coa.
 ATTRIBUTE      Alc-Authentication-Policy-Name          137     string # CoA
- 
+
 # Lawful intercept VSAs continued
 ATTRIBUTE      Alc-LI-Intercept-Id                     138     integer encrypt=2
 ATTRIBUTE      Alc-LI-Session-Id                       139     integer encrypt=2
- 
+
 # NAT
 ATTRIBUTE      Alc-Nat-Outside-Serv-Id                 140     integer
 ATTRIBUTE      Alc-Nat-Outside-Ip-Addr                 141     ipaddr
- 
+
 # Mobile-Gateway APN-Password VSA (password used for the next APN AccessReq)
 ATTRIBUTE      Alc-APN-Password                        142     string  encrypt=2
- 
+
 # Mobile-Gateway Next-APN-Name VSA (PGW-APN to be used for the session)
 ATTRIBUTE      Alc-APN-Name                            143     string
- 
+
 ATTRIBUTE      Alc-Tunnel-Acct-Policy                  144     string  has_tag
- 
+
 # Wlan-Gateway
 ATTRIBUTE      Alc-Mgw-Interface-Type                  145     integer
- 
+
 VALUE  Alc-Mgw-Interface-Type          gn                      1
 VALUE  Alc-Mgw-Interface-Type          s2a                     2
 VALUE  Alc-Mgw-Interface-Type          s2b                     3
- 
+
 ATTRIBUTE      Alc-Wlan-APN-Name                       146     string
- 
+
 ATTRIBUTE      Alc-MsIsdn                              147     string
- 
+
 # WIFI Received Signal Strength Indication
 ATTRIBUTE      Alc-RSSI                                148     integer
- 
+
 # Number of attached WIFI UEs
 ATTRIBUTE      Alc-Num-Attached-UEs                    149     integer
- 
+
 # Mobile-Gateway Charging-profile-ID VSA
 ATTRIBUTE      Alc-Charging-Prof-ID                    150     integer
- 
+
 # 151-155 are currently unused
- 
+
 # Application-Assurance Radius Accounting Attributes
 ATTRIBUTE      Alc-AA-Group-Partition-Isa-Id           156     string
- 
+
 # Application-Assurance Radius Peer Information
 ATTRIBUTE      Alc-AA-Peer-Identifier                  157     string
- 
+
 # Relative Session-Timeout
 ATTRIBUTE      Alc-Relative-Session-Timeout            160     integer
- 
+
 # 161-162 are currently unused
- 
+
 # Accounting interim update trigger reason
 ATTRIBUTE      Alc-Acct-Triggered-Reason               163     integer
- 
+
 VALUE  Alc-Acct-Triggered-Reason       regular                 1
 VALUE  Alc-Acct-Triggered-Reason       sla-start               2
 VALUE  Alc-Acct-Triggered-Reason       sla-stop                3
@@ -328,8 +328,8 @@ VALUE       Alc-Acct-Triggered-Reason       Framed-IP-Address-up    4
 VALUE  Alc-Acct-Triggered-Reason       Framed-IP-Address-down  5
 VALUE  Alc-Acct-Triggered-Reason       Alc-Ipv6-Address-up     6
 VALUE  Alc-Acct-Triggered-Reason       Alc-Ipv6-Address-down   7
-VALUE  Alc-Acct-Triggered-Reason       Delegated-IPv6-Prefix-up        8
-VALUE  Alc-Acct-Triggered-Reason       Delegated-IPv6-Prefix-down      9
+VALUE  Alc-Acct-Triggered-Reason       Delegated-IPv6-Prefix-up 8
+VALUE  Alc-Acct-Triggered-Reason       Delegated-IPv6-Prefix-down 9
 VALUE  Alc-Acct-Triggered-Reason       Framed-IPv6-Prefix-up   10
 VALUE  Alc-Acct-Triggered-Reason       Framed-IPv6-Prefix-down 11
 

diff --git a/share/dictionary.alvarion b/share/dictionary.alvarion
index a57e2f3e8791bc2e103bd7182286e9aa8a3813c9..e9adfeb406c23b86d66b5e857a481963c9f27f82 100644 (file)
--- a/share/dictionary.alvarion
+++ b/share/dictionary.alvarion
@@ -45,96 +45,96 @@ ATTRIBUTE   Alvarion-VSA-6                          6       string
 ATTRIBUTE      Alvarion-VSA-7                          7       string
 ATTRIBUTE      Alvarion-VSA-8                          8       string
 ATTRIBUTE      Alvarion-VSA-9                          9       string
-ATTRIBUTE      Alvarion-VSA-10                 10      string
-ATTRIBUTE      Alvarion-VSA-11                 11      string
-ATTRIBUTE      Alvarion-VSA-12                 12      string
-ATTRIBUTE      Alvarion-VSA-13                 13      string
-ATTRIBUTE      Alvarion-VSA-14                 14      string
-ATTRIBUTE      Alvarion-VSA-15                 15      string
-ATTRIBUTE      Alvarion-VSA-16                 16      string
-ATTRIBUTE      Alvarion-VSA-17                 17      string
-ATTRIBUTE      Alvarion-VSA-18                 18      string
-ATTRIBUTE      Alvarion-VSA-19                 19      string
-ATTRIBUTE      Alvarion-VSA-20                 20      string
-ATTRIBUTE      Alvarion-VSA-21                 21      string
-ATTRIBUTE      Alvarion-VSA-22                 22      string
-ATTRIBUTE      Alvarion-VSA-23                 23      string
-ATTRIBUTE      Alvarion-VSA-24                 24      string
-ATTRIBUTE      Alvarion-VSA-25                 25      string
-ATTRIBUTE      Alvarion-VSA-26                 26      string
-ATTRIBUTE      Alvarion-VSA-27                 27      string
-ATTRIBUTE      Alvarion-VSA-28                 28      string
-ATTRIBUTE      Alvarion-VSA-29                 29      string
-ATTRIBUTE      Alvarion-VSA-30                 30      string
-ATTRIBUTE      Alvarion-VSA-31                 31      string
-ATTRIBUTE      Alvarion-VSA-32                 32      string
-ATTRIBUTE      Alvarion-VSA-33                 33      string
-ATTRIBUTE      Alvarion-VSA-34                 34      string
-ATTRIBUTE      Alvarion-VSA-35                 35      string
-ATTRIBUTE      Alvarion-VSA-36                 36      string
-ATTRIBUTE      Alvarion-VSA-37                 37      string
-ATTRIBUTE      Alvarion-VSA-38                 38      string
-ATTRIBUTE      Alvarion-VSA-39                 39      string
-ATTRIBUTE      Alvarion-VSA-40                 40      string
-ATTRIBUTE      Alvarion-VSA-41                 41      string
-ATTRIBUTE      Alvarion-VSA-42                 42      string
-ATTRIBUTE      Alvarion-VSA-43                 43      string
-ATTRIBUTE      Alvarion-VSA-44                 44      string
-ATTRIBUTE      Alvarion-VSA-45                 45      string
-ATTRIBUTE      Alvarion-VSA-46                 46      string
-ATTRIBUTE      Alvarion-VSA-47                 47      string
-ATTRIBUTE      Alvarion-VSA-48                 48      string
-ATTRIBUTE      Alvarion-VSA-49                 49      string
-ATTRIBUTE      Alvarion-VSA-50                 50      string
-ATTRIBUTE      Alvarion-VSA-51                 51      string
-ATTRIBUTE      Alvarion-VSA-52                 52      string
-ATTRIBUTE      Alvarion-VSA-53                 53      string
-ATTRIBUTE      Alvarion-VSA-54                 54      string
-ATTRIBUTE      Alvarion-VSA-55                 55      string
-ATTRIBUTE      Alvarion-VSA-56                 56      string
-ATTRIBUTE      Alvarion-VSA-57                 57      string
-ATTRIBUTE      Alvarion-VSA-58                 58      string
-ATTRIBUTE      Alvarion-VSA-59                 59      string
-ATTRIBUTE      Alvarion-VSA-60                 60      string
-ATTRIBUTE      Alvarion-VSA-61                 61      string
-ATTRIBUTE      Alvarion-VSA-62                 62      string
-ATTRIBUTE      Alvarion-VSA-63                 63      string
-ATTRIBUTE      Alvarion-VSA-64                 64      string
-ATTRIBUTE      Alvarion-VSA-65                 65      string
-ATTRIBUTE      Alvarion-VSA-66                 66      string
-ATTRIBUTE      Alvarion-VSA-67                 67      string
-ATTRIBUTE      Alvarion-VSA-68                 68      string
-ATTRIBUTE      Alvarion-VSA-69                 69      string
-ATTRIBUTE      Alvarion-VSA-70                 70      string
-ATTRIBUTE      Alvarion-VSA-71                 71      string
-ATTRIBUTE      Alvarion-VSA-72                 72      string
-ATTRIBUTE      Alvarion-VSA-73                 73      string
-ATTRIBUTE      Alvarion-VSA-74                 74      string
-ATTRIBUTE      Alvarion-VSA-75                 75      string
-ATTRIBUTE      Alvarion-VSA-76                 76      string
-ATTRIBUTE      Alvarion-VSA-77                 77      string
-ATTRIBUTE      Alvarion-VSA-78                 78      string
-ATTRIBUTE      Alvarion-VSA-79                 79      string
-ATTRIBUTE      Alvarion-VSA-80                 80      string
-ATTRIBUTE      Alvarion-VSA-81                 81      string
-ATTRIBUTE      Alvarion-VSA-82                 82      string
-ATTRIBUTE      Alvarion-VSA-83                 83      string
-ATTRIBUTE      Alvarion-VSA-84                 84      string
-ATTRIBUTE      Alvarion-VSA-85                 85      string
-ATTRIBUTE      Alvarion-VSA-86                 86      string
-ATTRIBUTE      Alvarion-VSA-87                 87      string
-ATTRIBUTE      Alvarion-VSA-88                 88      string
-ATTRIBUTE      Alvarion-VSA-89                 89      string
-ATTRIBUTE      Alvarion-VSA-90                 90      string
-ATTRIBUTE      Alvarion-VSA-91                 91      string
-ATTRIBUTE      Alvarion-VSA-92                 92      string
-ATTRIBUTE      Alvarion-VSA-93                 93      string
-ATTRIBUTE      Alvarion-VSA-94                 94      string
-ATTRIBUTE      Alvarion-VSA-95                 95      string
-ATTRIBUTE      Alvarion-VSA-96                 96      string
-ATTRIBUTE      Alvarion-VSA-97                 97      string
-ATTRIBUTE      Alvarion-VSA-98                 98      string
-ATTRIBUTE      Alvarion-VSA-99                 99      string
+ATTRIBUTE      Alvarion-VSA-10                         10      string
+ATTRIBUTE      Alvarion-VSA-11                         11      string
+ATTRIBUTE      Alvarion-VSA-12                         12      string
+ATTRIBUTE      Alvarion-VSA-13                         13      string
+ATTRIBUTE      Alvarion-VSA-14                         14      string
+ATTRIBUTE      Alvarion-VSA-15                         15      string
+ATTRIBUTE      Alvarion-VSA-16                         16      string
+ATTRIBUTE      Alvarion-VSA-17                         17      string
+ATTRIBUTE      Alvarion-VSA-18                         18      string
+ATTRIBUTE      Alvarion-VSA-19                         19      string
+ATTRIBUTE      Alvarion-VSA-20                         20      string
+ATTRIBUTE      Alvarion-VSA-21                         21      string
+ATTRIBUTE      Alvarion-VSA-22                         22      string
+ATTRIBUTE      Alvarion-VSA-23                         23      string
+ATTRIBUTE      Alvarion-VSA-24                         24      string
+ATTRIBUTE      Alvarion-VSA-25                         25      string
+ATTRIBUTE      Alvarion-VSA-26                         26      string
+ATTRIBUTE      Alvarion-VSA-27                         27      string
+ATTRIBUTE      Alvarion-VSA-28                         28      string
+ATTRIBUTE      Alvarion-VSA-29                         29      string
+ATTRIBUTE      Alvarion-VSA-30                         30      string
+ATTRIBUTE      Alvarion-VSA-31                         31      string
+ATTRIBUTE      Alvarion-VSA-32                         32      string
+ATTRIBUTE      Alvarion-VSA-33                         33      string
+ATTRIBUTE      Alvarion-VSA-34                         34      string
+ATTRIBUTE      Alvarion-VSA-35                         35      string
+ATTRIBUTE      Alvarion-VSA-36                         36      string
+ATTRIBUTE      Alvarion-VSA-37                         37      string
+ATTRIBUTE      Alvarion-VSA-38                         38      string
+ATTRIBUTE      Alvarion-VSA-39                         39      string
+ATTRIBUTE      Alvarion-VSA-40                         40      string
+ATTRIBUTE      Alvarion-VSA-41                         41      string
+ATTRIBUTE      Alvarion-VSA-42                         42      string
+ATTRIBUTE      Alvarion-VSA-43                         43      string
+ATTRIBUTE      Alvarion-VSA-44                         44      string
+ATTRIBUTE      Alvarion-VSA-45                         45      string
+ATTRIBUTE      Alvarion-VSA-46                         46      string
+ATTRIBUTE      Alvarion-VSA-47                         47      string
+ATTRIBUTE      Alvarion-VSA-48                         48      string
+ATTRIBUTE      Alvarion-VSA-49                         49      string
+ATTRIBUTE      Alvarion-VSA-50                         50      string
+ATTRIBUTE      Alvarion-VSA-51                         51      string
+ATTRIBUTE      Alvarion-VSA-52                         52      string
+ATTRIBUTE      Alvarion-VSA-53                         53      string
+ATTRIBUTE      Alvarion-VSA-54                         54      string
+ATTRIBUTE      Alvarion-VSA-55                         55      string
+ATTRIBUTE      Alvarion-VSA-56                         56      string
+ATTRIBUTE      Alvarion-VSA-57                         57      string
+ATTRIBUTE      Alvarion-VSA-58                         58      string
+ATTRIBUTE      Alvarion-VSA-59                         59      string
+ATTRIBUTE      Alvarion-VSA-60                         60      string
+ATTRIBUTE      Alvarion-VSA-61                         61      string
+ATTRIBUTE      Alvarion-VSA-62                         62      string
+ATTRIBUTE      Alvarion-VSA-63                         63      string
+ATTRIBUTE      Alvarion-VSA-64                         64      string
+ATTRIBUTE      Alvarion-VSA-65                         65      string
+ATTRIBUTE      Alvarion-VSA-66                         66      string
+ATTRIBUTE      Alvarion-VSA-67                         67      string
+ATTRIBUTE      Alvarion-VSA-68                         68      string
+ATTRIBUTE      Alvarion-VSA-69                         69      string
+ATTRIBUTE      Alvarion-VSA-70                         70      string
+ATTRIBUTE      Alvarion-VSA-71                         71      string
+ATTRIBUTE      Alvarion-VSA-72                         72      string
+ATTRIBUTE      Alvarion-VSA-73                         73      string
+ATTRIBUTE      Alvarion-VSA-74                         74      string
+ATTRIBUTE      Alvarion-VSA-75                         75      string
+ATTRIBUTE      Alvarion-VSA-76                         76      string
+ATTRIBUTE      Alvarion-VSA-77                         77      string
+ATTRIBUTE      Alvarion-VSA-78                         78      string
+ATTRIBUTE      Alvarion-VSA-79                         79      string
+ATTRIBUTE      Alvarion-VSA-80                         80      string
+ATTRIBUTE      Alvarion-VSA-81                         81      string
+ATTRIBUTE      Alvarion-VSA-82                         82      string
+ATTRIBUTE      Alvarion-VSA-83                         83      string
+ATTRIBUTE      Alvarion-VSA-84                         84      string
+ATTRIBUTE      Alvarion-VSA-85                         85      string
+ATTRIBUTE      Alvarion-VSA-86                         86      string
+ATTRIBUTE      Alvarion-VSA-87                         87      string
+ATTRIBUTE      Alvarion-VSA-88                         88      string
+ATTRIBUTE      Alvarion-VSA-89                         89      string
+ATTRIBUTE      Alvarion-VSA-90                         90      string
+ATTRIBUTE      Alvarion-VSA-91                         91      string
+ATTRIBUTE      Alvarion-VSA-92                         92      string
+ATTRIBUTE      Alvarion-VSA-93                         93      string
+ATTRIBUTE      Alvarion-VSA-94                         94      string
+ATTRIBUTE      Alvarion-VSA-95                         95      string
+ATTRIBUTE      Alvarion-VSA-96                         96      string
+ATTRIBUTE      Alvarion-VSA-97                         97      string
+ATTRIBUTE      Alvarion-VSA-98                         98      string
+ATTRIBUTE      Alvarion-VSA-99                         99      string
 ATTRIBUTE      Alvarion-VSA-100                        100     string
 ATTRIBUTE      Alvarion-VSA-101                        101     string
 ATTRIBUTE      Alvarion-VSA-102                        102     string

diff --git a/share/dictionary.alvarion.wimax.v2_2 b/share/dictionary.alvarion.wimax.v2_2
index dbd43f7189523d180cbac30aef0bb8d052a87224..8103fec4b9464f7d04f9b6d54683ca7634fab0c9 100644 (file)
--- a/share/dictionary.alvarion.wimax.v2_2
+++ b/share/dictionary.alvarion.wimax.v2_2
@@ -5,16 +5,15 @@
 #       Alvarion VSAs for use with Alvarion WiMAX ASN-GW
 #
 #      This does conflict with the default Alvarion dictionary file included
-#      with FreeRADIUS and may break existing functionality if the current 
-#      dictionaries are used to support an existing Alvarion Breezecom or 
-#      Breezenet installation. 
+#      with FreeRADIUS and may break existing functionality if the current
+#      dictionaries are used to support an existing Alvarion Breezecom or
+#      Breezenet installation.
 #
 #       $Id$
 #
 ##############################################################################
 
-
-VENDOR         Alvarion                                12394   
+VENDOR         Alvarion                        12394
 
 BEGIN-VENDOR   Alvarion
 

diff --git a/share/dictionary.bskyb b/share/dictionary.bskyb
index 4779187115d1a24fd9f9f44140e4e4b9547cfd60..2d14dc185e878870e056e35cb058a6a1b921cc4c 100644 (file)
--- a/share/dictionary.bskyb
+++ b/share/dictionary.bskyb
@@ -10,13 +10,13 @@
 
 VENDOR         BSkyB                           16924
 
-BEGIN-VENDOR   BSkyB   
+BEGIN-VENDOR   BSkyB
 
-ATTRIBUTE      Sky-Wifi-AP-ID                          1    integer
-ATTRIBUTE      Sky-Wifi-Service-ID                     2    integer
-ATTRIBUTE      Sky-Wifi-Filter-Profile                 3    string
-ATTRIBUTE      Sky-Wifi-Billing-Class                  4    octets
-ATTRIBUTE      Sky-Wifi-Provider-ID                    5    integer
-ATTRIBUTE      Sky-Wifi-Credentials                    6    string
+ATTRIBUTE      Sky-Wifi-AP-ID                          1       integer
+ATTRIBUTE      Sky-Wifi-Service-ID                     2       integer
+ATTRIBUTE      Sky-Wifi-Filter-Profile                 3       string
+ATTRIBUTE      Sky-Wifi-Billing-Class                  4       octets
+ATTRIBUTE      Sky-Wifi-Provider-ID                    5       integer
+ATTRIBUTE      Sky-Wifi-Credentials                    6       string
 
 END-VENDOR     BSkyB

diff --git a/share/dictionary.chillispot b/share/dictionary.chillispot
index cfe57a720187d33093ea1aec33f144f4beb616c9..aa06d150075eaa726a76113de8ee0c998d709589 100644 (file)
--- a/share/dictionary.chillispot
+++ b/share/dictionary.chillispot
@@ -17,13 +17,12 @@ BEGIN-VENDOR        ChilliSpot
 ATTRIBUTE      ChilliSpot-Max-Input-Octets             1       integer
 ATTRIBUTE      ChilliSpot-Max-Output-Octets            2       integer
 ATTRIBUTE      ChilliSpot-Max-Total-Octets             3       integer
-ATTRIBUTE       ChilliSpot-Bandwidth-Max-Up            4       integer
-ATTRIBUTE       ChilliSpot-Bandwidth-Max-Down          5       integer
-ATTRIBUTE       ChilliSpot-Config                      6       string
-ATTRIBUTE       ChilliSpot-Lang                        7       string
-ATTRIBUTE       ChilliSpot-Version                     8       string
-ATTRIBUTE       ChilliSpot-OriginalURL                 9       string
-
+ATTRIBUTE      ChilliSpot-Bandwidth-Max-Up             4       integer
+ATTRIBUTE      ChilliSpot-Bandwidth-Max-Down           5       integer
+ATTRIBUTE      ChilliSpot-Config                       6       string
+ATTRIBUTE      ChilliSpot-Lang                         7       string
+ATTRIBUTE      ChilliSpot-Version                      8       string
+ATTRIBUTE      ChilliSpot-OriginalURL                  9       string
 
 # Configuration management parameters (ChilliSpot Only)
 ATTRIBUTE      ChilliSpot-UAM-Allowed                  100     string

diff --git a/share/dictionary.dante b/share/dictionary.dante
index 11d3cbd5dae335a4b96aca61043c70db9573664c..ac7ff69c167d050884899a1601a20b609b1a23a0 100644 (file)
--- a/share/dictionary.dante
+++ b/share/dictionary.dante
@@ -8,11 +8,11 @@
 #
 ##############################################################################
 
-VENDOR DANTE                           27262
+VENDOR         DANTE                           27262
 
-BEGIN-VENDOR DANTE
+BEGIN-VENDOR   DANTE
 
-ATTRIBUTE      Default-TTL                     1       integer
+ATTRIBUTE      Default-TTL                             1       integer
 
 END-VENDOR DANTE
 

diff --git a/share/dictionary.dhcp b/share/dictionary.dhcp
index dbf70563d3b55c3b349ab25bcafc3be5ab59308c..edf72f9b6351eeaf46ee093cb14e99521e909c64 100644 (file)
--- a/share/dictionary.dhcp
+++ b/share/dictionary.dhcp
@@ -56,7 +56,6 @@ ATTRIBUTE     DHCP-Relay-IP-Address                   272     ipaddr
 
 VALUE  DHCP-Flags                      Broadcast               0x8000
 
-
 VALUE  DHCP-Hardware-Type              Ethernet                1
 VALUE  DHCP-Hardware-Type              Experiemental-Ethernet  2
 VALUE  DHCP-Hardware-Type              AX.25                   3
@@ -215,7 +214,7 @@ ATTRIBUTE   DHCP-Relay-Remote-Id                    82.2    octets
 
 # 3 is reserved and shouldn't be used for anything
 ATTRIBUTE      DHCP-Docsis-Device-Class                82.4    integer
-ATTRIBUTE      DHCP-Relay-Link-Selection               82.5    ipaddr  
+ATTRIBUTE      DHCP-Relay-Link-Selection               82.5    ipaddr
 ATTRIBUTE      DHCP-Subscriber-Id                      82.6    string
 
 # AGH!  RADIUS inside of DHCP!
@@ -357,7 +356,7 @@ VALUE       DHCP-Parameter-Request-List     DHCP-ARP-Cache-Timeout  35
 VALUE  DHCP-Parameter-Request-List     DHCP-Ethernet-Encapsulation 36
 VALUE  DHCP-Parameter-Request-List     DHCP-Default-TCP-TTL    37
 VALUE  DHCP-Parameter-Request-List     DHCP-Keep-Alive-Interval 38
-VALUE  DHCP-Parameter-Request-List     DHCP-Keep-Alive-Garbage 39
+VALUE  DHCP-Parameter-Request-List     DHCP-Keep-Alive-Garbage 39
 VALUE  DHCP-Parameter-Request-List     DHCP-NIS-Domain-Name    40
 VALUE  DHCP-Parameter-Request-List     DHCP-NIS-Servers        41
 VALUE  DHCP-Parameter-Request-List     DHCP-NTP-Servers        42

diff --git a/share/dictionary.freedhcp b/share/dictionary.freedhcp
index 141581ab6e034997f4c0f4c07b01dfcda73aa778..95e417fa9efd80f5c5a53b3dfc1660d429aee14f 100644 (file)
--- a/share/dictionary.freedhcp
+++ b/share/dictionary.freedhcp
@@ -134,11 +134,11 @@ ATTRIBUTE FreeDHCP-Client-FQDN                    81      string
 # Relay Agent Information
 ATTRIBUTE      FreeDHCP-Relay-Agent-Information        82      tlv
 
-ATTRIBUTE      FreeDHCP-Agent-Circuit-Id                       82.1    octets
-ATTRIBUTE      FreeDHCP-Agent-Remote-Id                        82.2    octets
+ATTRIBUTE      FreeDHCP-Agent-Circuit-Id               82.1    octets
+ATTRIBUTE      FreeDHCP-Agent-Remote-Id                82.2    octets
 
-ATTRIBUTE      FreeDHCP-Relay-Circuit-Id                       82.1    octets
-ATTRIBUTE      FreeDHCP-Relay-Remote-Id                        82.2    octets
+ATTRIBUTE      FreeDHCP-Relay-Circuit-Id               82.1    octets
+ATTRIBUTE      FreeDHCP-Relay-Remote-Id                82.2    octets
 
 # 3 is reserved and shouldn't be used for anything
 ATTRIBUTE      FreeDHCP-Docsis-Device-Class            82.4    integer
@@ -146,13 +146,13 @@ ATTRIBUTE FreeDHCP-Relay-Link-Selection           82.5    ipaddr
 ATTRIBUTE      FreeDHCP-Subscriber-Id                  82.6    string
 
 # AGH!  RADIUS inside of DHCP!
-ATTRIBUTE      FreeDHCP-RADIUS-Attributes                      82.7    octets
+ATTRIBUTE      FreeDHCP-RADIUS-Attributes              82.7    octets
 
 # Horribly complicated
-ATTRIBUTE      FreeDHCP-Authentication-Information             82.8    octets
+ATTRIBUTE      FreeDHCP-Authentication-Information     82.8    octets
 ATTRIBUTE      FreeDHCP-Vendor-Specific-Information    82.9    octets
-ATTRIBUTE      FreeDHCP-Relay-Agent-Flags                      82.10   byte
-ATTRIBUTE      FreeDHCP-Server-Identifier-Override             82.11   ipaddr
+ATTRIBUTE      FreeDHCP-Relay-Agent-Flags              82.10   byte
+ATTRIBUTE      FreeDHCP-Server-Identifier-Override     82.11   ipaddr
 
 # Internet Storage Name Service
 ATTRIBUTE      FreeDHCP-iSNS                           83      octets

diff --git a/share/dictionary.freeradius b/share/dictionary.freeradius
index 67f7fafd3e00c14fb82df0eed085274353e4c2ad..00887ca63c9e7881e4ba5983fc0b9dedc39d81ed 100644 (file)
--- a/share/dictionary.freeradius
+++ b/share/dictionary.freeradius
@@ -17,7 +17,6 @@ BEGIN-VENDOR  FreeRADIUS
 ATTRIBUTE      FreeRADIUS-Proxied-To                   1       ipaddr
 ATTRIBUTE      FreeRADIUS-Acct-Session-Start-Time      2       date
 
-
 #
 #  This attribute is really a bitmask.
 #
@@ -104,13 +103,13 @@ ATTRIBUTE FreeRADIUS-Stats-Client-Netmask         169     integer
 ATTRIBUTE      FreeRADIUS-Stats-Server-IP-Address      170     ipaddr
 ATTRIBUTE      FreeRADIUS-Stats-Server-Port            171     integer
 
-ATTRIBUTE      FreeRADIUS-Stats-Server-Outstanding-Requests    172     integer
+ATTRIBUTE      FreeRADIUS-Stats-Server-Outstanding-Requests 172        integer
 ATTRIBUTE      FreeRADIUS-Stats-Server-State           173     integer
 
-VALUE  FreeRADIUS-Stats-Server-State   Alive   0
-VALUE  FreeRADIUS-Stats-Server-State   Zombie  1
-VALUE  FreeRADIUS-Stats-Server-State   Dead    2
-VALUE  FreeRADIUS-Stats-Server-State   Idle    3
+VALUE  FreeRADIUS-Stats-Server-State   Alive                   0
+VALUE  FreeRADIUS-Stats-Server-State   Zombie                  1
+VALUE  FreeRADIUS-Stats-Server-State   Dead                    2
+VALUE  FreeRADIUS-Stats-Server-State   Idle                    3
 
 #
 #  When a home server is marked "dead" or "alive"

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index d9d0d0cd5617a24b023220d6a7bbaaa7a065f868..823c89762a6b51fb8839e9c4bc32bd1be8ae93e7 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -478,9 +478,9 @@ ATTRIBUTE   TLS-Client-Cert-Common-Name             1924    string
 ATTRIBUTE      TLS-Client-Cert-Filename                1925    string
 ATTRIBUTE      TLS-Client-Cert-Subject-Alt-Name-Email  1926    string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Extended-Key-Usage 1927  string
-ATTRIBUTE      TLS-Client-Cert-X509v3-Subject-Key-Identifier 1928 string
-ATTRIBUTE      TLS-Client-Cert-X509v3-Authority-Key-Identifier 1929 string
-ATTRIBUTE      TLS-Client-Cert-X509v3-Basic-Constraints 1930 string
+ATTRIBUTE      TLS-Client-Cert-X509v3-Subject-Key-Identifier 1928      string
+ATTRIBUTE      TLS-Client-Cert-X509v3-Authority-Key-Identifier 1929    string
+ATTRIBUTE      TLS-Client-Cert-X509v3-Basic-Constraints 1930   string
 
 # 1931 - 1939: reserved for future cert attributes
 
@@ -494,7 +494,7 @@ ATTRIBUTE   TLS-Client-Cert-X509v3-Basic-Constraints 1930 string
 #      vendor? Sigh...
 #
 ATTRIBUTE      SoH-MS-Machine-OS-vendor                2100    integer
-VALUE          SoH-MS-Machine-OS-vendor        Microsoft       311
+VALUE  SoH-MS-Machine-OS-vendor        Microsoft               311
 
 ATTRIBUTE      SoH-MS-Machine-OS-version               2101    integer
 ATTRIBUTE      SoH-MS-Machine-OS-release               2102    integer
@@ -503,21 +503,20 @@ ATTRIBUTE SoH-MS-Machine-SP-version               2104    integer
 ATTRIBUTE      SoH-MS-Machine-SP-release               2105    integer
 
 ATTRIBUTE      SoH-MS-Machine-Processor                2106    integer
-VALUE          SoH-MS-Machine-Processor        x86     0
-VALUE          SoH-MS-Machine-Processor        i64     6
-VALUE          SoH-MS-Machine-Processor        x86_64  9
+VALUE  SoH-MS-Machine-Processor        x86                     0
+VALUE  SoH-MS-Machine-Processor        i64                     6
+VALUE  SoH-MS-Machine-Processor        x86_64                  9
 
 ATTRIBUTE      SoH-MS-Machine-Name                     2107    string
 ATTRIBUTE      SoH-MS-Correlation-Id                   2108    octets
 ATTRIBUTE      SoH-MS-Machine-Role                     2109    integer
-VALUE          SoH-MS-Machine-Role             client  1
-VALUE          SoH-MS-Machine-Role             dc      2
-VALUE          SoH-MS-Machine-Role             server  3
-
+VALUE  SoH-MS-Machine-Role             client                  1
+VALUE  SoH-MS-Machine-Role             dc                      2
+VALUE  SoH-MS-Machine-Role             server                  3
 
 ATTRIBUTE      SoH-Supported                           2119    integer
-VALUE          SoH-Supported                   no      0
-VALUE          SoH-Supported                   yes     1
+VALUE  SoH-Supported                   no                      0
+VALUE  SoH-Supported                   yes                     1
 
 ATTRIBUTE      SoH-MS-Windows-Health-Status            2120    string
 ATTRIBUTE      SoH-MS-Health-Other                     2129    string

diff --git a/share/dictionary.huawei b/share/dictionary.huawei
index f185aa42b527e76771cd25857214729d04aa8d35..9fc8b56cd74314b42624d430a7dbc9dcfb4e23de 100644 (file)
--- a/share/dictionary.huawei
+++ b/share/dictionary.huawei
@@ -125,15 +125,15 @@ ATTRIBUTE Huawei-Product-ID                       255     string
 # Integer translations
 #
 
-VALUE          Huawei-User-Priority            Common          0
-VALUE          Huawei-User-Priority            Copper          1
-VALUE          Huawei-User-Priority            Silver          2
-VALUE          Huawei-User-Priority            Gold            3
+VALUE  Huawei-User-Priority            Common                  0
+VALUE  Huawei-User-Priority            Copper                  1
+VALUE  Huawei-User-Priority            Silver                  2
+VALUE  Huawei-User-Priority            Gold                    3
 
-VALUE          Huawei-Application-Type         Fixed           1
-VALUE          Huawei-Application-Type         Nomadic         2
-VALUE          Huawei-Application-Type         Portable        3
-VALUE          Huawei-Application-Type         Simple-Mobile   4
-VALUE          Huawei-Application-Type         Full-Mobile     5
+VALUE  Huawei-Application-Type         Fixed                   1
+VALUE  Huawei-Application-Type         Nomadic                 2
+VALUE  Huawei-Application-Type         Portable                3
+VALUE  Huawei-Application-Type         Simple-Mobile           4
+VALUE  Huawei-Application-Type         Full-Mobile             5
 
 END-VENDOR     Huawei

diff --git a/share/dictionary.iana b/share/dictionary.iana
index cee555de98ef3e538bdf3cab3a277a9652b535fb..28c782fd6bdeac0a9f86403021b188ed9f6aeb8d 100644 (file)
--- a/share/dictionary.iana
+++ b/share/dictionary.iana
@@ -33,12 +33,12 @@ VALUE       NAS-Port-Type                   Wireless-UMTS           23
 VALUE  NAS-Port-Type                   Wireless-1X-EV          24
 VALUE  NAS-Port-Type                   IAPP                    25
 
-VALUE   NAS-Port-Type                   FTTP                    26
-VALUE   NAS-Port-Type                   Wireless-802.16         27
-VALUE   NAS-Port-Type                   Wireless-802.20         28
-VALUE   NAS-Port-Type                   Wireless-802.22         29
+VALUE  NAS-Port-Type                   FTTP                    26
+VALUE  NAS-Port-Type                   Wireless-802.16         27
+VALUE  NAS-Port-Type                   Wireless-802.20         28
+VALUE  NAS-Port-Type                   Wireless-802.22         29
 
-VALUE   NAS-Port-Type                   xPON                    35
-VALUE   NAS-Port-Type                   Wireless-XGP            36
+VALUE  NAS-Port-Type                   xPON                    35
+VALUE  NAS-Port-Type                   Wireless-XGP            36
 
 VALUE  Framed-Protocol                 PPTP                    9

diff --git a/share/dictionary.infonet b/share/dictionary.infonet
index 73b194934cebc94977999722a8cbe88887046b15..dd87719db531edea353e60366bd8929a6fa69539 100644 (file)
--- a/share/dictionary.infonet
+++ b/share/dictionary.infonet
@@ -48,5 +48,4 @@ ATTRIBUTE     Infonet-Realm-Type                      249     string
 ATTRIBUTE      Infonet-LoginHost-Dest                  250     string
 ATTRIBUTE      Infonet-Tunnel-Decision-IP              251     string
 
-
 END-VENDOR     infonet

diff --git a/share/dictionary.meru b/share/dictionary.meru
index e47a7bc33aa68e7bdad2624a0ce778ae02bef74d..af690865cade8c204b571c144fb5be5fcb2655e8 100644 (file)
--- a/share/dictionary.meru
+++ b/share/dictionary.meru
@@ -10,7 +10,7 @@ VENDOR                Meru                            15983
 
 BEGIN-VENDOR   Meru
 
-ATTRIBUTE      Meru-Access-Point-Id                            1       integer
+ATTRIBUTE      Meru-Access-Point-Id                    1       integer
 ATTRIBUTE      Meru-Access-Point-Name                  2       string
 
 END-VENDOR      Meru

diff --git a/share/dictionary.microsoft b/share/dictionary.microsoft
index 81c466ead80635787ae361c3f4897f01ab6bc25e..cd23825d14af1099f38db2b75233246ab4f53df9 100644 (file)
--- a/share/dictionary.microsoft
+++ b/share/dictionary.microsoft
@@ -17,17 +17,17 @@ ATTRIBUTE   MS-CHAP-LM-Enc-PW                       5       octets
 ATTRIBUTE      MS-CHAP-NT-Enc-PW                       6       octets
 ATTRIBUTE      MS-MPPE-Encryption-Policy               7       integer
 
-VALUE  MS-MPPE-Encryption-Policy               Encryption-Allowed      1
-VALUE  MS-MPPE-Encryption-Policy               Encryption-Required     2
+VALUE  MS-MPPE-Encryption-Policy       Encryption-Allowed      1
+VALUE  MS-MPPE-Encryption-Policy       Encryption-Required     2
 
 # This is referred to as both singular and plural in the RFC.
 # Plural seems to make more sense.
 ATTRIBUTE      MS-MPPE-Encryption-Type                 8       integer
 ATTRIBUTE      MS-MPPE-Encryption-Types                8       integer
 
-VALUE  MS-MPPE-Encryption-Types                RC4-40bit-Allowed       1
-VALUE  MS-MPPE-Encryption-Types                RC4-128bit-Allowed      2
-VALUE  MS-MPPE-Encryption-Types                RC4-40or128-bit-Allowed 6
+VALUE  MS-MPPE-Encryption-Types        RC4-40bit-Allowed       1
+VALUE  MS-MPPE-Encryption-Types        RC4-128bit-Allowed      2
+VALUE  MS-MPPE-Encryption-Types        RC4-40or128-bit-Allowed 6
 
 ATTRIBUTE      MS-RAS-Vendor                           9       integer # content is Vendor-ID
 ATTRIBUTE      MS-CHAP-Domain                          10      string

diff --git a/share/dictionary.motorola.wimax b/share/dictionary.motorola.wimax
index e98d0411c40ad18b1214af517bc6e938ae2ed126..857c24cf546b4b42b52adf0f0939adbf641248c5 100644 (file)
--- a/share/dictionary.motorola.wimax
+++ b/share/dictionary.motorola.wimax
@@ -10,24 +10,24 @@
 
 VENDOR         Motorola                        161
 
-BEGIN-VENDOR    Motorola
+BEGIN-VENDOR   Motorola
 
-ATTRIBUTE     Motorola-WiMAX-MIP-MN-HOME-ADDRESS          10   ipaddr
-ATTRIBUTE     Motorola-WiMAX-MIP-KEY                      11   string encrypt=2
-ATTRIBUTE     Motorola-WiMAX-MIP-SPI                      12   integer
-ATTRIBUTE     Motorola-WiMAX-MN-HA                        13   ipaddr
-ATTRIBUTE     Motorola-WiMAX-DNS-Server-IP-Address        20   octets
-ATTRIBUTE     Motorola-WiMAX-User-NAI                     22   string
-ATTRIBUTE     Motorola-WiMAX-Network-Domain-Name          30   string
-ATTRIBUTE     Motorola-WiMAX-EMS-Address                  31   ipaddr
-ATTRIBUTE     Motorola-WiMAX-Provisioning-Server          32   string
-ATTRIBUTE     Motorola-WiMAX-NTP-Server                   34   octets
-ATTRIBUTE     Motorola-WiMAX-HO-SVC-CLASS                 35   octets
-ATTRIBUTE     Motorola-WiMAX-Home-BTS                     50   octets
-ATTRIBUTE     Motorola-WiMAX-Maximum-Total-Bandwidth      60   octets
-ATTRIBUTE     Motorola-WiMAX-Maximum-Commit-Bandwidth     61   octets
-ATTRIBUTE     Motorola-WiMAX-Convergence-Sublayer         63   octets
-ATTRIBUTE     Motorola-WiMAX-Service-Flows                64   string
-ATTRIBUTE     Motorola-WiMAX-VLAN-ID                      65   octets
+ATTRIBUTE      Motorola-WiMAX-MIP-MN-HOME-ADDRESS      10      ipaddr
+ATTRIBUTE      Motorola-WiMAX-MIP-KEY                  11      string encrypt=2
+ATTRIBUTE      Motorola-WiMAX-MIP-SPI                  12      integer
+ATTRIBUTE      Motorola-WiMAX-MN-HA                    13      ipaddr
+ATTRIBUTE      Motorola-WiMAX-DNS-Server-IP-Address    20      octets
+ATTRIBUTE      Motorola-WiMAX-User-NAI                 22      string
+ATTRIBUTE      Motorola-WiMAX-Network-Domain-Name      30      string
+ATTRIBUTE      Motorola-WiMAX-EMS-Address              31      ipaddr
+ATTRIBUTE      Motorola-WiMAX-Provisioning-Server      32      string
+ATTRIBUTE      Motorola-WiMAX-NTP-Server               34      octets
+ATTRIBUTE      Motorola-WiMAX-HO-SVC-CLASS             35      octets
+ATTRIBUTE      Motorola-WiMAX-Home-BTS                 50      octets
+ATTRIBUTE      Motorola-WiMAX-Maximum-Total-Bandwidth  60      octets
+ATTRIBUTE      Motorola-WiMAX-Maximum-Commit-Bandwidth 61      octets
+ATTRIBUTE      Motorola-WiMAX-Convergence-Sublayer     63      octets
+ATTRIBUTE      Motorola-WiMAX-Service-Flows            64      string
+ATTRIBUTE      Motorola-WiMAX-VLAN-ID                  65      octets
 
 END-VENDOR    Motorola

diff --git a/share/dictionary.nokia.conflict b/share/dictionary.nokia.conflict
index 3d421c3843bbb8bb10e89a06d739af19b071ee73..7b3980e7c1f7fee28131201a457005528fcee3ec 100644 (file)
--- a/share/dictionary.nokia.conflict
+++ b/share/dictionary.nokia.conflict
@@ -22,7 +22,6 @@
 ATTRIBUTE      Nokia-Primary-DNS-Server                135     ipaddr
 ATTRIBUTE      Nokia-Secondary-DNS-Server              136     ipaddr
 
-
 ATTRIBUTE      Nokia-IMSI                              224     octets
 ATTRIBUTE      Nokia-Charging-Id                       225     integer
 ATTRIBUTE      Nokia-Prepaid-Ind                       226     integer

diff --git a/share/dictionary.paloalto b/share/dictionary.paloalto
index 5d913b108411f849df6e23050ab4a30c9ae575b2..3c51c348ae921be456be77beafc8608493899930 100644 (file)
--- a/share/dictionary.paloalto
+++ b/share/dictionary.paloalto
@@ -8,14 +8,14 @@
 #
 ##############################################################################
 
-VENDOR          PaloAlto         25461
+VENDOR         PaloAlto                        25461
 
 BEGIN-VENDOR   PaloAlto
 
-ATTRIBUTE       PaloAlto-Admin-Role                           1       string      
-ATTRIBUTE       PaloAlto-Admin-Access-Domain                  2       string      
-ATTRIBUTE       PaloAlto-Panorama-Admin-Role                  3       string      
-ATTRIBUTE       PaloAlto-Panorama-Admin-Access-Domain         4       string      
-ATTRIBUTE       PaloAlto-User-Group                           5       string      
+ATTRIBUTE      PaloAlto-Admin-Role                     1       string
+ATTRIBUTE      PaloAlto-Admin-Access-Domain            2       string
+ATTRIBUTE      PaloAlto-Panorama-Admin-Role            3       string
+ATTRIBUTE      PaloAlto-Panorama-Admin-Access-Domain   4       string
+ATTRIBUTE      PaloAlto-User-Group                     5       string
 
 END-VENDOR     PaloAlto

diff --git a/share/dictionary.prosoft b/share/dictionary.prosoft
index f70034dfcbb1aecff374f8380b9a19f3e4abc0a7..37f4b412abcd7dbb7b43adaf2046122f2ef0ed58 100644 (file)
--- a/share/dictionary.prosoft
+++ b/share/dictionary.prosoft
@@ -39,5 +39,4 @@ VALUE Prosoft-Auth-Role               Read-Write              2
 VALUE  Prosoft-Auth-Role               Admin                   3
 VALUE  Prosoft-Auth-Role               Super-user              4
 
-
 END-VENDOR     Prosoft

diff --git a/share/dictionary.rfc4603 b/share/dictionary.rfc4603
index e91fe1f4372f246e6187cc4df953383909f5089e..c7eca79b539cc6be3e003769b540221b0e0d160a 100644 (file)
--- a/share/dictionary.rfc4603
+++ b/share/dictionary.rfc4603
@@ -9,10 +9,9 @@
 #
 ##############################################################################
 
-
-VALUE   NAS-Port-Type                   PPPoA                   30
-VALUE   NAS-Port-Type                   PPPoEoA                 31
-VALUE   NAS-Port-Type                   PPPoEoE                 32
-VALUE   NAS-Port-Type                   PPPoEoVLAN              33
-VALUE   NAS-Port-Type                   PPPoEoQinQ              34
+VALUE  NAS-Port-Type                   PPPoA                   30
+VALUE  NAS-Port-Type                   PPPoEoA                 31
+VALUE  NAS-Port-Type                   PPPoEoE                 32
+VALUE  NAS-Port-Type                   PPPoEoVLAN              33
+VALUE  NAS-Port-Type                   PPPoEoQinQ              34
 

diff --git a/share/dictionary.rfc5176 b/share/dictionary.rfc5176
index 81ebce10d89bab6331b859ba6715695de2bfccbc..f2165d5144ad892bc09311e0b2ae0dd9750002a6 100644 (file)
--- a/share/dictionary.rfc5176
+++ b/share/dictionary.rfc5176
@@ -6,5 +6,5 @@
 #
 #      $Id$
 #
-VALUE  Error-Cause             Invalid-Attribute-Value 407
-VALUE  Error-Cause             Multiple-Session-Selection-Unsupported 508
+VALUE  Error-Cause                     Invalid-Attribute-Value 407
+VALUE  Error-Cause                     Multiple-Session-Selection-Unsupported 508

diff --git a/share/dictionary.rfc6519 b/share/dictionary.rfc6519
index c535bfe5f33c221f9370048b0ba10efdd3248e00..00bba31c4759482a3b51dcec37b99d48bc9407c0 100644 (file)
--- a/share/dictionary.rfc6519
+++ b/share/dictionary.rfc6519
@@ -7,4 +7,4 @@
 #      $Id$
 #
 
-ATTRIBUTE      DS-Lite-Tunnel-Name     144     string
+ATTRIBUTE      DS-Lite-Tunnel-Name                     144     string

diff --git a/share/dictionary.rfc6677 b/share/dictionary.rfc6677
index d3fed028ed0651361f9e76b1d2a7d4239b844c58..8a0301fd00ba408e45d7bb7fd2de8a652daa95ef 100644 (file)
--- a/share/dictionary.rfc6677
+++ b/share/dictionary.rfc6677
@@ -5,4 +5,4 @@
 #      http://www.ietf.org/rfc/rfc6677.txt
 #
 
-ATTRIBUTE      EAP-Lower-Layer         163     integer
+ATTRIBUTE      EAP-Lower-Layer                         163     integer

diff --git a/share/dictionary.rfc6911 b/share/dictionary.rfc6911
index 8002c2b1439e67d30923360ed35af29778959780..f8d52049912011c33e79c94955fab8e627b784a3 100644 (file)
--- a/share/dictionary.rfc6911
+++ b/share/dictionary.rfc6911
@@ -8,5 +8,5 @@
 ATTRIBUTE      Framed-IPv6-Address                     168     ipv6addr
 ATTRIBUTE      DNS-Server-IPv6-Address                 169     ipv6addr
 ATTRIBUTE      Route-IPv6-Information                  170     ipv6prefix
-ATTRIBUTE      Delegated-IPv6-Prefix-Pool                      171     string
+ATTRIBUTE      Delegated-IPv6-Prefix-Pool              171     string
 ATTRIBUTE      Stateful-IPv6-Address-Pool              172     string

diff --git a/share/dictionary.siemens b/share/dictionary.siemens
index 8e9744151f44204053c261b53951ff07d9e90505..d76de01938142cf0abd42e9ff37c097350e67deb 100644 (file)
--- a/share/dictionary.siemens
+++ b/share/dictionary.siemens
@@ -23,5 +23,4 @@ ATTRIBUTE     Siemens-Topology-Name                   8       string
 ATTRIBUTE      Siemens-Ingress-RC-Name                 9       string
 ATTRIBUTE      Siemens-Egress-RC-Name                  10      string
 
-
 END-VENDOR     Siemens

diff --git a/share/dictionary.starent b/share/dictionary.starent
index 668da963fe51a9853b11cbcd649376cae39cee19..c6cf159fd7e24152d918462b3bec7c065ba093e0 100644 (file)
--- a/share/dictionary.starent
+++ b/share/dictionary.starent
@@ -954,9 +954,9 @@ VALUE       SN-GGSN-MIP-Required            Enabled                 1
 VALUE  SN-Gratuitous-ARP-Aggressive    Disabled                0
 VALUE  SN-Gratuitous-ARP-Aggressive    Enabled                 1
 
-VALUE  SN-GTP-Version                  GTP_VERSION_0                   0
-VALUE  SN-GTP-Version                  GTP_VERSION_1                   1
-VALUE  SN-GTP-Version                  GTP_VERSION_2                   2
+VALUE  SN-GTP-Version                  GTP_VERSION_0           0
+VALUE  SN-GTP-Version                  GTP_VERSION_1           1
+VALUE  SN-GTP-Version                  GTP_VERSION_2           2
 
 VALUE  SN-HA-Send-DNS-ADDRESS          Disabled                0
 VALUE  SN-HA-Send-DNS-ADDRESS          Enabled                 1

diff --git a/share/dictionary.starent.vsa1 b/share/dictionary.starent.vsa1
index 291a3776df7ecabdc9505761aa7c390d543e53d7..7599abdb2f657f1752422c45629d8aee5b52d278 100644 (file)
--- a/share/dictionary.starent.vsa1
+++ b/share/dictionary.starent.vsa1
@@ -822,9 +822,9 @@ VALUE       SN1-GGSN1-MIP-Required          Enabled                 1
 VALUE  SN1-Gratuitous-ARP-Aggressive   Disabled                0
 VALUE  SN1-Gratuitous-ARP-Aggressive   Enabled                 1
 
-VALUE  SN1-GTP-Version                 GTP_VERSION_0                   0
-VALUE  SN1-GTP-Version                 GTP_VERSION_1                   1
-VALUE  SN1-GTP-Version                 GTP_VERSION_2                   2
+VALUE  SN1-GTP-Version                 GTP_VERSION_0           0
+VALUE  SN1-GTP-Version                 GTP_VERSION_1           1
+VALUE  SN1-GTP-Version                 GTP_VERSION_2           2
 
 VALUE  SN1-HA-Send-DNS-ADDRESS         Disabled                0
 VALUE  SN1-HA-Send-DNS-ADDRESS         Enabled                 1

diff --git a/share/dictionary.ukerna b/share/dictionary.ukerna
index 945e310605606ac61d1e7f952ee1a7435e6926a0..70ff9279e2e30d852c404c8517bc4135b133a51f 100644 (file)
--- a/share/dictionary.ukerna
+++ b/share/dictionary.ukerna
@@ -6,14 +6,14 @@
 #      $Id$
 #
 
-VENDOR UKERNA                          25622
+VENDOR         UKERNA                          25622
 
-BEGIN-VENDOR UKERNA
+BEGIN-VENDOR   UKERNA
 
-ATTRIBUTE      GSS-Acceptor-Service-Name       128     string
-ATTRIBUTE      GSS-Acceptor-Host-Name          129     string
-ATTRIBUTE      GSS-Acceptor-Service-Specific   130     string
-ATTRIBUTE      GSS-Acceptor-Realm-Name         131     string
-ATTRIBUTE      SAML-AAA-Assertion              132     string
+ATTRIBUTE      GSS-Acceptor-Service-Name               128     string
+ATTRIBUTE      GSS-Acceptor-Host-Name                  129     string
+ATTRIBUTE      GSS-Acceptor-Service-Specific           130     string
+ATTRIBUTE      GSS-Acceptor-Realm-Name                 131     string
+ATTRIBUTE      SAML-AAA-Assertion                      132     string
 
 END-VENDOR UKERNA

diff --git a/share/dictionary.wimax b/share/dictionary.wimax
index 3c1dca1b1cfd3b241da771118a851742cedc6f80..fc1f7e9943458b1c47a9f68b01c43dcbd4096cd0 100644 (file)
--- a/share/dictionary.wimax
+++ b/share/dictionary.wimax
@@ -160,7 +160,7 @@ ATTRIBUTE   WiMAX-Uplink-QOS-Id                     28.7    byte
 ATTRIBUTE      WiMAX-Downlink-QOS-Id                   28.8    byte
 ATTRIBUTE      WiMAX-Uplink-Classifier                 28.9    string
 ATTRIBUTE      WiMAX-Downlink-Classifier               28.10   string
-ATTRIBUTE      WiMAX-Classifier                        28.11   tlv
+ATTRIBUTE      WiMAX-Classifier                        28.11   tlv
 ATTRIBUTE      WiMAX-ClassifierID                      28.11.1 integer
 ATTRIBUTE      WiMAX-Classifer-Priority                28.11.2 integer
 ATTRIBUTE      WiMAX-Classifer-Protocol                28.11.3 integer
@@ -429,28 +429,28 @@ ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol         84.9.3  byte
 ATTRIBUTE      WiMAX-PFDv2-Classifier-Direction        84.9.4  byte
 
 ATTRIBUTE      WiMAX-PFDv2-Classifier-Source-Spec      84.9.5  tlv
-ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address              84.9.5.1  combo-ip
+ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address              84.9.5.1        combo-ip
 # really two IPv4 OR IPv6 addresses
-ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Range        84.9.5.2  octets
-ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Mask         84.9.5.3  combo-ip
-ATTRIBUTE      WiMAX-PFDv2-Src-Port                    84.9.5.4  short
+ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Range        84.9.5.2        octets
+ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Mask         84.9.5.3        combo-ip
+ATTRIBUTE      WiMAX-PFDv2-Src-Port                    84.9.5.4        short
 # 2 shorts
-ATTRIBUTE      WiMAX-PFDv2-Src-Port-Range              84.9.5.5  integer
-ATTRIBUTE      WiMAX-PFDv2-Src-Inverted                84.9.5.6  byte
-ATTRIBUTE      WiMAX-PFDv2-Src-Assigned                84.9.5.7  byte
+ATTRIBUTE      WiMAX-PFDv2-Src-Port-Range              84.9.5.5        integer
+ATTRIBUTE      WiMAX-PFDv2-Src-Inverted                84.9.5.6        byte
+ATTRIBUTE      WiMAX-PFDv2-Src-Assigned                84.9.5.7        byte
 
 VALUE  WiMAX-PFDv2-Src-Assigned        Src-Assigned            1
 VALUE  WiMAX-PFDv2-Src-Assigned        Dst-Assigned            2
 VALUE  WiMAX-PFDv2-Src-Assigned        Src-Dst-Assigned        3
 
-ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Address             84.9.5.8  ether
-ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Mask                84.9.5.9  ether
+ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Address             84.9.5.8        ether
+ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Mask                84.9.5.9        ether
 
 ATTRIBUTE      WiMAX-PFDv2-Classifier-Dest-Spec        84.9.6  tlv
-ATTRIBUTE      WiMAX-PFDv2-Classifier-IP-ToS-DSCP      84.9.7  byte
-ATTRIBUTE      WiMAX-PFDv2-Classifier-Action           84.9.8  byte
+ATTRIBUTE      WiMAX-PFDv2-Classifier-IP-ToS-DSCP      84.9.7  byte
+ATTRIBUTE      WiMAX-PFDv2-Classifier-Action           84.9.8  byte
 
-ATTRIBUTE      WiMAX-PFDv2-Classifier-Eth-Option       84.9.9  tlv
+ATTRIBUTE      WiMAX-PFDv2-Classifier-Eth-Option       84.9.9  tlv
 
 ATTRIBUTE      WiMAX-PFDv2-Eth-Proto-Type              84.9.9.1        tlv
 ATTRIBUTE      WiMAX-PFDv2-Eth-Proto-Type-Ethertype    84.9.9.1.1      short
@@ -464,7 +464,7 @@ ATTRIBUTE   WiMAX-PFDv2-Eth-Priority-Range          84.9.9.3        tlv
 ATTRIBUTE      WiMAX-PFDv2-Eth-Priority-Range-Low      84.9.9.3.1      byte
 ATTRIBUTE      WiMAX-PFDv2-Eth-Priority-Range-High     84.9.9.3.2      byte
 
-ATTRIBUTE      WiMAX-XXX               84.9.9.4        byte
+ATTRIBUTE      WiMAX-XXX                               84.9.9.4        byte
 
 ATTRIBUTE      WiMAX-PFDv2-Paging-Preference           84.9.10 byte
 ATTRIBUTE      WiMAX-PFDv2-VLAN-Tag-Rule-Id            84.9.11 short

diff --git a/share/dictionary.wimax.alvarion b/share/dictionary.wimax.alvarion
index fd43d5555ad5507f5337f77bde42cb40d56e47d4..c4c5a6a52a79020c3c791a8408e4c95597f13cba 100644 (file)
--- a/share/dictionary.wimax.alvarion
+++ b/share/dictionary.wimax.alvarion
@@ -99,7 +99,7 @@ ATTRIBUTE     WiMAX-SDFID                             27      short
 
 # The WMF standard version of this attribute is deprecated in WMF 1.5
 # and shall no longer be used. Replaced by (26/84) Packet Flow Descriptor v2
-# 
+#
 # Alvarion uses a vendor specific version of this attribute that combines
 # some aspects of v1 (26/28) and v2 (26/84)
 # See their Radius Interoperability Spec documentation for additional details.
@@ -128,18 +128,18 @@ ATTRIBUTE WiMAX-Downlink-QOS-Id                   28.8    byte
 #ATTRIBUTE     WiMAX-Uplink-Classifier                 28.9    string
 #ATTRIBUTE     WiMAX-Downlink-Classifier               28.10   string
 # Added by Alvarion
-ATTRIBUTE      WiMAX-Classifier                        28.11   tlv
+ATTRIBUTE      WiMAX-Classifier                        28.11   tlv
 
 ATTRIBUTE      WiMAX-ClassifierID                      28.11.1 byte
 ATTRIBUTE      WiMAX-Classifier-Priority               28.11.2 byte
 ATTRIBUTE      WiMAX-Classifier-Protocol               28.11.3 byte
 ATTRIBUTE      WiMAX-Classifier-Direction              28.11.4 byte
 
-VALUE  WiMAX-Classifier-Direction                      Reserved-0              0
-VALUE  WiMAX-Classifier-Direction                      IN                      1
-VALUE  WiMAX-Classifier-Direction                      OUT                     2
-VALUE  WiMAX-Classifier-Direction                      Bi-Directional          3
-VALUE  WiMAX-Classifier-Direction                      FF                      4
+VALUE  WiMAX-Classifier-Direction      Reserved-0              0
+VALUE  WiMAX-Classifier-Direction      IN                      1
+VALUE  WiMAX-Classifier-Direction      OUT                     2
+VALUE  WiMAX-Classifier-Direction      Bi-Directional          3
+VALUE  WiMAX-Classifier-Direction      FF                      4
 
 ATTRIBUTE      WiMAX-Source-Specification              28.11.5 tlv
 
@@ -153,8 +153,8 @@ ATTRIBUTE   WiMAX-Source-Port                       28.11.5.4       short
 ATTRIBUTE      WiMAX-Source-Port-Range                 28.11.5.5       octets
 ATTRIBUTE      WiMAX-Source-Inverted                   28.11.5.6       byte
 
-VALUE  WiMAX-Source-Inverted   False                   0
-VALUE  WiMAX-Source-Inverted   True                    1
+VALUE  WiMAX-Source-Inverted           False                   0
+VALUE  WiMAX-Source-Inverted           True                    1
 
 # 8 bit unsigned enum
 ATTRIBUTE      WiMAX-Source-Assigned                   28.11.5.7       byte
@@ -165,7 +165,6 @@ VALUE       WiMAX-Source-Assigned           Src-Dst-Assigned        3
 
 ATTRIBUTE      WiMAX-Destination-Specification         28.11.6 tlv
 
-
 ATTRIBUTE      WiMAX-Destination-IPAddress             28.11.6.1       combo-ip
 # 2 IPv4 or IPv6 addresses to indicate beginning/end of range
 ATTRIBUTE      WiMAX-Destination-IPAddressRange        28.11.6.2       octets
@@ -185,8 +184,8 @@ VALUE       WiMAX-Destination-Assigned      Src-Assigned            1
 VALUE  WiMAX-Destination-Assigned      Dst-Assigned            2
 VALUE  WiMAX-Destination-Assigned      Src-Dst-Assigned        3
 
-ATTRIBUTE      WiMAX-IP-TOS-DSCP-Range-and-Mask        28.11.7         octets
-ATTRIBUTE      WiMAX-VLAN-ID                           28.11.9         short
+ATTRIBUTE      WiMAX-IP-TOS-DSCP-Range-and-Mask        28.11.7 octets
+ATTRIBUTE      WiMAX-VLAN-ID                           28.11.9 short
 ATTRIBUTE      WiMAX-8021p                             28.11.10        byte
 
 ATTRIBUTE      WiMAX-QoS-Descriptor                    29      tlv
@@ -409,28 +408,28 @@ ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol         84.9.3  byte
 ATTRIBUTE      WiMAX-PFDv2-Classifier-Direction        84.9.4  byte
 
 ATTRIBUTE      WiMAX-PFDv2-Classifier-Source-Spec      84.9.5  tlv
-ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address              84.9.5.1  combo-ip
+ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address              84.9.5.1        combo-ip
 # really two IPv4 OR IPv6 addresses
-ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Range        84.9.5.2  octets
-ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Mask         84.9.5.3  combo-ip
-ATTRIBUTE      WiMAX-PFDv2-Src-Port                    84.9.5.4  short
+ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Range        84.9.5.2        octets
+ATTRIBUTE      WiMAX-PFDv2-Src-IP-Address-Mask         84.9.5.3        combo-ip
+ATTRIBUTE      WiMAX-PFDv2-Src-Port                    84.9.5.4        short
 # 2 shorts
-ATTRIBUTE      WiMAX-PFDv2-Src-Port-Range              84.9.5.5  integer
-ATTRIBUTE      WiMAX-PFDv2-Src-Inverted                84.9.5.6  byte
-ATTRIBUTE      WiMAX-PFDv2-Src-Assigned                84.9.5.7  byte
+ATTRIBUTE      WiMAX-PFDv2-Src-Port-Range              84.9.5.5        integer
+ATTRIBUTE      WiMAX-PFDv2-Src-Inverted                84.9.5.6        byte
+ATTRIBUTE      WiMAX-PFDv2-Src-Assigned                84.9.5.7        byte
 
 VALUE  WiMAX-PFDv2-Src-Assigned        Src-Assigned            1
 VALUE  WiMAX-PFDv2-Src-Assigned        Dst-Assigned            2
 VALUE  WiMAX-PFDv2-Src-Assigned        Src-Dst-Assigned        3
 
-ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Address             84.9.5.8  ether
-ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Mask                84.9.5.9  ether
+ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Address             84.9.5.8        ether
+ATTRIBUTE      WiMAX-PFDv2-Src-MAC-Mask                84.9.5.9        ether
 
 ATTRIBUTE      WiMAX-PFDv2-Classifier-Dest-Spec        84.9.6  tlv
-ATTRIBUTE      WiMAX-PFDv2-Classifier-IP-ToS-DSCP      84.9.7  byte
-ATTRIBUTE      WiMAX-PFDv2-Classifier-Action           84.9.8  byte
+ATTRIBUTE      WiMAX-PFDv2-Classifier-IP-ToS-DSCP      84.9.7  byte
+ATTRIBUTE      WiMAX-PFDv2-Classifier-Action           84.9.8  byte
 
-ATTRIBUTE      WiMAX-PFDv2-Classifier-Eth-Option       84.9.9  tlv
+ATTRIBUTE      WiMAX-PFDv2-Classifier-Eth-Option       84.9.9  tlv
 
 ATTRIBUTE      WiMAX-PFDv2-Eth-Proto-Type              84.9.9.1        tlv
 ATTRIBUTE      WiMAX-PFDv2-Eth-Proto-Type-Ethertype    84.9.9.1.1      short
@@ -444,7 +443,7 @@ ATTRIBUTE   WiMAX-PFDv2-Eth-Priority-Range          84.9.9.3        tlv
 ATTRIBUTE      WiMAX-PFDv2-Eth-Priority-Range-Low      84.9.9.3.1      byte
 ATTRIBUTE      WiMAX-PFDv2-Eth-Priority-Range-High     84.9.9.3.2      byte
 
-ATTRIBUTE      WiMAX-XXX               84.9.9.4        byte
+ATTRIBUTE      WiMAX-XXX                               84.9.9.4        byte
 
 ATTRIBUTE      WiMAX-PFDv2-Paging-Preference           84.9.10 byte
 ATTRIBUTE      WiMAX-PFDv2-VLAN-Tag-Rule-Id            84.9.11 short

diff --git a/share/dictionary.wimax.wichorus b/share/dictionary.wimax.wichorus
index a1acbd721580b7745bbaa99870566f7e42b854db..570c3abb8262b5d9909dc4769620f39735fce162 100644 (file)
--- a/share/dictionary.wimax.wichorus
+++ b/share/dictionary.wimax.wichorus
@@ -16,36 +16,36 @@ VENDOR              WiMAX                           24757   format=1,1,c
 
 BEGIN-VENDOR   WiMAX
 
-ATTRIBUTE       WiMAX-Capability                        1       tlv
+ATTRIBUTE      WiMAX-Capability                        1       tlv
 
 BEGIN-TLV       WiMAX-Capability
-ATTRIBUTE       WiMAX-Release                                  1       string
-ATTRIBUTE       WiMAX-Accounting-Capabilities                  2       byte
-ATTRIBUTE       WiMAX-Hotlining-Capabilities                   3       byte
-ATTRIBUTE       WiMAX-Idle-Mode-Notification-Cap               4       byte
-ATTRIBUTE      WiMAX-Packet-Flow-Descriptor-Capabilities       5       byte
+ATTRIBUTE      WiMAX-Release                           1       string
+ATTRIBUTE      WiMAX-Accounting-Capabilities           2       byte
+ATTRIBUTE      WiMAX-Hotlining-Capabilities            3       byte
+ATTRIBUTE      WiMAX-Idle-Mode-Notification-Cap        4       byte
+ATTRIBUTE      WiMAX-Packet-Flow-Descriptor-Capabilities 5     byte
 # Role of 6/7 swapped vs definition in WMF R015v01
-ATTRIBUTE       WiMAX-ASN-Network-Service-Capabilities          6       integer
-ATTRIBUTE       WiMAX-Authorized-IP-Services                    7       integer
+ATTRIBUTE      WiMAX-ASN-Network-Service-Capabilities  6       integer
+ATTRIBUTE      WiMAX-Authorized-IP-Services            7       integer
 
 # This is really a bitmap
-VALUE   WiMAX-Accounting-Capabilities   No-Accounting           0
-VALUE   WiMAX-Accounting-Capabilities   IP-Session-Based        1
-VALUE   WiMAX-Accounting-Capabilities   Flow-Based              2
+VALUE  WiMAX-Accounting-Capabilities   No-Accounting           0
+VALUE  WiMAX-Accounting-Capabilities   IP-Session-Based        1
+VALUE  WiMAX-Accounting-Capabilities   Flow-Based              2
 
 # This is really a bitmap
-VALUE   WiMAX-Hotlining-Capabilities    Not-Supported           0
-VALUE   WiMAX-Hotlining-Capabilities    Hotline-Profile-Id      1
-VALUE   WiMAX-Hotlining-Capabilities    NAS-Filter-Rule         2
-VALUE   WiMAX-Hotlining-Capabilities    HTTP-Redirection        4
-VALUE   WiMAX-Hotlining-Capabilities    IP-Redirection          8
+VALUE  WiMAX-Hotlining-Capabilities    Not-Supported           0
+VALUE  WiMAX-Hotlining-Capabilities    Hotline-Profile-Id      1
+VALUE  WiMAX-Hotlining-Capabilities    NAS-Filter-Rule         2
+VALUE  WiMAX-Hotlining-Capabilities    HTTP-Redirection        4
+VALUE  WiMAX-Hotlining-Capabilities    IP-Redirection          8
 
-VALUE   WiMAX-Idle-Mode-Notification-Cap Not-Supported          0
-VALUE   WiMAX-Idle-Mode-Notification-Cap Supported              1
+VALUE  WiMAX-Idle-Mode-Notification-Cap Not-Supported          0
+VALUE  WiMAX-Idle-Mode-Notification-Cap Supported              1
 
 # v2 also implies support for v1
 VALUE  WiMAX-Packet-Flow-Descriptor-Capabilities v1            1
-VALUE  WiMAX-Packet-Flow-Descriptor-Capabilities v2            2
+VALUE  WiMAX-Packet-Flow-Descriptor-Capabilities v2            2
 
 # This is really a bitmap.
 # For Wichorus gateway this is used to
@@ -54,20 +54,20 @@ VALUE       WiMAX-Packet-Flow-Descriptor-Capabilities v2            2
 # similar and used to indicate services the ASN is authorized to
 # support for the subscriber (see sub-tlv 7 for Wichorus' version)
 # Wichorus' implementation is also shifted left one bit...
-VALUE   WiMAX-ASN-Network-Service-Capabilities  DHCPv4-Relay            2
-VALUE   WiMAX-ASN-Network-Service-Capabilities  DHCPv6-Relay            4
-VALUE   WiMAX-ASN-Network-Service-Capabilities  DHCPv4-Proxy            8
-VALUE   WiMAX-ASN-Network-Service-Capabilities  DHCPv6-Proxy            16
-VALUE   WiMAX-ASN-Network-Service-Capabilities  FA                      32
-VALUE   WiMAX-ASN-Network-Service-Capabilities  PMIP-Client             64
+VALUE  WiMAX-ASN-Network-Service-Capabilities DHCPv4-Relay     2
+VALUE  WiMAX-ASN-Network-Service-Capabilities DHCPv6-Relay     4
+VALUE  WiMAX-ASN-Network-Service-Capabilities DHCPv4-Proxy     8
+VALUE  WiMAX-ASN-Network-Service-Capabilities DHCPv6-Proxy     16
+VALUE  WiMAX-ASN-Network-Service-Capabilities FA               32
+VALUE  WiMAX-ASN-Network-Service-Capabilities PMIP-Client      64
 # ... plus additional, but these are the only relevant ones for now
 
 # This is really a bitmap
 # Proprietary definition of supported services. Used by the AAA to
 # indicate which services the ASN is allowed to support for the MS
-VALUE   WiMAX-Authorized-IP-Services    CMIPv4                  1
-VALUE   WiMAX-Authorized-IP-Services    PMIPv4                  2
-VALUE   WiMAX-Authorized-IP-Services    SimpleIPv4              4
+VALUE  WiMAX-Authorized-IP-Services    CMIPv4                  1
+VALUE  WiMAX-Authorized-IP-Services    PMIPv4                  2
+VALUE  WiMAX-Authorized-IP-Services    SimpleIPv4              4
 
 END-TLV         WiMAX-Capability
 
@@ -106,14 +106,14 @@ ATTRIBUTE WiMAX-HA-RK-SPI                         16      integer
 
 ATTRIBUTE      WiMAX-HA-RK-Lifetime                    17      integer
 
-#  Calculation is the same as MN-HA-CMIP4, etc. 
+#  Calculation is the same as MN-HA-CMIP4, etc.
 #  With CMIP the MN may not know the appropriate HA IP address when calculating
 #  the MIP RRQ AE (IPv4) or during a BU (IPv6). In this case it must either use an
-#  old known HA IP address or can indicate whether dynamic HA assignment from the 
-#  hCSN is preferred to the vCSN, or if there is no preference by providing 
+#  old known HA IP address or can indicate whether dynamic HA assignment from the
+#  hCSN is preferred to the vCSN, or if there is no preference by providing
 #  ALL-ZERO-ONE-ADDR (255.255.255.255/0.0.0.0 respectively) in the MIP RRQ sent
 #  to the FA. The RRQ-MN-HA key is calculated using this RRQ-HA-IP address and is
-#  required by the HA to validate the MIP RRQ received from the MS as it does 
+#  required by the HA to validate the MIP RRQ received from the MS as it does
 #  not contain the actual HA IP address.
 ATTRIBUTE      WiMAX-RRQ-HA-IP                         18      combo-ip
 ATTRIBUTE      WiMAX-RRQ-MN-HA-Key                     19      octets encrypt=2
@@ -122,24 +122,24 @@ ATTRIBUTE WiMAX-Time-Of-Day-Time                  20      tlv
 
 BEGIN-TLV WiMAX-Time-Of-Day-Time
 ATTRIBUTE      WiMAX-Hour                              1       byte
-ATTRIBUTE      WiMAX-Minute                            2       byte
+ATTRIBUTE      WiMAX-Minute                            2       byte
 ATTRIBUTE      WiMAX-UTC-Offset                        3       integer
 END-TLV WiMAX-Time-Of-Day-Time
 
 ATTRIBUTE      WiMAX-Session-Continue                  21      integer
 
-VALUE  WiMAX-Session-Continue  False   0
-VALUE  WiMAX-Session-Continue  True    1
+VALUE  WiMAX-Session-Continue          False                   0
+VALUE  WiMAX-Session-Continue          True                    1
 
 ATTRIBUTE      WiMAX-Beginning-Of-Session              22      integer
 
-VALUE  WiMAX-Beginning-Of-Session      False   0
-VALUE  WiMAX-Beginning-Of-Session      True    1
+VALUE  WiMAX-Beginning-Of-Session      False                   0
+VALUE  WiMAX-Beginning-Of-Session      True                    1
 
-#  This is pulled from WMF R015v01 - because our ASN-GW supports Simple IP and a 
-#  simple way to denote this was needed without building in a lot of private 
+#  This is pulled from WMF R015v01 - because our ASN-GW supports Simple IP and a
+#  simple way to denote this was needed without building in a lot of private
 #  logic that would one day simply be replaced by this logic anyway.
-#  Note: Attribute renamed in Release 1.5 to Network-Technology. Maintain the 
+#  Note: Attribute renamed in Release 1.5 to Network-Technology. Maintain the
 #  old name here to allow for better backwards compatibility.
 ATTRIBUTE      WiMAX-IP-Technology                     23      integer
 
@@ -151,7 +151,7 @@ VALUE       WiMAX-IP-Technology             CMIP6                   4
 VALUE  WiMAX-IP-Technology             Ethernet-CS             5
 VALUE  WiMAX-IP-Technology             Simple-ETH              6
 VALUE  WiMAX-IP-Technology             MIP-Based-ETH           7
-VALUE  WiMAX-IP-Technology             PMIP6                   8
+VALUE  WiMAX-IP-Technology             PMIP6                   8
 
 ATTRIBUTE      WiMAX-Hotline-Indicator                 24      string
 ATTRIBUTE      WiMAX-Prepaid-Indicator                 25      byte
@@ -170,14 +170,14 @@ VALUE     WiMAX-Direction                 Uplink                  1
 VALUE  WiMAX-Direction                 Downlink                2
 VALUE  WiMAX-Direction                 Bi-Directional          3
 
-ATTRIBUTE      WiMAX-Activation-Trigger                5       byte    
+ATTRIBUTE      WiMAX-Activation-Trigger                5       byte
 
 # This is really a bitmap
-VALUE  WiMAX-Activation-Trigger        Reserved-0              0
-VALUE  WiMAX-Activation-Trigger        Provisioned             1
-VALUE  WiMAX-Activation-Trigger        Admit                   2
+VALUE  WiMAX-Activation-Trigger        Reserved-0              0
+VALUE  WiMAX-Activation-Trigger        Provisioned             1
+VALUE  WiMAX-Activation-Trigger        Admit                   2
 VALUE  WiMAX-Activation-Trigger        Activate                4
-VALUE  WiMAX-Activation-Trigger        Dynamically-Changeable  8
+VALUE  WiMAX-Activation-Trigger        Dynamically-Changeable  8
 
 ATTRIBUTE      WiMAX-Transport-Type                    6       byte
 
@@ -235,9 +235,9 @@ VALUE       WiMAX-Media-Flow-Type           Data                    13
 
 END-TLV WiMAX-QoS-Descriptor
 
-# Same as QoS-Descriptor... used only in interim and stop records for 
+# Same as QoS-Descriptor... used only in interim and stop records for
 # flow based accounting.
-ATTRIBUTE      WiMAX-Uplink-Granted-QoS                30      tlv             # UPDATED - WAS STRING... 
+ATTRIBUTE      WiMAX-Uplink-Granted-QoS                30      tlv             # UPDATED - WAS STRING...
 ATTRIBUTE      WiMAX-Control-Packets-In                31      integer
 ATTRIBUTE      WiMAX-Control-Octets-In                 32      integer
 ATTRIBUTE      WiMAX-Control-Packets-Out               33      integer
@@ -355,9 +355,9 @@ ATTRIBUTE   WiMAX-NSP-Id                            57      octets
 # WiMAX-HA-RK-Requested has been removed from WMF Release 1.3 and later.
 # However the attribute has not been replaced so this is left to preserve
 # backward compatibility. This attribute is deprecated and will be removed.
-ATTRIBUTE      WiMAX-HA-RK-Key-Requested               58      integer 
+ATTRIBUTE      WiMAX-HA-RK-Key-Requested               58      integer
 
-VALUE  WiMAX-HA-RK-Key-Requested       No                      0               
+VALUE  WiMAX-HA-RK-Key-Requested       No                      0
 VALUE  WiMAX-HA-RK-Key-Requested       Yes                     1
 
 ATTRIBUTE      WiMAX-Count-Type                        59      byte
@@ -383,7 +383,7 @@ ATTRIBUTE   WiMAX-Downlink-Granted-QoS              63      tlv
 
 # More MIP keys, calculated as above... but in different packets.
 # In a roaming scenario both the vAAA and the hAAA can provide a HA
-# and related key context, as well as DHCP server information to the ASN-GW. 
+# and related key context, as well as DHCP server information to the ASN-GW.
 # These attributes are used by the vCSN.
 ATTRIBUTE      WiMAX-vHA-IP-MIP4                       64      ipaddr
 ATTRIBUTE      WiMAX-vHA-IP-MIP6                       65      ipv6addr
@@ -402,8 +402,7 @@ ATTRIBUTE   WiMAX-vDHCP-RK                          75      octets encrypt=2
 ATTRIBUTE      WiMAX-vDHCP-RK-Key-ID                   76      integer
 ATTRIBUTE      WiMAX-vDHCP-RK-Lifetime                 77      integer
 
-
-
 # About 10 more attributes in 1.3
 
 
+END-VENDOR     WiMAX

diff --git a/share/dictionary.zyxel b/share/dictionary.zyxel
index 170adf1a6510b518f0808c4cc9c4aa7711e99f6c..35b1426a802c14d40e14e361a5e38cc13b3e6433 100644 (file)
--- a/share/dictionary.zyxel
+++ b/share/dictionary.zyxel
@@ -8,7 +8,7 @@
 #
 ##############################################################################
 
-VENDOR Zyxel 890
+VENDOR         Zyxel                           890
 BEGIN-VENDOR   Zyxel
 
 ATTRIBUTE      Zyxel-Privilege-AVPair                  3       string