diff options
| author | Erlang/OTP <[email protected]> | 2015-08-13 12:34:01 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-08-13 12:34:01 +0200 |
| commit | 1f045e334da25d7fcecd36e5ea6e44da820bf84c (patch) | |
| tree | 95763bd7d67413c370103ad0b86131c8ce88c3ef | |
| parent | 82ee2c5e4828457e540834b6c66c80dedeb4cd67 (diff) | |
| parent | f60bc6ad8852e7d97d509ced084c137f55bd4aad (diff) | |
| download | otp-1f045e334da25d7fcecd36e5ea6e44da820bf84c.tar.gz otp-1f045e334da25d7fcecd36e5ea6e44da820bf84c.tar.bz2 otp-1f045e334da25d7fcecd36e5ea6e44da820bf84c.zip | |
Merge branch 'anders/diameter/caseless/OTP-12902' into maint-17
* anders/diameter/caseless/OTP-12902:
Match allowable peer addresses case insensitively
Replace calls to module inet_parse to equivalents in inet
| -rw-r--r-- | lib/diameter/src/base/diameter_lib.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_peer.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl index 3f327f3653..b9b3e21788 100644 --- a/lib/diameter/src/base/diameter_lib.erl +++ b/lib/diameter/src/base/diameter_lib.erl @@ -321,7 +321,7 @@ ip(T) %% Or not: convert from '.'/':'-separated decimal/hex. ip(Addr) -> - {ok, A} = inet_parse:address(Addr), %% documented in inet(3) + {ok, A} = inet:parse_address(Addr), A. %% --------------------------------------------------------------------------- diff --git a/lib/diameter/src/base/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl index 89b63c8a92..96b6d404e0 100644 --- a/lib/diameter/src/base/diameter_peer.erl +++ b/lib/diameter/src/base/diameter_peer.erl @@ -201,10 +201,10 @@ match1(Addr, Match) -> match(Addr, {ok, A}, _) -> Addr == A; match(Addr, {error, _}, RE) -> - match == re:run(inet_parse:ntoa(Addr), RE, [{capture, none}]). + match == re:run(inet:ntoa(Addr), RE, [{capture, none}, caseless]). addr([_|_] = A) -> - inet_parse:address(A); + inet:parse_address(A); addr(A) -> {ok, A}. |