small q931 processing and signalling corrections

don't decode UUIE from Q931StatusMessage
clean call without callIdentifier data
don't start tcs/msd exchange procedure after call proceeding received

(closes issue #16365)
Reported by: benngard2
Tested by: may213, benngard2

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

diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c
index 75450182ec694663dd7dcb11ea9342ba644029e4..3984abc50be396c58679b1d6aaf5059cc4f57985 100644 (file)
--- a/addons/ooh323c/src/ooCalls.c
+++ b/addons/ooh323c/src/ooCalls.c
@@ -215,7 +215,9 @@ int ooEndCall(OOH323CallData *call)
      return OO_OK;
    }
 
-   if(call->callState == OO_CALL_CLEARED)
+   if (call->callIdentifier.guid.numocts == 0) call->callState = OO_CALL_CLEARED;
+
+   if(call->callState == OO_CALL_CLEARED || call->callState == OO_CALL_CLEAR_RELEASESENT)
    {
       ooCleanCall(call); 
       call->callState = OO_CALL_REMOVED;

diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c
index 8ccec6550922259339f293a298f489c80a9388f8..971b668a2d5dffbaf6a030eb8a9640cf8737d3d9 100644 (file)
--- a/addons/ooh323c/src/ooh323.c
+++ b/addons/ooh323c/src/ooh323.c
@@ -782,10 +782,6 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
          return OO_FAILED;
        }
       }
-   } else if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
-       ret =ooSendTCSandMSD(call);
-       if (ret != OO_OK)
-               return ret;
    }
    return OO_OK;
 }

diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c
index 8c8860b67556d21b462d5682668602b60c952f8e..e8bc41e76d60385915669c4bce099e6d4ffe8827 100644 (file)
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -237,7 +237,7 @@ EXTERN int ooQ931Decode
    /*cisco router sends Q931Notify without UU ie, 
      we just ignore notify message as of now as handling is optional for
      end point*/
-   if(msg->messageType != Q931NotifyMsg)
+   if(msg->messageType != Q931NotifyMsg && msg->messageType != Q931StatusMsg)
       rv = ooDecodeUUIE(pctxt, msg);
    return rv;
 }