[asterisk-commits] may: branch 10 r331147 - in /branches/10: ./ addons/ addons/ooh323c/src/

[SVN commits to the Asterisk project]

Author: may
Date: Tue Aug  9 11:16:55 2011
New Revision: 331147

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331147
Log:
Merged revisions 331146 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r331146 | may | 2011-08-09 20:13:09 +0400 (Tue, 09 Aug 2011) | 4 lines
  
  move ast_cond_signal for admitted call after all data filled/freed
  clear all log channels by pointed number not only first
  free allocated callToken in ooh323_answer
........

Modified:
    branches/10/   (props changed)
    branches/10/addons/chan_ooh323.c
    branches/10/addons/ooh323c/src/ooGkClient.c
    branches/10/addons/ooh323c/src/ooLogChan.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/chan_ooh323.c?view=diff&rev=331147&r1=331146&r2=331147
==============================================================================
--- branches/10/addons/chan_ooh323.c (original)
+++ branches/10/addons/chan_ooh323.c Tue Aug  9 11:16:55 2011
@@ -1122,6 +1122,9 @@
 				ast_debug(1, "ooh323_answer(%s)\n", ast->name);
 			ast_channel_unlock(ast);
 			ooAnswerCall(p->callToken);
+		}
+		if (callToken) {
+			free(callToken);
 		}
 		ast_mutex_unlock(&p->lock);
 	}

Modified: branches/10/addons/ooh323c/src/ooGkClient.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/ooh323c/src/ooGkClient.c?view=diff&rev=331147&r1=331146&r2=331147
==============================================================================
--- branches/10/addons/ooh323c/src/ooGkClient.c (original)
+++ branches/10/addons/ooh323c/src/ooGkClient.c Tue Aug  9 11:16:55 2011
@@ -1997,13 +1997,13 @@
                        pCallAdmInfo->call->callToken);
 
 	 pCallAdmInfo->call->callState = OO_CALL_CONNECTING;
-	 ast_cond_signal(&pCallAdmInfo->call->gkWait);
          /* ooH323CallAdmitted( pCallAdmInfo->call); */
 
          dListRemove(&pGkClient->callsPendingList, pNode);
          dListAppend(&pGkClient->ctxt, &pGkClient->callsAdmittedList, 
                                                         pNode->data);
          memFreePtr(&pGkClient->ctxt, pNode);
+	 ast_cond_signal(&pCallAdmInfo->call->gkWait);
          return OO_OK;
          break;
       }

Modified: branches/10/addons/ooh323c/src/ooLogChan.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/ooh323c/src/ooLogChan.c?view=diff&rev=331147&r1=331146&r2=331147
==============================================================================
--- branches/10/addons/ooh323c/src/ooLogChan.c (original)
+++ branches/10/addons/ooh323c/src/ooLogChan.c Tue Aug  9 11:16:55 2011
@@ -284,7 +284,7 @@
                  call->callType, call->callToken);
 
    pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,channelNo);
-   if(!pLogicalChannel)
+   do { if(!pLogicalChannel)
    {
       OOTRACEWARN4("Logical Channel %d doesn't exist, in clearLogicalChannel."
                    " (%s, %s)\n",
@@ -326,6 +326,7 @@
    ooRemoveLogicalChannel(call, channelNo);/* TODO: efficiency - This causes re-search of
                                                     of logical channel in the list. Can be
                                                     easily improved.*/
+   }  while ((pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,channelNo)));
    return OO_OK;
 }