diff options
| author | Anders Svensson <[email protected]> | 2017-08-29 15:12:55 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-08-29 15:12:55 +0200 |
| commit | 2f00b5b20aaa00eac673f53a39706914d07325c4 (patch) | |
| tree | 2ae9855986c16bfd3a935077ceb6128898d20401 | |
| parent | 66a623f71502c85ecd76d171f906fcb361fb6369 (diff) | |
| parent | d10abde1e0f948400a6f14128b5b54443edbffd3 (diff) | |
| download | otp-2f00b5b20aaa00eac673f53a39706914d07325c4.tar.gz otp-2f00b5b20aaa00eac673f53a39706914d07325c4.tar.bz2 otp-2f00b5b20aaa00eac673f53a39706914d07325c4.zip | |
Merge branch 'anders/diameter/caseless/OTP-14535' into maint
* anders/diameter/caseless/OTP-14535:
Replace calls to inet_parse(3)
Fix regexp match of accept tuple in diameter_tcp/sctp
| -rw-r--r-- | lib/diameter/src/base/diameter_lib.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_peer.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl index 8792e97621..1c1ea42cb5 100644 --- a/lib/diameter/src/base/diameter_lib.erl +++ b/lib/diameter/src/base/diameter_lib.erl @@ -283,7 +283,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 2759f17e64..4cb5a57a54 100644 --- a/lib/diameter/src/base/diameter_peer.erl +++ b/lib/diameter/src/base/diameter_peer.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2015. All Rights Reserved. +%% Copyright Ericsson AB 2010-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -202,10 +202,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}. |