Skip to content

Commit

Permalink
Merge branch 'anders/diameter/testsuites/OTP-9829' into maint
Browse files Browse the repository at this point in the history 
* anders/diameter/testsuites/OTP-9829: (21 commits)
  Install example dictionaries
  Move example code to examples/code
  Move example dictionaries to examples/dict
  Set name/prefix at compilation, not in dictionaries
  Add RFC 4004 (MIP) dictionary
  Add RFC 4740 (SIP) dictionary
  Add RFC 4072 (EAP) dictionary
  Add RFC 4006 (CC) dictionary
  Add RFC 4005 (NAS) dictionary
  Add standards testcase to compiler suite
  Remove {init,end}_per_group workaround
  Use new syntax for specifying ct group properties
  Increase timetrap in compiler suite
  Minor capx suite tweaks
  Minor makefile tweak
  Remove trailing whitespace
  Update skip condition in gen_sctp suite
  Reintroduce gen_sctp suite
  Remove delay from connect in transport suite
  Add codec testcase for decode of unknown AVPs
  ...
  • Loading branch information
Anders Svensson committed Dec 20, 2011
2 parents e986108 + 8487353 commit 58336ee
Show file tree
Hide file tree
Showing 39 changed files with 2,794 additions and 185 deletions.
10 changes: 5 additions & 5 deletions lib/diameter/examples/GNUmakefile → lib/diameter/examples/code/GNUmakefile
View file
@@ -1,19 +1,19 @@
#
#
# %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%
#

Expand Down
2 changes: 1 addition & 1 deletion lib/diameter/examples/client.erl → lib/diameter/examples/code/client.erl
View file
Expand Up @@ -112,7 +112,7 @@ cast(Name) ->
{'Auth-Application-Id', 0},
{'Re-Auth-Request-Type', 1}],
diameter:call(Name, ?APP_ALIAS, RAR, [detach]).

cast() ->
cast(?SVC_NAME).

Expand Down
0 lib/diameter/examples/client_cb.erl → lib/diameter/examples/code/client_cb.erl
View file
File renamed without changes.
0 lib/diameter/examples/peer.erl → lib/diameter/examples/code/peer.erl
View file
File renamed without changes.
0 lib/diameter/examples/redirect.erl → lib/diameter/examples/code/redirect.erl
View file
File renamed without changes.
0 lib/diameter/examples/redirect_cb.erl → lib/diameter/examples/code/redirect_cb.erl
View file
File renamed without changes.
0 lib/diameter/examples/relay.erl → lib/diameter/examples/code/relay.erl
View file
File renamed without changes.
0 lib/diameter/examples/relay_cb.erl → lib/diameter/examples/code/relay_cb.erl
View file
File renamed without changes.
18 changes: 18 additions & 0 deletions lib/diameter/examples/sctp.erl → lib/diameter/examples/code/sctp.erl
View file
@@ -1,3 +1,21 @@
%%
%% %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%
%%

-module(sctp).

Expand Down
0 lib/diameter/examples/server.erl → lib/diameter/examples/code/server.erl
View file
File renamed without changes.
0 lib/diameter/examples/server_cb.erl → lib/diameter/examples/code/server_cb.erl
View file
File renamed without changes.
280 changes: 280 additions & 0 deletions lib/diameter/examples/dict/rfc4004_mip.dia
View file
@@ -0,0 +1,280 @@
;;
;; %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 4004, Diameter Mobile IPv4 Application
;;
;; Edits:
;;
;; - MIP-nonce -> MIP-Nonce
;; - Session-ID -> Session-Id
;; - Omit MIP-HA-to-MN-SPI, MIP-MN-FA-SPI and MIP-MN-HA-SPI, none of
;; which are defined.
;;

@id 2

@inherits rfc3588_base

;; ===========================================================================

@avp_types

