diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-25 20:28:21 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-25 20:28:21 +0000 |
| commit | b4084dbed600221e0a9f67126630e61e37d71c70 (patch) | |
| tree | 0cf49c32cfe680cb18bbf8b94f9671894711e5ad /channels/h323 | |
| parent | 8596c6971c2a26b3892048dd537c0249005be8e7 (diff) | |
Backport changes of trunk:
1) r43540: Avoid possible deadlock on channel destruction
2) r43590: Disable fastStart if requested by remote side
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43626 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
| -rw-r--r-- | channels/h323/ast_h323.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index 55af0d216..6a3eb7ec1 100644 --- a/channels/h323/ast_h323.cxx +++ b/channels/h323/ast_h323.cxx @@ -37,6 +37,7 @@ #include <ptlib.h> #include <h323.h> #include <h323pdu.h> +#include <h323neg.h> #include <mediafmt.h> #include <lid.h> @@ -1105,6 +1106,14 @@ BOOL MyH323Connection::OnReceivedSignalSetup(const H323SignalPDU & setupPDU) SetCallOptions(res, TRUE); + /* Disable fastStart if requested by remote side */ + if (h245Tunneling && !setupPDU.m_h323_uu_pdu.m_h245Tunneling) { + masterSlaveDeterminationProcedure->Stop(); + capabilityExchangeProcedure->Stop(); + PTRACE(3, "H225\tFast Start DISABLED!"); + h245Tunneling = FALSE; + } + return H323Connection::OnReceivedSignalSetup(setupPDU); } |