[asterisk-commits] may: trunk r242933 - /trunk/addons/ooh323c/src/

[SVN commits to the Asterisk project]

Author: may
Date: Mon Jan 25 15:20:02 2010
New Revision: 242933

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242933
Log:
small corrections in call clearing

Modified:
    trunk/addons/ooh323c/src/ooCalls.c
    trunk/addons/ooh323c/src/oochannels.c
    trunk/addons/ooh323c/src/ooh323.c

Modified: trunk/addons/ooh323c/src/ooCalls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooCalls.c?view=diff&rev=242933&r1=242932&r2=242933
==============================================================================
--- trunk/addons/ooh323c/src/ooCalls.c (original)
+++ trunk/addons/ooh323c/src/ooCalls.c Mon Jan 25 15:20:02 2010
@@ -371,10 +371,11 @@
 	}
    }
 
-   pctxt = call->msgctxt;
-   freeContext(pctxt);
-   free(pctxt);
-   call->msgctxt = NULL;
+   if ((pctxt = call->msgctxt) != NULL) {
+   	freeContext(pctxt);
+   	free(pctxt);
+   	call->msgctxt = NULL;
+   }
 /* May !!!! Fix it !! */
    /* free(pctxt); */
 

Modified: trunk/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/oochannels.c?view=diff&rev=242933&r1=242932&r2=242933
==============================================================================
--- trunk/addons/ooh323c/src/oochannels.c (original)
+++ trunk/addons/ooh323c/src/oochannels.c Mon Jan 25 15:20:02 2010
@@ -748,8 +748,9 @@
 	    ast_mutex_lock(&call->Lock);
             ooEndCall(call);
 	    ast_mutex_unlock(&call->Lock);
-	    ooStopMonitorCallChannels(call);
      }
+     if(call->callState >= OO_CALL_CLEARED)
+		ooStopMonitorCallChannels(call);
    }
 
    return OO_OK;

Modified: trunk/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooh323.c?view=diff&rev=242933&r1=242932&r2=242933
==============================================================================
--- trunk/addons/ooh323c/src/ooh323.c (original)
+++ trunk/addons/ooh323c/src/ooh323.c Mon Jan 25 15:20:02 2010
@@ -1594,6 +1594,8 @@
          	ooSendCallProceeding(call);/* Send call proceeding message*/
          	ret = ooH323CallAdmitted (call);
 	  }
+
+	 call->callState = OO_CALL_CONNECTING;
 
 	 } /* end ret == OO_OK */
          break;