small corrections in call clearing

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

diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c
index 3984abc50be396c58679b1d6aaf5059cc4f57985..6648c3fe2ab06e14697473a1507b8144da32999f 100644 (file)
--- a/addons/ooh323c/src/ooCalls.c
+++ b/addons/ooh323c/src/ooCalls.c
@@ -371,10 +371,11 @@ int ooCleanCall(OOH323CallData *call)
        }
    }
 
-   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); */
 

diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c
index 2b2f0b49357c35d9bfebb6dce5756d5cd62ec916..7d8c1ab723ef85991508c1c6413435efe0a853f6 100644 (file)
--- a/addons/ooh323c/src/oochannels.c
+++ b/addons/ooh323c/src/oochannels.c
@@ -748,8 +748,9 @@ int ooProcessCallFDSETsAndTimers
            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;

diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c
index 59b6afdb1a98b47c8c72e10e82fe3bd902b5319e..6cd3d881260a4f304334452a37eb0afd5d9d876d 100644 (file)
--- a/addons/ooh323c/src/ooh323.c
+++ b/addons/ooh323c/src/ooh323.c
@@ -1595,6 +1595,8 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
                ret = ooH323CallAdmitted (call);
          }
 
+        call->callState = OO_CALL_CONNECTING;
+
         } /* end ret == OO_OK */
          break;