diff options
| author | Anders Svensson <[email protected]> | 2013-03-27 18:09:09 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-27 18:09:09 +0100 |
| commit | a3054e29956b5da4c5b56d83edcd15b6648b3958 (patch) | |
| tree | a5bb1faeeb2780e0c82a897ea17c74191f7c2f08 /lib/diameter/test/diameter_codec_test.erl | |
| parent | 8ee91691c3d53485f9a63d8194160a1af6dd22d6 (diff) | |
| parent | 49040f8be249501331abc3830dfe91344fd0f988 (diff) | |
| download | otp-a3054e29956b5da4c5b56d83edcd15b6648b3958.tar.gz otp-a3054e29956b5da4c5b56d83edcd15b6648b3958.tar.bz2 otp-a3054e29956b5da4c5b56d83edcd15b6648b3958.zip | |
Merge branch 'anders/diameter/app_not_configured/OTP-10972' into maint
* anders/diameter/app_not_configured/OTP-10972:
Fix faulty sequence validation
Add config suite
Deal with config errors detected at transport start less brutally
Move most transport_opt() validation into diameter_config
Minor doc/spec fix
Minor diameter_lib cleanup
Diffstat (limited to 'lib/diameter/test/diameter_codec_test.erl')
| -rw-r--r-- | lib/diameter/test/diameter_codec_test.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl index dc8cbffc83..0baac59c1a 100644 --- a/lib/diameter/test/diameter_codec_test.erl +++ b/lib/diameter/test/diameter_codec_test.erl @@ -65,7 +65,7 @@ lib(N, {_,_} = T) -> lib(IP, B) -> LA = tuple_to_list(IP), {SA,Fun} = ip(LA), - [] = run([[fun lib/4, IP, B, Fun, A] || A <- [IP, LA, SA]]). + [] = run([[fun lib/4, IP, B, Fun, A] || A <- [IP, SA]]). lib(IP, B, Fun, A) -> try Fun(A) of @@ -78,10 +78,10 @@ lib(IP, B, Fun, A) -> ip([_,_,_,_] = A) -> [$.|S] = lists:append(["." ++ integer_to_list(N) || N <- A]), - {S, fun diameter_lib:ip4address/1}; + {S, fun diameter_lib:ipaddr/1}; ip([_,_,_,_,_,_,_,_] = A) -> [$:|S] = lists:flatten([":" ++ io_lib:format("~.16B", [N]) || N <- A]), - {S, fun diameter_lib:ip6address/1}. + {S, fun diameter_lib:ipaddr/1}. %% ------------------------------------------------------------------------ %% base/1 |