aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-05-30 15:29:43 +0200
committerMicael Karlberg <[email protected]>2011-05-30 15:29:43 +0200
commit1e69822bac15f0a3eb4084fb56beb1bb6d7decd8 (patch)
treeef0e9d55fc5c5c3b6fd86ec03897def2bafba9ea /lib/inets/src
parent4a5a75811e2cd590b5c94f71864a5245fd511ccf (diff)
downloadotp-1e69822bac15f0a3eb4084fb56beb1bb6d7decd8.tar.gz
otp-1e69822bac15f0a3eb4084fb56beb1bb6d7decd8.tar.bz2
otp-1e69822bac15f0a3eb4084fb56beb1bb6d7decd8.zip
Peer/sockname resolv doesn't work with IPv6 addrs in HTTP.
OTP-9343
Diffstat (limited to 'lib/inets/src')
-rw-r--r--lib/inets/src/http_lib/http_transport.erl64
-rw-r--r--lib/inets/src/inets_app/inets.appup.src10
2 files changed, 44 insertions, 30 deletions
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index 01b51d531a..6c2ffc143d 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -500,19 +500,11 @@ close({essl, _}, Socket) ->
%%-------------------------------------------------------------------------
peername(ip_comm, Socket) ->
case inet:peername(Socket) of
- {ok,{{A, B, C, D}, Port}} ->
- PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
- integer_to_list(C)++"."++integer_to_list(D),
+ {ok, {Addr, Port}} when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+ PeerName = ipv4_name(Addr),
{Port, PeerName};
- {ok,{{A, B, C, D, E, F, G, H}, Port}} ->
- PeerName = http_util:integer_to_hexlist(A) ++ ":"++
- http_util:integer_to_hexlist(B) ++ ":" ++
- http_util:integer_to_hexlist(C) ++ ":" ++
- http_util:integer_to_hexlist(D) ++ ":" ++
- http_util:integer_to_hexlist(E) ++ ":" ++
- http_util:integer_to_hexlist(F) ++ ":" ++
- http_util:integer_to_hexlist(G) ++":"++
- http_util:integer_to_hexlist(H),
+ {ok, {Addr, Port}} when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+ PeerName = ipv6_name(Addr),
{Port, PeerName};
{error, _} ->
{-1, "unknown"}
@@ -530,9 +522,11 @@ peername({essl, _}, Socket) ->
peername_ssl(Socket) ->
case ssl:peername(Socket) of
- {ok,{{A, B, C, D}, Port}} ->
- PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
- integer_to_list(C)++"."++integer_to_list(D),
+ {ok, {Addr, Port}} when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+ PeerName = ipv4_name(Addr),
+ {Port, PeerName};
+ {ok, {Addr, Port}} when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+ PeerName = ipv6_name(Addr),
{Port, PeerName};
{error, _} ->
{-1, "unknown"}
@@ -551,19 +545,11 @@ peername_ssl(Socket) ->
%%-------------------------------------------------------------------------
sockname(ip_comm, Socket) ->
case inet:sockname(Socket) of
- {ok,{{A, B, C, D}, Port}} ->
- SockName = integer_to_list(A)++"."++integer_to_list(B)++"."++
- integer_to_list(C)++"."++integer_to_list(D),
+ {ok, {Addr, Port}} ->
+ SockName = ipv4_name(Addr),
{Port, SockName};
- {ok,{{A, B, C, D, E, F, G, H}, Port}} ->
- SockName = http_util:integer_to_hexlist(A) ++ ":"++
- http_util:integer_to_hexlist(B) ++ ":" ++
- http_util:integer_to_hexlist(C) ++ ":" ++
- http_util:integer_to_hexlist(D) ++ ":" ++
- http_util:integer_to_hexlist(E) ++ ":" ++
- http_util:integer_to_hexlist(F) ++ ":" ++
- http_util:integer_to_hexlist(G) ++":"++
- http_util:integer_to_hexlist(H),
+ {ok, {Addr, Port}} ->
+ SockName = ipv6_name(Addr),
{Port, SockName};
{error, _} ->
{-1, "unknown"}
@@ -581,9 +567,11 @@ sockname({essl, _}, Socket) ->
sockname_ssl(Socket) ->
case ssl:sockname(Socket) of
- {ok,{{A, B, C, D}, Port}} ->
- SockName = integer_to_list(A)++"."++integer_to_list(B)++"."++
- integer_to_list(C)++"."++integer_to_list(D),
+ {ok, {Addr, Port}} ->
+ SockName = ipv4_name(Addr),
+ {Port, SockName};
+ {ok, {Addr, Port}} ->
+ SockName = ipv6_name(Addr),
{Port, SockName};
{error, _} ->
{-1, "unknown"}
@@ -605,6 +593,22 @@ resolve() ->
%%% Internal functions
%%%========================================================================
+ipv4_name({A, B, C, D}) ->
+ integer_to_list(A) ++ "." ++
+ integer_to_list(B) ++ "." ++
+ integer_to_list(C) ++ "." ++
+ integer_to_list(D).
+
+ipv6_name({A, B, C, D, E, F, G, H}) ->
+ http_util:integer_to_hexlist(B) ++ ":" ++
+ http_util:integer_to_hexlist(C) ++ ":" ++
+ http_util:integer_to_hexlist(D) ++ ":" ++
+ http_util:integer_to_hexlist(E) ++ ":" ++
+ http_util:integer_to_hexlist(F) ++ ":" ++
+ http_util:integer_to_hexlist(G) ++ ":" ++
+ http_util:integer_to_hexlist(H).
+
+
%% Address any comes from directive: BindAddress "*"
sock_opt(ip_comm, any = Addr, Opts) ->
sock_opt2([{ip, Addr} | Opts]);
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 47f3fbba58..c432ac82eb 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,6 +18,11 @@
{"%VSN%",
[
+ {"5.6",
+ [
+ {load_module, http_transport, soft_purge, soft_purge, []}
+ ]
+ },
{"5.5.2",
[
{restart_application, inets}
@@ -40,6 +45,11 @@
}
],
[
+ {"5.6",
+ [
+ {load_module, http_transport, soft_purge, soft_purge, []}
+ ]
+ },
{"5.5.2",
[
{restart_application, inets}