Report real address of a listener

diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl
index 226978592dd3dfd62630a3835809b473d154d72b..5b2981c2dc1c69a0d8b85b6af7a3401309eddb19 100644 (file)
--- a/src/ejabberd_listener.erl
+++ b/src/ejabberd_listener.erl
@@ -104,57 +104,70 @@ init({Port, _, udp} = EndPoint, Module, Opts, SockOpts) ->
                             {reuseaddr, true} |
                             SockOpts]) of
        {ok, Socket} ->
-           proc_lib:init_ack({ok, self()}),
-           application:ensure_started(ejabberd),
-           ?INFO_MSG("Start accepting UDP connections at ~s for ~p",
-                     [format_endpoint(EndPoint), Module]),
-           case erlang:function_exported(Module, udp_init, 2) of
-               false ->
-                   udp_recv(Socket, Module, Opts);
-               true ->
-                   case catch Module:udp_init(Socket, Opts) of
-                       {'EXIT', _} = Err ->
-                           ?ERROR_MSG("failed to process callback function "
-                                      "~p:~s(~p, ~p): ~p",
-                                      [Module, udp_init, Socket, Opts, Err]),
+           case inet:sockname(Socket) of
+               {ok, {Addr, Port1}} ->
+                   proc_lib:init_ack({ok, self()}),
+                   application:ensure_started(ejabberd),
+                   ?INFO_MSG("Start accepting UDP connections at ~s for ~p",
+                             [format_endpoint({Port1, Addr, udp}), Module]),
+                   case erlang:function_exported(Module, udp_init, 2) of
+                       false ->
                            udp_recv(Socket, Module, Opts);
-                       NewOpts ->
-                           udp_recv(Socket, Module, NewOpts)
-                   end
+                       true ->
+                           case catch Module:udp_init(Socket, Opts) of
+                               {'EXIT', _} = Err ->
+                                   ?ERROR_MSG("failed to process callback function "
+                                              "~p:~s(~p, ~p): ~p",
+                                              [Module, udp_init, Socket, Opts, Err]),
+                                   udp_recv(Socket, Module, Opts);
+                               NewOpts ->
+                                   udp_recv(Socket, Module, NewOpts)
+                           end
+                   end;
+               {error, Reason} = Err ->
+                   report_socket_error(Reason, EndPoint, Module),
+                   proc_lib:init_ack(Err)
            end;
        {error, Reason} = Err ->
            report_socket_error(Reason, EndPoint, Module),
            proc_lib:init_ack(Err)
     end;
-init({_, _, tcp} = EndPoint, Module, Opts, SockOpts) ->
-    case listen_tcp(EndPoint, Module, SockOpts) of
+init({Port, _, tcp} = EndPoint, Module, Opts, SockOpts) ->
+    case listen_tcp(Port, SockOpts) of
        {ok, ListenSocket} ->
-           proc_lib:init_ack({ok, self()}),
-           application:ensure_started(ejabberd),
-           Sup = start_module_sup(Module, Opts),
-           ?INFO_MSG("Start accepting TCP connections at ~s for ~p",
-                     [format_endpoint(EndPoint), Module]),
-           case erlang:function_exported(Module, tcp_init, 2) of
-               false ->
-                   accept(ListenSocket, Module, Opts, Sup);
-               true ->
-                   case catch Module:tcp_init(ListenSocket, Opts) of
-                       {'EXIT', _} = Err ->
-                           ?ERROR_MSG("failed to process callback function "
-                                      "~p:~s(~p, ~p): ~p",
-                                      [Module, tcp_init, ListenSocket, Opts, Err]),
+           case inet:sockname(ListenSocket) of
+               {ok, {Addr, Port1}} ->
+                   proc_lib:init_ack({ok, self()}),
+                   application:ensure_started(ejabberd),
+                   Sup = start_module_sup(Module, Opts),
+                   ?INFO_MSG("Start accepting TCP connections at ~s for ~p",
+                             [format_endpoint({Port1, Addr, tcp}), Module]),
+                   case erlang:function_exported(Module, tcp_init, 2) of
+                       false ->
                            accept(ListenSocket, Module, Opts, Sup);
-                       NewOpts ->
-                           accept(ListenSocket, Module, NewOpts, Sup)
-                   end
+                       true ->
+                           case catch Module:tcp_init(ListenSocket, Opts) of
+                               {'EXIT', _} = Err ->
+                                   ?ERROR_MSG("failed to process callback function "
+                                              "~p:~s(~p, ~p): ~p",
+                                              [Module, tcp_init, ListenSocket, Opts, Err]),
+                                   accept(ListenSocket, Module, Opts, Sup);
+                               NewOpts ->
+                                   accept(ListenSocket, Module, NewOpts, Sup)
+                           end
+                   end;
+               {error, Reason} = Err ->
+                   report_socket_error(Reason, EndPoint, Module),
+                   Err
            end;
-       {error, _} = Err ->
+       {error, Reason} = Err ->
+           report_socket_error(Reason, EndPoint, Module),
            proc_lib:init_ack(Err)
     end.
 
--spec listen_tcp(endpoint(), module(), [gen_tcp:option()]) ->
+-spec listen_tcp(inet:port_number(), [gen_tcp:option()]) ->
                {ok, inet:socket()} | {error, system_limit | inet:posix()}.
-listen_tcp({Port, _, _} = EndPoint, Module, SockOpts) ->
+listen_tcp(Port, SockOpts) ->
     Res = gen_tcp:listen(Port, [binary,
                                {packet, 0},
                                {active, false},
@@ -167,8 +180,7 @@ listen_tcp({Port, _, _} = EndPoint, Module, SockOpts) ->
     case Res of
        {ok, ListenSocket} ->
            {ok, ListenSocket};
-       {error, Reason} = Err ->
-           report_socket_error(Reason, EndPoint, Module),
+       {error, _} = Err ->
            Err
     end.
 

diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl
index 44635e9625f8ad672f9874bf362b7c3eab461677..9510ff4b2c49cd4dcafdba0a03f7561b1b59aa71 100644 (file)
--- a/src/mod_proxy65_service.erl
+++ b/src/mod_proxy65_service.erl
@@ -115,8 +115,10 @@ code_change(_OldVsn, State, _Extra) -> {ok, State}.
 %%%------------------------
 
 add_listener(Host, Opts) ->
-    NewOpts = [{server_host, Host} | Opts],
-    ejabberd_listener:add_listener(get_endpoint(Host), mod_proxy65_stream, NewOpts).
+    {_, IP, _} = EndPoint = get_endpoint(Host),
+    Opts1 = [{server_host, Host} | Opts],
+    Opts2 = lists:keystore(ip, 1, Opts1, {ip, IP}),
+    ejabberd_listener:add_listener(EndPoint, mod_proxy65_stream, Opts2).
 
 delete_listener(Host) ->
     ejabberd_listener:delete_listener(get_endpoint(Host), mod_proxy65_stream).