Change order of sending TCS and MSD packets

Change order of sending Terminal Capability Set and MasterSlave
Determination packets, MSD send when TCS exchange procedure is done
(we send tcs ack to remote and we have remote tcs ack already
or we receive tcs ack from remote and we have send our tcs ack to
remote  already). Some endpoints can work in this sequence only,
i suggest they can't work with both (tcs and msd) exchange procedures
simultaneously.

Also changed StartH245 facility message sending. It send on
incoming calls only due to some endpoints can't proccess properly
this facility messages on their incoming calls.

(closes issue #18433)
Reported by: MrHanMan
Patches:
      tcs-msd-h245-3.patch uploaded by may213 (license 454)
Tested by: MrHanMan, may213


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@299715 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 8 deletions

diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c
index 7e42a22ad..d0233f363 100644
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -1213,14 +1213,6 @@ int ooSendTCSandMSD(OOH323CallData *call)
 			return ret;
 		}
 	}
-	if(call->masterSlaveState == OO_MasterSlave_Idle) {
-		ret = ooSendMasterSlaveDetermination(call);
-		if(ret != OO_OK) {
-			OOTRACEERR3("ERROR:Sending Master-slave determination message "
-				"(%s, %s)\n", call->callType, call->callToken);
-			return ret;
-		}
-	}
 
 	return OO_OK;
 }
@@ -1593,6 +1585,9 @@ int ooSendProgress(OOH323CallData *call)
       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)
+      ooSendStartH245Facility(call);
+
    ooSendTCSandMSD(call);
    memReset (call->msgctxt);