aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src
diff options
context:
space:
mode:
Diffstat (limited to 'lib/orber/src')
-rw-r--r--lib/orber/src/orber_iiop_net.erl2
-rw-r--r--lib/orber/src/orber_iiop_outproxy.erl8
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/orber/src/orber_iiop_net.erl b/lib/orber/src/orber_iiop_net.erl
index a21f961c45..1bfc6b7d58 100644
--- a/lib/orber/src/orber_iiop_net.erl
+++ b/lib/orber/src/orber_iiop_net.erl
@@ -226,7 +226,6 @@ parse_options([{port, Type, Port} | Rest], State) ->
{ok, IP} = inet:getaddr(Host, Family),
IPFamilyOptions ++ [{ip, IP} |Options]
end,
- io:format("HEJ parse_options: ~p\n", [Options2]),
{ok, Listen, NewPort} = orber_socket:listen(Type, Port, Options2, true),
{ok, Pid} = orber_iiop_socketsup:start_accept(Type, Listen, 0),
@@ -301,7 +300,6 @@ handle_call({add, IP, Type, Port, AllOptions}, _From, State) ->
{ok, IPTuple} ->
try
Options = IPFamilyOptions ++ [{ip, IPTuple} |get_options(Type, AllOptions)],
- io:format("HEJ handle_call: ~p\n", [Options]),
Ref = make_ref(),
ProxyOptions = filter_options(AllOptions, []),
case orber_socket:listen(Type, Port, Options, false) of
diff --git a/lib/orber/src/orber_iiop_outproxy.erl b/lib/orber/src/orber_iiop_outproxy.erl
index 89a3d4fde0..4ba5b05995 100644
--- a/lib/orber/src/orber_iiop_outproxy.erl
+++ b/lib/orber/src/orber_iiop_outproxy.erl
@@ -513,7 +513,7 @@ get_ip_family_opts(Host) ->
{ok, {_,_,_,_}} ->
[inet];
{ok, {_,_,_,_,_,_,_,_}} ->
- [inet6, {ipv6_v6only, true}];
+ [inet6];
{error, einval} ->
check_family_for_name(Host, orber_env:ip_version())
end.
@@ -525,7 +525,7 @@ check_family_for_name(Host, inet) ->
{error, _} ->
case inet:getaddrs(Host, inet6) of
{ok, _Address} ->
- [inet6, {ipv6_v6only, true}];
+ [inet6];
{error, _} ->
[inet]
end
@@ -533,13 +533,13 @@ check_family_for_name(Host, inet) ->
check_family_for_name(Host, inet6) ->
case inet:getaddr(Host, inet6) of
{ok, _Address} ->
- [inet6, {ipv6_v6only, true}];
+ [inet6];
{error, _} ->
case inet:getaddr(Host, inet) of
{ok, _Address} ->
[inet];
{error, _} ->
- [inet6, {ipv6_v6only, true}]
+ [inet6]
end
end.