[asterisk-commits] may: branch 12 r408331 - in /branches/12: ./ addons/ooh323c/src/

[SVN commits to the Asterisk project]

Author: may
Date: Wed Feb 19 06:00:27 2014
New Revision: 408331

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408331
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/addons/ooh323c/src/ooCapability.c
    branches/12/addons/ooh323c/src/ooh245.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/addons/ooh323c/src/ooCapability.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/addons/ooh323c/src/ooCapability.c?view=diff&rev=408331&r1=408330&r2=408331
==============================================================================
--- branches/12/addons/ooh323c/src/ooCapability.c (original)
+++ branches/12/addons/ooh323c/src/ooCapability.c Wed Feb 19 06:00:27 2014
@@ -2940,6 +2940,22 @@
       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) &&

Modified: branches/12/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/addons/ooh323c/src/ooh245.c?view=diff&rev=408331&r1=408330&r2=408331
==============================================================================
--- branches/12/addons/ooh323c/src/ooh245.c (original)
+++ branches/12/addons/ooh323c/src/ooh245.c Wed Feb 19 06:00:27 2014
@@ -713,8 +713,8 @@
          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 @@
          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);