From 8c234f205dea3d00967c39d9ace545a9d2318ee6 Mon Sep 17 00:00:00 2001 From: Alexandr Anikin Date: Wed, 19 Feb 2014 11:30:25 +0000 Subject: [PATCH] process receiveAndTransmit user input remote caps instead of receive only send receiveAndTransmit user input our caps instead of receive only git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@408328 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- addons/ooh323c/src/ooCapability.c | 16 ++++++++++++++++ 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 f3b8c50502..5c77af5a8e 100644 --- a/addons/ooh323c/src/ooCapability.c +++ b/addons/ooh323c/src/ooCapability.c @@ -2936,6 +2936,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 b3e637406f..a3202486b5 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);