Add RFC 4072 (EAP) dictionary

2 files changed, 157 insertions, 2 deletions

diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 48dccf3e23..9a338fd133 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -330,7 +330,8 @@
 
 %% Standard dictionaries.
 -define(STANDARDS, [rfc4005_nas,
-                    rfc4006_cc]).
+                    rfc4006_cc,
+                    rfc4072_eap]).
 
 %% ===========================================================================
 
@@ -444,7 +445,9 @@ standards(Dict, Dir) ->
                              [{name, Dict} | opts(Dict)]),
     {ok, _, _} = compile:file(Dict ++ ".erl", [return]).
 
-opts("rfc4006_cc") ->
+opts(M)
+  when M == "rfc4006_cc";
+       M == "rfc4072_eap" ->
     [{inherits, "diameter_gen_nas_rfc4005/rfc4005_nas"}];
 opts(_) ->
     [].
diff --git a/lib/diameter/test/diameter_compiler_SUITE_data/rfc4072_eap.dia b/lib/diameter/test/diameter_compiler_SUITE_data/rfc4072_eap.dia
new file mode 100644
index 0000000000..70eb86e06a
--- /dev/null
+++ b/lib/diameter/test/diameter_compiler_SUITE_data/rfc4072_eap.dia
@@ -0,0 +1,152 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;;
+;; The contents of this file are subject to the Erlang Public License,
+;; Version 1.1, (the "License"); you may not use this file except in
+;; compliance with the License. You should have received a copy of the
+;; Erlang Public License along with this software. If not, it can be
+;; retrieved online at http://www.erlang.org/.
+;;
+;; Software distributed under the License is distributed on an "AS IS"
+;; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+;; the License for the specific language governing rights and limitations
+;; under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;;
+;; RFC 4072, Diameter Extensible Authentication Protocol (EAP) Application
+;;
+;; Edits:
+;;
+;; - Move EAP-Payload to not break fixed/required/optional order
+;; - Framed-Appletalk-Link    -> Framed-AppleTalk-Link
+;; - Framed-Appletalk-Network -> Framed-AppleTalk-Network
+;; - Framed-Appletalk-Zone    -> Framed-AppleTalk-Zone
+;;
+
+@id 5
+@name   diameter_gen_eap_rfc4072
+@prefix diameter_eap
+
+@inherits diameter_gen_base_rfc3588
+@inherits diameter_gen_nas_rfc4005
+
+;; ===========================================================================
+
+@avp_types
+
+   EAP-Master-Session-Key           464   OctetString    -
+   EAP-Key-Name                     102   OctetString    -
+   EAP-Payload                      462   OctetString    -
+   EAP-Reissued-Payload             463   OctetString    -
+   Accounting-EAP-Auth-Method       465    Unsigned64    -
+
+;; ===========================================================================
+
+@messages
+
+   DER ::= < Diameter Header: 268, REQ, PXY >
+
+           < Session-Id >
+           { Auth-Application-Id }
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Auth-Request-Type }
+           { EAP-Payload }
+           [ Destination-Host ]
+           [ NAS-Identifier ]
+           [ NAS-IP-Address ]
+           [ NAS-IPv6-Address ]
+           [ NAS-Port ]
+           [ NAS-Port-Id ]
+           [ NAS-Port-Type ]
+           [ Origin-State-Id ]
+           [ Port-Limit ]
+           [ User-Name ]
+           [ EAP-Key-Name ]
+           [ Service-Type ]
+           [ State ]
+           [ Authorization-Lifetime ]
+           [ Auth-Grace-Period ]
+           [ Auth-Session-State ]
+           [ Callback-Number ]
+           [ Called-Station-Id ]
+           [ Calling-Station-Id ]
+           [ Originating-Line-Info ]
+           [ Connect-Info ]
+         * [ Framed-Compression ]
+           [ Framed-Interface-Id ]
+           [ Framed-IP-Address ]
+         * [ Framed-IPv6-Prefix ]
+           [ Framed-IP-Netmask ]
+           [ Framed-MTU ]
+           [ Framed-Protocol ]
+         * [ Tunneling ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   DEA ::= < Diameter Header: 268, PXY >
+
+          < Session-Id >
+          { Auth-Application-Id }
+          { Auth-Request-Type }
+          { Result-Code }
+          { Origin-Host }
+          { Origin-Realm }
+          [ User-Name ]
+          [ EAP-Payload ]
+          [ EAP-Reissued-Payload ]
+          [ EAP-Master-Session-Key ]
+          [ EAP-Key-Name ]
+          [ Multi-Round-Time-Out ]
+          [ Accounting-EAP-Auth-Method ]
+          [ Service-Type ]
+        * [ Class ]
+        * [ Configuration-Token ]
+          [ Acct-Interim-Interval ]
+          [ Error-Message ]
+          [ Error-Reporting-Host ]
+        * [ Failed-AVP ]
+          [ Idle-Timeout ]
+          [ Authorization-Lifetime ]
+          [ Auth-Grace-Period ]
+          [ Auth-Session-State ]
+          [ Re-Auth-Request-Type ]
+          [ Session-Timeout ]
+          [ State ]
+        * [ Reply-Message ]
+          [ Origin-State-Id ]
+        * [ Filter-Id ]
+          [ Port-Limit ]
+          [ Callback-Id ]
+          [ Callback-Number ]
+          [ Framed-AppleTalk-Link ]
+        * [ Framed-AppleTalk-Network ]
+          [ Framed-AppleTalk-Zone ]
+        * [ Framed-Compression ]
+          [ Framed-Interface-Id ]
+          [ Framed-IP-Address ]
+        * [ Framed-IPv6-Prefix ]
+          [ Framed-IPv6-Pool ]
+        * [ Framed-IPv6-Route ]
+          [ Framed-IP-Netmask ]
+        * [ Framed-Route ]
+          [ Framed-Pool ]
+          [ Framed-IPX-Network ]
+          [ Framed-MTU ]
+          [ Framed-Protocol ]
+          [ Framed-Routing ]
+        * [ NAS-Filter-Rule ]
+        * [ QoS-Filter-Rule ]
+        * [ Tunneling ]
+        * [ Redirect-Host ]
+          [ Redirect-Host-Usage ]
+          [ Redirect-Max-Cache-Time ]
+        * [ Proxy-Info ]
+        * [ AVP ]