diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-01 18:33:50 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-01 18:33:50 +0100 |
| commit | 14ae461635d848a5b6dce9b23d63c43d0abffa5e (patch) | |
| tree | f79ddd46e3f86e058e1e747d4340ebbe4a8d3184 /src | |
| parent | 18e04626b5cb7d0e6c286012e51d2b6225a8e18f (diff) | |
| download | rabbitmq-server-14ae461635d848a5b6dce9b23d63c43d0abffa5e.tar.gz | |
First pass at reverse DNS lookups for clients.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_networking.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 5cf8d1ae..31eeef73 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -21,7 +21,7 @@ node_listeners/1, connections/0, connection_info_keys/0, connection_info/1, connection_info/2, connection_info_all/0, connection_info_all/1, - close_connection/2, force_connection_event_refresh/0]). + close_connection/2, force_connection_event_refresh/0, tcp_host/1]). %%used by TCP-based transports, e.g. STOMP adapter -export([tcp_listener_addresses/1, tcp_listener_spec/6, diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index aef48b20..d3e8d4f6 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -39,11 +39,11 @@ connection_state, queue_collector, heartbeater, stats_timer, channel_sup_sup_pid, start_heartbeat_fun, buf, buf_len, auth_mechanism, auth_state, conserve_resources, - last_blocked_by, last_blocked_at}). + last_blocked_by, last_blocked_at, peer_host}). -define(STATISTICS_KEYS, [pid, recv_oct, recv_cnt, send_oct, send_cnt, send_pend, state, last_blocked_by, last_blocked_age, - channels]). + channels, peer_host]). -define(CREATION_EVENT_KEYS, [pid, name, address, port, peer_address, peer_port, ssl, peer_cert_subject, peer_cert_issuer, @@ -224,7 +224,13 @@ start_connection(Parent, ChannelSupSupPid, Collector, StartHeartbeatFun, Deb, auth_state = none, conserve_resources = false, last_blocked_by = none, - last_blocked_at = never}, + last_blocked_at = never, + peer_host = unknown}, + Self = self(), + spawn(fun() -> + Res = rabbit_networking:tcp_host(i(peer_address, State)), + Self ! {rdns, Res} + end), try ok = inet_op(fun () -> rabbit_net:tune_buffer_size(ClientSock) end), recvloop(Deb, switch_callback(rabbit_event:init_stats_timer( @@ -348,6 +354,8 @@ handle_other({system, From, Request}, Deb, State = #v1{parent = Parent}) -> handle_other({bump_credit, Msg}, Deb, State) -> credit_flow:handle_bump_msg(Msg), recvloop(Deb, control_throttle(State)); +handle_other({rdns, Host}, Deb, State) -> + mainloop(Deb, State#v1{peer_host = list_to_binary(Host)}); handle_other(Other, _Deb, _State) -> %% internal error -> something worth dying for exit({unexpected_message, Other}). @@ -875,6 +883,8 @@ i(pid, #v1{}) -> self(); i(name, #v1{sock = Sock}) -> list_to_binary(name(Sock)); +i(peer_host, #v1{peer_host = Host}) -> + Host; i(address, #v1{sock = Sock}) -> socket_info(fun rabbit_net:sockname/1, fun ({A, _}) -> A end, Sock); i(port, #v1{sock = Sock}) -> |