diff options
Diffstat (limited to 'addons/ooh323c/src/ooh323.c')
| -rw-r--r-- | addons/ooh323c/src/ooh323.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c index ed097d95e..09df3c9c1 100644 --- a/addons/ooh323c/src/ooh323.c +++ b/addons/ooh323c/src/ooh323.c @@ -1040,10 +1040,6 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } } - } else if (!call->pH245Channel && !call->h245listener) { - ret = ooSendStartH245Facility(call); - if (ret != OO_OK) - return ret; } return OO_OK; @@ -1274,10 +1270,6 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } } - } else if (!call->pH245Channel && !call->h245listener) { - ret = ooSendStartH245Facility(call); - if (ret != OO_OK) - return ret; } return OO_OK; @@ -1572,16 +1564,6 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) 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; - } - } } call->callState = OO_CALL_CONNECTED; @@ -1986,12 +1968,17 @@ int ooHandleStartH245FacilityMessage OO_CLRFLAG (call->flags, OO_M_TUNNELING); /*Establish an H.245 connection */ - ret = ooCreateH245Connection(call); - if(ret != OO_OK) - { + if (!call->pH245Channel) { + ret = ooCreateH245Connection(call); + if(ret != OO_OK) + { OOTRACEERR3("ERROR: Failed to establish an H.245 connection with remote" " endpoint (%s, %s)\n", call->callType, call->callToken); return ret; + } + } else { + OOTRACEINFO3("INFO: H.245 connection already established with remote" + " endpoint (%s, %s)\n", call->callType, call->callToken); } return OO_OK; } |