[PATCH] Adding new attributes to the ERX dictionary
This should make it compatible with JUNOSe version 12.1.1 and JUNOS version 11.2. Signed-off-by: Bjørn Mork <bjorn@mork.no> --- share/dictionary.erx | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/share/dictionary.erx b/share/dictionary.erx index 93584d2..7b84f0c 100644 --- a/share/dictionary.erx +++ b/share/dictionary.erx @@ -11,6 +11,7 @@ # This dictionary applies to access services on Juniper JUNOS (M/MX) # based platforms as well as JUNOSe, although some of the attributes # have been given new names on JUNOS: +# http://www.juniper.net/techpubs/software/junos/junos112/radius-dictionary/un... # http://www.juniper.net/techpubs/en_US/junos10.3/topics/reference/general/aaa... # # In this file, we keep the ERX prefix and the JUNOSe attribute names @@ -168,6 +169,7 @@ ATTRIBUTE ERX-MLD-No-Tracking-V1-Grps 105 integer ATTRIBUTE ERX-IPv6-Ingress-Policy-Name 106 string ATTRIBUTE ERX-IPv6-Egress-Policy-Name 107 string ATTRIBUTE ERX-CoS-Shaping-Pmt-Type 108 string +ATTRIBUTE ERX-DHCP-Guided-Relay-Server 109 ipaddr ATTRIBUTE ERX-Acc-Loop-Cir-Id 110 string ATTRIBUTE ERX-Acc-Aggr-Cir-Id-Bin 111 octets @@ -201,7 +203,9 @@ ATTRIBUTE ERX-Max-Clients-Per-Interface 143 integer ATTRIBUTE ERX-PPP-Monitor-Ingress-Only 144 integer ATTRIBUTE ERX-CoS-Scheduler-Pmt-Type 146 string +ATTRIBUTE ERX-Backup-Address-Pool 147 string +ATTRIBUTE ERX-ICR-Partition-Id 150 string ATTRIBUTE ERX-IPv6-Acct-Input-Octets 151 integer ATTRIBUTE ERX-IPv6-Acct-Output-Octets 152 integer ATTRIBUTE ERX-IPv6-Acct-Input-Packets 153 integer @@ -209,6 +213,10 @@ ATTRIBUTE ERX-IPv6-Acct-Output-Packets 154 integer ATTRIBUTE ERX-IPv6-Acct-Input-Gigawords 155 integer ATTRIBUTE ERX-IPv6-Acct-Output-Gigawords 156 integer ATTRIBUTE ERX-IPv6-NdRa-Pool-Name 157 string +ATTRIBUTE ERX-PppoE-Padn 158 string +ATTRIBUTE ERX-Dhcp-Option-82 159 octets +ATTRIBUTE ERX-Vlan-Map-Id 160 integer +ATTRIBUTE ERX-IPv6-Delegated-Pool-Name 161 string # -- 1.7.2.5
Hi Bjørn, Could you please resubmit this via GitHub. http://wiki.freeradius.org/GitHub Many Thanks, Arran On 1 Aug 2011, at 11:16, Bjørn Mork wrote:
This should make it compatible with JUNOSe version 12.1.1 and JUNOS version 11.2.
Signed-off-by: Bjørn Mork <bjorn@mork.no> --- share/dictionary.erx | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/share/dictionary.erx b/share/dictionary.erx index 93584d2..7b84f0c 100644 --- a/share/dictionary.erx +++ b/share/dictionary.erx @@ -11,6 +11,7 @@ # This dictionary applies to access services on Juniper JUNOS (M/MX) # based platforms as well as JUNOSe, although some of the attributes # have been given new names on JUNOS: +# http://www.juniper.net/techpubs/software/junos/junos112/radius-dictionary/un... # http://www.juniper.net/techpubs/en_US/junos10.3/topics/reference/general/aaa... # # In this file, we keep the ERX prefix and the JUNOSe attribute names @@ -168,6 +169,7 @@ ATTRIBUTE ERX-MLD-No-Tracking-V1-Grps 105 integer ATTRIBUTE ERX-IPv6-Ingress-Policy-Name 106 string ATTRIBUTE ERX-IPv6-Egress-Policy-Name 107 string ATTRIBUTE ERX-CoS-Shaping-Pmt-Type 108 string +ATTRIBUTE ERX-DHCP-Guided-Relay-Server 109 ipaddr
ATTRIBUTE ERX-Acc-Loop-Cir-Id 110 string ATTRIBUTE ERX-Acc-Aggr-Cir-Id-Bin 111 octets @@ -201,7 +203,9 @@ ATTRIBUTE ERX-Max-Clients-Per-Interface 143 integer ATTRIBUTE ERX-PPP-Monitor-Ingress-Only 144 integer
ATTRIBUTE ERX-CoS-Scheduler-Pmt-Type 146 string +ATTRIBUTE ERX-Backup-Address-Pool 147 string
+ATTRIBUTE ERX-ICR-Partition-Id 150 string ATTRIBUTE ERX-IPv6-Acct-Input-Octets 151 integer ATTRIBUTE ERX-IPv6-Acct-Output-Octets 152 integer ATTRIBUTE ERX-IPv6-Acct-Input-Packets 153 integer @@ -209,6 +213,10 @@ ATTRIBUTE ERX-IPv6-Acct-Output-Packets 154 integer ATTRIBUTE ERX-IPv6-Acct-Input-Gigawords 155 integer ATTRIBUTE ERX-IPv6-Acct-Output-Gigawords 156 integer ATTRIBUTE ERX-IPv6-NdRa-Pool-Name 157 string +ATTRIBUTE ERX-PppoE-Padn 158 string +ATTRIBUTE ERX-Dhcp-Option-82 159 octets +ATTRIBUTE ERX-Vlan-Map-Id 160 integer +ATTRIBUTE ERX-IPv6-Delegated-Pool-Name 161 string
# -- 1.7.2.5
- List info/subscribe/unsubscribe? See http://www.freeradius.org/list/users.html
Arran Cudbard-Bell a.cudbardb@freeradius.org RADIUS - Half the complexity of Diameter
Arran Cudbard-Bell <a.cudbardb@freeradius.org> writes:
Hi Bjørn,
Could you please resubmit this via GitHub.
Done. Thanks for the excellent instructions. One question I didn't find the answer to though: Should I rebase patches like this for all active branches (currently master and v2.1.x?) and send a pull request for each of them? Or should I just send one pull request based on the master branch and assume that you will automatically merge all relevant patches into v2.1.x as well? Bjørn
Bjørn Mork wrote:
One question I didn't find the answer to though: Should I rebase patches like this for all active branches (currently master and v2.1.x?) and send a pull request for each of them? Or should I just send one pull request based on the master branch and assume that you will automatically merge all relevant patches into v2.1.x as well?
Merging the changes is easy. Just do it for one branch. Alan DeKok.
participants (3)
-
Alan DeKok -
Arran Cudbard-Bell -
Bjørn Mork