process receiveAndTransmit user input remote caps instead of receive only

send receiveAndTransmit user input our caps instead of receive only
........

Merged revisions 408328 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 408330 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 408331 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@408332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alexandr Anikin
2014-02-19 12:04:32 +00:00
parent ac62244288
commit 98ace4b0c6
2 changed files with 20 additions and 4 deletions

View File

@@ -2940,6 +2940,22 @@ int ooCapabilityUpdateJointCapabilities
break; break;
case T_H245Capability_receiveAndTransmitUserInputCapability:
if((cap->u.receiveAndTransmitUserInputCapability->t ==
T_H245UserInputCapability_basicString) &&
(call->dtmfmode & OO_CAP_DTMF_H245_alphanumeric))
{
call->jointDtmfMode |= OO_CAP_DTMF_H245_alphanumeric;
return OO_OK;
}
else if((cap->u.receiveAndTransmitUserInputCapability->t ==
T_H245UserInputCapability_dtmf) &&
(call->dtmfmode & OO_CAP_DTMF_H245_signal))
{
call->jointDtmfMode |= OO_CAP_DTMF_H245_signal;
return OO_OK;
}
case T_H245Capability_receiveUserInputCapability: case T_H245Capability_receiveUserInputCapability:
if((cap->u.receiveUserInputCapability->t == if((cap->u.receiveUserInputCapability->t ==
T_H245UserInputCapability_basicString) && T_H245UserInputCapability_basicString) &&

View File

@@ -713,8 +713,8 @@ int ooSendTermCapMsg(OOH323CallData *call)
memset(entry, 0, sizeof(H245CapabilityTableEntry)); memset(entry, 0, sizeof(H245CapabilityTableEntry));
entry->m.capabilityPresent = 1; entry->m.capabilityPresent = 1;
entry->capability.t = T_H245Capability_receiveUserInputCapability; entry->capability.t = T_H245Capability_receiveAndTransmitUserInputCapability;
entry->capability.u.receiveUserInputCapability = userInputCap; entry->capability.u.receiveAndTransmitUserInputCapability = userInputCap;
entry->capabilityTableEntryNumber = i+1; entry->capabilityTableEntryNumber = i+1;
dListAppend(pctxt , &(termCap->capabilityTable), entry); dListAppend(pctxt , &(termCap->capabilityTable), entry);
@@ -749,8 +749,8 @@ int ooSendTermCapMsg(OOH323CallData *call)
memset(entry, 0, sizeof(H245CapabilityTableEntry)); memset(entry, 0, sizeof(H245CapabilityTableEntry));
entry->m.capabilityPresent = 1; entry->m.capabilityPresent = 1;
entry->capability.t = T_H245Capability_receiveUserInputCapability; entry->capability.t = T_H245Capability_receiveAndTransmitUserInputCapability;
entry->capability.u.receiveUserInputCapability = userInputCap; entry->capability.u.receiveAndTransmitUserInputCapability = userInputCap;
entry->capabilityTableEntryNumber = i+1; entry->capabilityTableEntryNumber = i+1;
dListAppend(pctxt , &(termCap->capabilityTable), entry); dListAppend(pctxt , &(termCap->capabilityTable), entry);