diff options
| author | Alexandr Anikin <may@telecom-service.ru> | 2014-02-19 12:04:32 +0000 |
|---|---|---|
| committer | Alexandr Anikin <may@telecom-service.ru> | 2014-02-19 12:04:32 +0000 |
| commit | 98ace4b0c6e635143289801c2e6d2746d5e1d6c5 (patch) | |
| tree | 7845b94474382c7a81b93ab71ce210c7b6bf17a2 | |
| parent | ac622442885a26551711bec3ec239093583833fc (diff) | |
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
| -rw-r--r-- | addons/ooh323c/src/ooCapability.c | 16 | ||||
| -rw-r--r-- | addons/ooh323c/src/ooh245.c | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c index 08607f3ed..c5b1f87e9 100644 --- a/addons/ooh323c/src/ooCapability.c +++ b/addons/ooh323c/src/ooCapability.c @@ -2940,6 +2940,22 @@ int ooCapabilityUpdateJointCapabilities 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: if((cap->u.receiveUserInputCapability->t == T_H245UserInputCapability_basicString) && diff --git a/addons/ooh323c/src/ooh245.c b/addons/ooh323c/src/ooh245.c index 3782daefc..09dd3a406 100644 --- a/addons/ooh323c/src/ooh245.c +++ b/addons/ooh323c/src/ooh245.c @@ -713,8 +713,8 @@ int ooSendTermCapMsg(OOH323CallData *call) memset(entry, 0, sizeof(H245CapabilityTableEntry)); entry->m.capabilityPresent = 1; - entry->capability.t = T_H245Capability_receiveUserInputCapability; - entry->capability.u.receiveUserInputCapability = userInputCap; + entry->capability.t = T_H245Capability_receiveAndTransmitUserInputCapability; + entry->capability.u.receiveAndTransmitUserInputCapability = userInputCap; entry->capabilityTableEntryNumber = i+1; dListAppend(pctxt , &(termCap->capabilityTable), entry); @@ -749,8 +749,8 @@ int ooSendTermCapMsg(OOH323CallData *call) memset(entry, 0, sizeof(H245CapabilityTableEntry)); entry->m.capabilityPresent = 1; - entry->capability.t = T_H245Capability_receiveUserInputCapability; - entry->capability.u.receiveUserInputCapability = userInputCap; + entry->capability.t = T_H245Capability_receiveAndTransmitUserInputCapability; + entry->capability.u.receiveAndTransmitUserInputCapability = userInputCap; entry->capabilityTableEntryNumber = i+1; dListAppend(pctxt , &(termCap->capabilityTable), entry); |