MIP-Reg-Request 320 OctetString M
MIP-Reg-Reply 321 OctetString M
MIP-MN-AAA-Auth 322 Grouped M
MIP-Mobile-Node-Address 333 Address M
MIP-Home-Agent-Address 334 Address M
MIP-Candidate-Home-Agent-Host 336 DiamIdent M
MIP-Feature-Vector 337 Unsigned32 M
MIP-Auth-Input-Data-Length 338 Unsigned32 M
MIP-Authenticator-Length 339 Unsigned32 M
MIP-Authenticator-Offset 340 Unsigned32 M
MIP-MN-AAA-SPI 341 Unsigned32 M
MIP-Filter-Rule 342 IPFilterRule M
MIP-FA-Challenge 344 OctetString M
MIP-Originating-Foreign-AAA 347 Grouped M
MIP-Home-Agent-Host 348 Grouped M

MIP-FA-to-HA-SPI 318 Unsigned32 M
MIP-FA-to-MN-SPI 319 Unsigned32 M
MIP-HA-to-FA-SPI 323 Unsigned32 M
MIP-MN-to-FA-MSA 325 Grouped M
MIP-FA-to-MN-MSA 326 Grouped M
MIP-FA-to-HA-MSA 328 Grouped M
MIP-HA-to-FA-MSA 329 Grouped M
MIP-MN-to-HA-MSA 331 Grouped M
MIP-HA-to-MN-MSA 332 Grouped M
MIP-Nonce 335 OctetString M
MIP-Session-Key 343 OctetString M
MIP-Algorithm-Type 345 Enumerated M
MIP-Replay-Mode 346 Enumerated M
MIP-MSA-Lifetime 367 Unsigned32 M

;; ===========================================================================

@messages

;; 5.1. AA-Mobile-Node-Request

AMR ::= < Diameter Header: 260, REQ, PXY >

< Session-Id >
{ Auth-Application-Id }
{ User-Name }
{ Destination-Realm }
{ Origin-Host }
{ Origin-Realm }
{ MIP-Reg-Request }
{ MIP-MN-AAA-Auth }
[ Acct-Multi-Session-Id ]
[ Destination-Host ]
[ Origin-State-Id ]
[ MIP-Mobile-Node-Address ]
[ MIP-Home-Agent-Address ]
[ MIP-Feature-Vector ]
[ MIP-Originating-Foreign-AAA ]
[ Authorization-Lifetime ]
[ Auth-Session-State ]
[ MIP-FA-Challenge ]
[ MIP-Candidate-Home-Agent-Host ]
[ MIP-Home-Agent-Host ]
[ MIP-HA-to-FA-SPI ]
* [ Proxy-Info ]
* [ Route-Record ]
* [ AVP ]

;; 5.2. AA-Mobile-Node-Answer

AMA ::= < Diameter Header: 260, PXY >

< Session-Id >
{ Auth-Application-Id }
{ Result-Code }
{ Origin-Host }
{ Origin-Realm }
[ Acct-Multi-Session-Id ]
[ User-Name ]
[ Authorization-Lifetime ]
[ Auth-Session-State ]
[ Error-Message ]
[ Error-Reporting-Host ]
[ Re-Auth-Request-Type ]
[ MIP-Feature-Vector ]
[ MIP-Reg-Reply ]
[ MIP-MN-to-FA-MSA ]
[ MIP-MN-to-HA-MSA ]
[ MIP-FA-to-MN-MSA ]
[ MIP-FA-to-HA-MSA ]
[ MIP-HA-to-MN-MSA ]
[ MIP-MSA-Lifetime ]
[ MIP-Home-Agent-Address ]
[ MIP-Mobile-Node-Address ]
* [ MIP-Filter-Rule ]
[ Origin-State-Id ]
* [ Proxy-Info ]
* [ AVP ]

;; 5.3. Home-Agent-MIP-Request

HAR ::= < Diameter Header: 262, REQ, PXY >

