[asterisk-commits] may: branch may/ooh323_qsig r372882 - in /team/may/ooh323_qsig/addons: ./ ooh...

[SVN commits to the Asterisk project]

Author: may
Date: Tue Sep 11 13:47:09 2012
New Revision: 372882

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372882
Log:
Send startH245 facility msg only once (don't confuse old endpoints)
Don't send progress followed by first rtp if channel is answered already
(same as per ooh323_indicate)

Modified:
    team/may/ooh323_qsig/addons/chan_ooh323.c
    team/may/ooh323_qsig/addons/ooh323c/src/ooCalls.h
    team/may/ooh323_qsig/addons/ooh323c/src/ooq931.c

Modified: team/may/ooh323_qsig/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_qsig/addons/chan_ooh323.c?view=diff&rev=372882&r1=372881&r2=372882
==============================================================================
--- team/may/ooh323_qsig/addons/chan_ooh323.c (original)
+++ team/may/ooh323_qsig/addons/chan_ooh323.c Tue Sep 11 13:47:09 2012
@@ -1197,6 +1197,7 @@
 		if (f->frametype == AST_FRAME_VOICE) {
 /* sending progress for first */
 			if (!ast_test_flag(p, H323_OUTGOING) && !p->progsent &&
+				(ast_channel_state(ast) != AST_STATE_UP) &&
 			 		p->callToken) {
 				ooManualProgress(p->callToken);
 				p->progsent = 1;

Modified: team/may/ooh323_qsig/addons/ooh323c/src/ooCalls.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_qsig/addons/ooh323c/src/ooCalls.h?view=diff&rev=372882&r1=372881&r2=372882
==============================================================================
--- team/may/ooh323_qsig/addons/ooh323c/src/ooCalls.h (original)
+++ team/may/ooh323_qsig/addons/ooh323c/src/ooCalls.h Tue Sep 11 13:47:09 2012
@@ -88,6 +88,7 @@
  */
 typedef enum {
    OO_H245SESSION_IDLE,
+   OO_H245SESSION_PENDING,
    OO_H245SESSION_PAUSED,
    OO_H245SESSION_ACTIVE,
    OO_H245SESSION_ENDSENT, 

Modified: team/may/ooh323_qsig/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_qsig/addons/ooh323c/src/ooq931.c?view=diff&rev=372882&r1=372881&r2=372882
==============================================================================
--- team/may/ooh323_qsig/addons/ooh323c/src/ooq931.c (original)
+++ team/may/ooh323_qsig/addons/ooh323c/src/ooq931.c Tue Sep 11 13:47:09 2012
@@ -1788,8 +1788,9 @@
       OOTRACEERR3("Error: Failed to enqueue Alerting message to outbound queue. (%s, %s)\n", call->callType, call->callToken);
    }
 
-   if (!OO_TESTFLAG(call->flags, OO_M_TUNNELING) && call->h245listener)
+   if (!OO_TESTFLAG(call->flags, OO_M_TUNNELING) && call->h245listener && call->h245SessionState == OO_H245SESSION_IDLE) {
       ooSendStartH245Facility(call);
+   }
 
    if (call->h225version >= 4) {
 	ooSendTCSandMSD(call);
@@ -1989,6 +1990,7 @@
          "queue.(%s, %s)\n", call->callType, call->callToken);
    }
    /* memReset (&gH323ep.msgctxt); */
+   call->h245SessionState == OO_H245SESSION_PENDING;
    memReset (call->msgctxt);
    return ret;
 }
@@ -2599,6 +2601,11 @@
    if (call->rtdrCount > 0 && call->rtdrInterval > 0) {
 	return ooSendRoundTripDelayRequest(call);
    }
+
+   if (!OO_TESTFLAG(call->flags, OO_M_TUNNELING) && call->h245listener && call->h245SessionState == OO_H245SESSION_IDLE) {
+      ooSendStartH245Facility(call);
+   }
+
    return OO_OK;
 }