[svn-commits] irroot: branch irroot/distrotech-customers-trunk r339351 - in /team/irroot/di...

[SVN commits to the Digium repositories]

Author: irroot
Date: Tue Oct  4 12:32:32 2011
New Revision: 339351

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339351
Log:
Merged revisions 339262,339315 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r339262 | may | 2011-10-04 14:27:02 +0200 (Tue, 04 Oct 2011) | 16 lines
  
  Merged revisions 339245 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r339245 | may | 2011-10-04 15:49:49 +0400 (Tue, 04 Oct 2011) | 9 lines
    
    Merged revisions 339244 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r339244 | may | 2011-10-04 15:44:55 +0400 (Tue, 04 Oct 2011) | 2 lines
      
      fix forget declaration in previous change
    ........
  ................
................
  r339315 | jrose | 2011-10-04 16:22:11 +0200 (Tue, 04 Oct 2011) | 26 lines
  
  Merged revisions 339298 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r339298 | jrose | 2011-10-04 09:09:50 -0500 (Tue, 04 Oct 2011) | 19 lines
    
    Merged revisions 339297 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r339297 | jrose | 2011-10-04 09:01:05 -0500 (Tue, 04 Oct 2011) | 13 lines
      
      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)
    ........
  ................
................

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/addons/ooh323c/src/memheap.c
    team/irroot/distrotech-customers-trunk/res/res_jabber.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct  4 12:32:32 2011
@@ -1,1 +1,1 @@
-/trunk:1-339234
+/trunk:1-339350

Modified: team/irroot/distrotech-customers-trunk/addons/ooh323c/src/memheap.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/ooh323c/src/memheap.c?view=diff&rev=339351&r1=339350&r2=339351
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/ooh323c/src/memheap.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/ooh323c/src/memheap.c Tue Oct  4 12:32:32 2011
@@ -1062,6 +1062,7 @@
 void memHeapRelease (void** ppvMemHeap)
 {
    OSMemHeap** ppMemHeap = (OSMemHeap**)ppvMemHeap;
+   OSMemHeap* pMemHeap = *ppMemHeap;
 
    if (ppMemHeap != 0 && *ppMemHeap != 0 && --(*ppMemHeap)->refCnt == 0) {
       OSMemLink* pMemLink, *pMemLink2;

Modified: team/irroot/distrotech-customers-trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/res/res_jabber.c?view=diff&rev=339351&r1=339350&r2=339351
==============================================================================
--- team/irroot/distrotech-customers-trunk/res/res_jabber.c (original)
+++ team/irroot/distrotech-customers-trunk/res/res_jabber.c Tue Oct  4 12:32:32 2011
@@ -1511,15 +1511,7 @@
 #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;
 	}