kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 12:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_ooh323: Fixes to work right with Cisco devices

Browse Source 
Changed output packets queue processing algo to one read-one write
instead of all read-all send

Remove h.245 tunneling parameter from ReleaseComplete packet

ASTERISK-24400 #close
Reported by: Dmitry Melekhov
Tested by: Dmitry Melekhov

Change-Id: I0b31933b062a21011dbac9a82b8bcfe345f406f6
This commit is contained in:
Alexander Anikin
2016-11-03 16:42:20 +04:00
parent f02647ebbd
commit a9ac1f5de4
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/ooh323c/src/ooCalls.c
View File

@@ -223,7 +223,8 @@ int ooEndCall(OOH323CallData *call)
call->callState = OO_CALL_CLEARED; 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); ooCleanCall(call);
call->callState = OO_CALL_REMOVED; call->callState = OO_CALL_REMOVED;

12
addons/ooh323c/src/oochannels.c
View File

@@ -679,9 +679,9 @@ int ooProcessCallFDSETsAndTimers
if (0 != call->pH245Channel && 0 != call->pH245Channel->sock) if (0 != call->pH245Channel && 0 != call->pH245Channel->sock)
{ {
if(ooPDWrite(pfds, nfds, 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) if (ooSendMsg(call, OOH245MSG) != OO_OK)
break; OOTRACEERR1("Error in sending h245 message\n");
} }
} }
} }
@@ -699,23 +699,21 @@ int ooProcessCallFDSETsAndTimers
{ {
if(ooPDWrite(pfds, nfds, call->pH225Channel->sock)) 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", OOTRACEDBGC3("Sending H225 message (%s, %s)\n",
call->callType, call->callToken); call->callType, call->callToken);
if (ooSendMsg(call, OOQ931MSG) != OO_OK) if (ooSendMsg(call, OOQ931MSG) != OO_OK)
break; OOTRACEERR1("Error in sending h225 message\n");
} }
if(call->pH245Channel && if(call->pH245Channel &&
call->pH245Channel->outQueue.count>0 && call->pH245Channel->outQueue.count>0 &&
OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
while (call->pH245Channel->outQueue.count>0) {
OOTRACEDBGC3("H245 message needs to be tunneled. " OOTRACEDBGC3("H245 message needs to be tunneled. "
"(%s, %s)\n", call->callType, "(%s, %s)\n", call->callType,
call->callToken); call->callToken);
if (ooSendMsg(call, OOH245MSG) != OO_OK) if (ooSendMsg(call, OOH245MSG) != OO_OK)
break; OOTRACEERR1("Error in sending h245 message\n");
}
} }
} }
} }

5
addons/ooh323c/src/ooq931.c
View File

@@ -2124,9 +2124,6 @@ int ooSendReleaseComplete(OOH323CallData *call)
return OO_FAILED; return OO_FAILED;
} }
memset(releaseComplete, 0, sizeof(H225ReleaseComplete_UUIE)); 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 = q931msg->userInfo->h323_uu_pdu.h323_message_body.t =
T_H225H323_UU_PDU_h323_message_body_releaseComplete; T_H225H323_UU_PDU_h323_message_body_releaseComplete;
@@ -2143,8 +2140,6 @@ int ooSendReleaseComplete(OOH323CallData *call)
releaseComplete->reason.t = h225ReasonCode; releaseComplete->reason.t = h225ReasonCode;
/* Add user-user ie */ /* 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 = q931msg->userInfo->h323_uu_pdu.h323_message_body.t =
T_H225H323_UU_PDU_h323_message_body_releaseComplete; T_H225H323_UU_PDU_h323_message_body_releaseComplete;