< Session-Id >
{ Auth-Application-Id }
{ Authorization-Lifetime }
{ Auth-Session-State }
{ MIP-Reg-Request }
{ Origin-Host }
{ Origin-Realm }
{ User-Name }
{ Destination-Realm }
{ MIP-Feature-Vector }
[ Destination-Host ]
[ MIP-MN-to-HA-MSA ]
[ MIP-MN-to-FA-MSA ]
[ MIP-HA-to-MN-MSA ]
[ MIP-HA-to-FA-MSA ]
[ MIP-MSA-Lifetime ]
[ MIP-Originating-Foreign-AAA ]
[ MIP-Mobile-Node-Address ]
[ MIP-Home-Agent-Address ]
* [ MIP-Filter-Rule ]
[ Origin-State-Id ]
* [ Proxy-Info ]
* [ Route-Record ]
* [ AVP ]

;; 5.4. Home-Agent-MIP-Answer

HAA ::= < Diameter Header: 262, PXY >

< Session-Id >
{ Auth-Application-Id }
{ Result-Code }
{ Origin-Host }
{ Origin-Realm }
[ Acct-Multi-Session-Id ]
[ User-Name ]
[ Error-Reporting-Host ]
[ Error-Message ]
[ MIP-Reg-Reply ]
[ MIP-Home-Agent-Address ]
[ MIP-Mobile-Node-Address ]
[ MIP-FA-to-HA-SPI ]
[ MIP-FA-to-MN-SPI ]
[ Origin-State-Id ]
* [ Proxy-Info ]
* [ AVP ]

;; ===========================================================================

@grouped

MIP-MN-AAA-Auth ::= < AVP Header: 322 >

{ MIP-MN-AAA-SPI }
{ MIP-Auth-Input-Data-Length }
{ MIP-Authenticator-Length }
{ MIP-Authenticator-Offset }
* [ AVP ]


MIP-Originating-Foreign-AAA ::= < AVP Header: 347 >

{ Origin-Realm }
{ Origin-Host }
* [ AVP ]

MIP-Home-Agent-Host ::= < AVP Header: 348 >

{ Destination-Realm }
{ Destination-Host }
* [ AVP ]

MIP-FA-to-MN-MSA ::= < AVP Header: 326 >

{ MIP-FA-to-MN-SPI }
{ MIP-Algorithm-Type }
{ MIP-Session-Key }
* [ AVP ]

MIP-FA-to-HA-MSA ::= < AVP Header: 328 >

{ MIP-FA-to-HA-SPI }
{ MIP-Algorithm-Type }
{ MIP-Session-Key }
* [ AVP ]

MIP-HA-to-FA-MSA ::= < AVP Header: 329 >

{ MIP-HA-to-FA-SPI }
{ MIP-Algorithm-Type }
{ MIP-Session-Key }
* [ AVP ]

MIP-HA-to-MN-MSA ::= < AVP Header: 332 >

; { MIP-HA-to-MN-SPI }
{ MIP-Algorithm-Type }
{ MIP-Replay-Mode }
{ MIP-Session-Key }
* [ AVP ]

MIP-MN-to-FA-MSA ::= < AVP Header: 325 >

; { MIP-MN-FA-SPI }
{ MIP-Algorithm-Type }
{ MIP-Nonce }
* [ AVP ]

MIP-MN-to-HA-MSA ::= < AVP Header: 331 >

; { MIP-MN-HA-SPI }
{ MIP-Algorithm-Type }
{ MIP-Replay-Mode }
{ MIP-Nonce }
* [ AVP ]

;; ===========================================================================

@enum MIP-Algorithm-Type

HMAC-SHA-1 2

@enum MIP-Replay-Mode

NONE 1
TIMESTAMPS 2
NONCES 3

;; ===========================================================================

@define Result-Code

;; 6.1. Transient Failures

MIP_REPLY_FAILURE 4005
HA_NOT_AVAILABLE 4006
BAD_KEY 4007
MIP_FILTER_NOT_SUPPORTED 4008

;; 6.2. Permanent Failures

NO_FOREIGN_HA_SERVICE 5024
END_TO_END_MIP_KEY_ENCRYPTION 5025

0 comments on commit 58336ee

Please sign in to comment.