aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-24 14:41:43 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-24 14:41:43 +0000
commit65cd6cfe24291cbe1c38d2c2e44d965e92cb84cc (patch)
tree2ef234321bbf27d4a313749a99b180af5adb0fbd /res
parent28320d58a2dac4f16a22ed57df6d2777cdde2535 (diff)
Issue #8409 and accidentally a fix to chan_sip that wasn't supposed to be there
but is still ok... Sorry. Lack of Tea, really. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@65838 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_jabber.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 649e7534c..d617aa76a 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1853,12 +1853,13 @@ static int aji_client_initialize(struct aji_client *client)
static int aji_component_initialize(struct aji_client *client)
{
int connected = 1;
- connected = iks_connect_via(client->p, client->jid->server, client->port, client->user);
+
+ connected = iks_connect_via(client->p, S_OR(client->serverhost, client->jid->server), client->port, client->user);
if (connected == IKS_NET_NOCONN) {
ast_log(LOG_ERROR, "JABBER ERROR: No Connection\n");
return IKS_HOOK;
} else if (connected == IKS_NET_NODNS) {
- ast_log(LOG_ERROR, "JABBER ERROR: No DNS\n");
+ ast_log(LOG_ERROR, "JABBER ERROR: No DNS %s for client to %s\n", client->name, S_OR(client->serverhost, client->jid->server));
return IKS_HOOK;
} else if (!connected)
iks_recv(client->p, 30);