diff options
author | Anders Svensson <[email protected]> | 2015-03-24 11:02:56 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2015-03-24 11:02:56 +0100 |
commit | 1ea921c277e69b6b0ffd49335b85e7bf36936d2d (patch) | |
tree | 31c582bcb62cdfa0a1fbf51b47741af4eb94b521 /lib/diameter/test | |
parent | b7d8668ea5a4215da900bfcd2a1dbd51384cb0c7 (diff) | |
parent | b8a7df45c9e57a832f7db9b9b875b31d0ab7d29c (diff) | |
download | otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.tar.gz otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.tar.bz2 otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.zip |
Merge branch 'anders/diameter/DiameterURI/OTP-12589' into maint
* anders/diameter/DiameterURI/OTP-12589:
Adapt to changed DiameterURI defaults in RFC 6733
Reject transport=udp;protocol=diameter at DiameterURI encode
Diffstat (limited to 'lib/diameter/test')
-rw-r--r-- | lib/diameter/test/diameter_codec_test.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl index 472755c62a..854b71ba93 100644 --- a/lib/diameter/test/diameter_codec_test.erl +++ b/lib/diameter/test/diameter_codec_test.erl @@ -356,8 +356,15 @@ values('DiameterURI') -> Tr <- ["" | [";transport=" ++ X || X <- ["tcp", "sctp", "udp"]]], Pr <- ["" | [";protocol=" ++ X - || X <- ["diameter","radius","tacacs+"]]]], - []}; + || X <- ["diameter","radius","tacacs+"]]], + Tr /= ";transport=udp" + orelse (Pr /= ";protocol=diameter" andalso Pr /= "")], + ["aaa://diameter.se;transport=udp;protocol=diameter", + "aaa://diameter.se;transport=udp", + "aaa://:3868", + "aaax://diameter.se", + "aaa://diameter.se;transport=tcpx", + "aaa://diameter.se;transport=tcp;protocol=diameter "]}; values(T) when T == 'IPFilterRule'; |