diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-11-08 04:58:30 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-08 04:58:30 -0600 |
| commit | 4c8b3babf7c60b66a30a3b58ad340bdb947cc0c1 (patch) | |
| tree | b762fecca75ef4f5623684db3aa96ff9e0b1af85 /addons | |
| parent | 1be6c9d26a7b34a26a4bd4fb34b8eaca6061a9d9 (diff) | |
| parent | 2849e596b86c776bac5a82dd9e9ecf98e3188a51 (diff) | |
Merge "chan_ooh323: Fixes to work right with Cisco devices" into 14
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/ooh323c/src/ooCalls.c | 3 | ||||
| -rw-r--r-- | addons/ooh323c/src/oochannels.c | 16 | ||||
| -rw-r--r-- | addons/ooh323c/src/ooq931.c | 5 |
3 files changed, 9 insertions, 15 deletions
diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c index 2eefb4648..26dc63eab 100644 --- a/addons/ooh323c/src/ooCalls.c +++ b/addons/ooh323c/src/ooCalls.c @@ -224,7 +224,8 @@ int ooEndCall(OOH323CallData *call) call->callState = OO_CALL_CLEARED; } - if(call->callState == OO_CALL_CLEARED || call->callState == OO_CALL_CLEAR_RELEASESENT) + if(call->callState == OO_CALL_CLEARED || ((strcmp(call->callType, "incoming")) && + call->callState == OO_CALL_CLEAR_RELEASESENT)) { ooCleanCall(call); call->callState = OO_CALL_REMOVED; diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c index a09470db1..0501882a9 100644 --- a/addons/ooh323c/src/oochannels.c +++ b/addons/ooh323c/src/oochannels.c @@ -679,9 +679,9 @@ int ooProcessCallFDSETsAndTimers if (0 != call->pH245Channel && 0 != call->pH245Channel->sock) { if(ooPDWrite(pfds, nfds, call->pH245Channel->sock)) { - while (call->pH245Channel->outQueue.count>0) { + if (call->pH245Channel->outQueue.count>0) { if (ooSendMsg(call, OOH245MSG) != OO_OK) - break; + OOTRACEERR1("Error in sending h245 message\n"); } } } @@ -699,26 +699,24 @@ int ooProcessCallFDSETsAndTimers { if(ooPDWrite(pfds, nfds, call->pH225Channel->sock)) { - while (call->pH225Channel->outQueue.count>0) + if (call->pH225Channel->outQueue.count>0) { OOTRACEDBGC3("Sending H225 message (%s, %s)\n", call->callType, call->callToken); if (ooSendMsg(call, OOQ931MSG) != OO_OK) - break; + OOTRACEERR1("Error in sending h225 message\n"); } if(call->pH245Channel && call->pH245Channel->outQueue.count>0 && OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { - while (call->pH245Channel->outQueue.count>0) { OOTRACEDBGC3("H245 message needs to be tunneled. " "(%s, %s)\n", call->callType, call->callToken); if (ooSendMsg(call, OOH245MSG) != OO_OK) - break; + OOTRACEERR1("Error in sending h245 message\n"); } - } - } - } + } + } if(ooTimerNextTimeout(&call->timerList, &toNext)) { diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c index cbc4afb0a..4d6d99368 100644 --- a/addons/ooh323c/src/ooq931.c +++ b/addons/ooh323c/src/ooq931.c @@ -2124,9 +2124,6 @@ int ooSendReleaseComplete(OOH323CallData *call) return OO_FAILED; } memset(releaseComplete, 0, sizeof(H225ReleaseComplete_UUIE)); - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, - OO_M_TUNNELING); q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_releaseComplete; @@ -2143,8 +2140,6 @@ int ooSendReleaseComplete(OOH323CallData *call) releaseComplete->reason.t = h225ReasonCode; /* Add user-user ie */ - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=TRUE; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG (call->flags, OO_M_TUNNELING); q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_releaseComplete; |