[asterisk-commits] may: trunk r237098 - in /trunk/addons/ooh323c/src: ooCalls.c ooh323.c ooq931.c

[SVN commits to the Asterisk project]

Author: may
Date: Wed Dec 30 17:51:32 2009
New Revision: 237098

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237098
Log:
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


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

Modified: trunk/addons/ooh323c/src/ooCalls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooCalls.c?view=diff&rev=237098&r1=237097&r2=237098
==============================================================================
--- trunk/addons/ooh323c/src/ooCalls.c (original)
+++ trunk/addons/ooh323c/src/ooCalls.c Wed Dec 30 17:51:32 2009
@@ -215,7 +215,9 @@
      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;

Modified: trunk/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooh323.c?view=diff&rev=237098&r1=237097&r2=237098
==============================================================================
--- trunk/addons/ooh323c/src/ooh323.c (original)
+++ trunk/addons/ooh323c/src/ooh323.c Wed Dec 30 17:51:32 2009
@@ -782,10 +782,6 @@
          return OO_FAILED;
        }
       }
-   } else if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
-	ret =ooSendTCSandMSD(call);
-	if (ret != OO_OK)
-		return ret;
    }
    return OO_OK;
 }

Modified: trunk/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooq931.c?view=diff&rev=237098&r1=237097&r2=237098
==============================================================================
--- trunk/addons/ooh323c/src/ooq931.c (original)
+++ trunk/addons/ooh323c/src/ooq931.c Wed Dec 30 17:51:32 2009
@@ -237,7 +237,7 @@
    /*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;
 }