diff options
| author | Dan Gudmundsson <[email protected]> | 2010-08-25 15:23:30 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-01 10:41:28 +0200 |
| commit | 50392cec6e5bda7ac62abff3313eae551b006612 (patch) | |
| tree | 18910c7df693f81ec3a892ad19f9e056a496e9d1 /lib/ssl/inet_proxy_dist.erl | |
| parent | 3e631a1851d1b0546e9ba1b52a22cf15b2e32501 (diff) | |
| download | otp-50392cec6e5bda7ac62abff3313eae551b006612.tar.gz otp-50392cec6e5bda7ac62abff3313eae551b006612.tar.bz2 otp-50392cec6e5bda7ac62abff3313eae551b006612.zip | |
Use ssl instead of being a proxy command
Diffstat (limited to 'lib/ssl/inet_proxy_dist.erl')
| -rw-r--r-- | lib/ssl/inet_proxy_dist.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/ssl/inet_proxy_dist.erl b/lib/ssl/inet_proxy_dist.erl index 6308deabe6..9e415def3e 100644 --- a/lib/ssl/inet_proxy_dist.erl +++ b/lib/ssl/inet_proxy_dist.erl @@ -9,7 +9,7 @@ -module(inet_proxy_dist). -export([childspecs/0, listen/1, accept/1, accept_connection/5, - setup/5, close/1, select/1, is_node_name/1, tick/1]). + setup/5, close/1, select/1, is_node_name/1]). -include_lib("kernel/src/net_address.hrl"). -include_lib("kernel/src/dist.hrl"). @@ -126,7 +126,11 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> end. close(Socket) -> - io:format("close called~n",[]), + try + erlang:error(foo) + catch _:_ -> + io:format("close called ~p ~p~n",[Socket, erlang:get_stacktrace()]) + end, gen_tcp:close(Socket), ok. @@ -184,9 +188,6 @@ do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) -> get_remote_id(Socket, Node) -> gen_server:call(proxy_server, {get_remote_id, {Socket,Node}}, infinity). -tick(Socket) -> - gen_tcp:send(Socket, <<>>). - check_ip(_) -> true. |