diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 14:38:30 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 14:38:30 +0000 |
| commit | ad3b214acacb941a922f857c094041e3d9527642 (patch) | |
| tree | 5d90ff0ad5676dba243af5967f65742fce9fda59 /res | |
| parent | eca2878800e62671b28bb28cfb2ac4cdc52d33e7 (diff) | |
Issue 8409 - phsultan - Fix "login" as component to jabber server.
...and, by accident, fix a bug in chan_sip for stopping a loop on retransmits
of BYE requests.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@65836 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_jabber.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 02312e9c0..faf1a0202 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -1845,12 +1845,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); |