From: Jonathan Rose <jrose@digium.com>
Date: Tue, 4 Oct 2011 14:01:05 +0000 (+0000)
Subject: Reverting revision 333265 due to component connection problems it introduces.
X-Git-Tag: 1.8.8.0-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5435277e9094d6cd3f072cbe1f137e6e35c3caeb;p=thirdparty%2Fasterisk.git

Reverting revision 333265 due to component connection problems it introduces.

I'm going to attempt some generic res_jabber cleanup and come up with a new fix for this
problem, but first it seems prudent to remove this rather broad attempt to fix it and
instead approach this problem either from the same angle but looking only at canceling
(or possibly rescheduling) the send when we absolutely know it will cause a segfault
or, if that can't be easily accomplished, strictly from the devstate side of things.
Also, I'm pretty sure a lot of the code in res_jabber isn't thread safe.

(issue ASTERISK-18626)
(issue ASTERISK-18078)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@339297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 3b37e5529d..fec88fffed 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1465,15 +1465,7 @@ static int aji_send_raw(struct aji_client *client, const char *xmlstr)
 #endif
 	/* If needed, data will be sent unencrypted, and logHook will
 	   be called inside iks_send_raw */
-	if((client->timeout != 0 && client->state == AJI_CONNECTED) || (client->state == AJI_CONNECTING))
-	{
-	    ret = iks_send_raw(client->p, xmlstr);
-	}
-	else {
-		ast_log(LOG_WARNING, "JABBER: Unable to send message to %s, we are not connected", client->name);
-		return -1;
-	}
-
+	ret = iks_send_raw(client->p, xmlstr);
 	if (ret != IKS_OK) {
 		return ret;
 	}