diff options
| author | may <may@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-10 13:29:19 +0000 |
|---|---|---|
| committer | may <may@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-10 13:29:19 +0000 |
| commit | eff19bee6758931267d6c770760069fab89a3a2e (patch) | |
| tree | b42e93cc9103f80288a96db6edc77d9c13a64bca /addons/ooh323c/src/oochannels.c | |
| parent | fb93734d3a679c9225832e7cae529586acf4a193 (diff) | |
Corrections for properly work with H.323v2 (older) endpoints and other
small fixes.
Interpret remote side H.225 version.
Corrections for H.323v2 endpoints:
don't start TCS and MSD before connect,
don't start TCS and MSD by accepting H.245 connection,
start TCS and MSD by StartH245 facility message.
Other fixes:
fix non zeroended remoteDisplayName issue, small fixes in call clearing
by closing H.245 connection, tcp keepalive introduced on TCP
connections (now is hardcoded, will be configurable in the future),
don't force H.245tunneling if FastStart is active, don't send Alerting
singal more than once per call.
(closes issue #18542)
Reported by: vmikhelson
Patches:
issue18542-final-3.patch uploaded by may213 (license 454)
Tested by: vmikhelson
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@307396 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'addons/ooh323c/src/oochannels.c')
| -rw-r--r-- | addons/ooh323c/src/oochannels.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c index 7fa850914..e16fdcc06 100644 --- a/addons/ooh323c/src/oochannels.c +++ b/addons/ooh323c/src/oochannels.c @@ -473,15 +473,6 @@ int ooAcceptH245Connection(OOH323CallData *call) OOTRACEINFO3("H.245 connection established (%s, %s)\n", call->callType, call->callToken); - - /* Start terminal capability exchange and master slave determination */ - ret = ooSendTermCapMsg(call); - if(ret != OO_OK) - { - OOTRACEERR3("ERROR:Sending Terminal capability message (%s, %s)\n", - call->callType, call->callToken); - return ret; - } return OO_OK; } @@ -1835,6 +1826,8 @@ int ooOnSendMsg } else{ ooCloseH245Connection(call); + if(call->callState < OO_CALL_CLEAR) + call->callState = OO_CALL_CLEAR; } break; case OOCloseLogicalChannel: |