Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2010-11-02 16:04:10 +0300
committerBadlop <badlop@process-one.net>2010-11-02 16:04:10 +0300
commit81546f327061085c5a59c4c6f40924fa9993ff4a (patch)
tree6561fe11552394a1188183906a8ba58ad4ac41eb /src/ejabberd_c2s.erl
parent91dee14ad603b6617f870090f1261e750e894d78 (diff)
Fix crash in ejabberd_c2s when blacklist hook returned true (thanks to Jonas Ã…dahl)
Cause of the crash jlib:ip_to_list/1 only supports IP tuples using the form {N1,N2,N3,N4} which is not the case when IPv6 is enabled.
Diffstat (limited to 'src/ejabberd_c2s.erl')
-rw-r--r--src/ejabberd_c2s.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 40c5a515f..975f79423 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -243,8 +243,8 @@ init([{SockMod, Socket}, Opts, FSMLimitOpts]) ->
%% Check if IP is blacklisted:
case is_ip_blacklisted(IP) of
true ->
- ?INFO_MSG("Connection attempt from blacklisted IP: ~s",
- [jlib:ip_to_list(IP)]),
+ ?INFO_MSG("Connection attempt from blacklisted IP: ~s (~w)",
+ [jlib:ip_to_list(IP), IP]),
{stop, normal};
false ->
Socket1 =