summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog5
-rw-r--r--src/ejabberd_c2s.erl2
-rw-r--r--src/ejabberd_s2s_out.erl3
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c74ced8..fe8a7e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-08 Mickael Remond <mremond@process-one.net>
+
+ * src/ejabberd_s2s_out.erl: exports the DNS resolution
+ function.
+
2008-11-06 Badlop <badlop@process-one.net>
* src/extauth.erl: When the extauth call fails or timeouts, deny
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 311d955f..5b08d1e3 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -62,6 +62,8 @@
-define(SETS, gb_sets).
-define(DICT, dict).
+%% pres_a contains all the presence available send (either through roster mechanism or directed).
+%% Directed presence unavailable remove user from pres_a.
-record(state, {socket,
sockmod,
socket_monitor,
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index a6b7ba36..aa4c7ed9 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -52,7 +52,8 @@
handle_info/3,
terminate/3,
code_change/4,
- test_get_addr_port/1]).
+ test_get_addr_port/1,
+ get_addr_port/1]).
-include("ejabberd.hrl").
-include("jlib.hrl").