[asterisk-commits] mmichelson: branch mmichelson/conversion_script r397709 - /team/mmichelson/co...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Aug 27 10:45:51 2013
New Revision: 397709

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397709
Log:
Fix DTMF mode setting to allow for rfc2833 to map to rfc4733 for pjsip.conf


Modified:
    team/mmichelson/conversion_script/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py

Modified: team/mmichelson/conversion_script/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/conversion_script/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py?view=diff&rev=397709&r1=397708&r2=397709
==============================================================================
--- team/mmichelson/conversion_script/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py (original)
+++ team/mmichelson/conversion_script/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py Tue Aug 27 10:45:51 2013
@@ -92,11 +92,14 @@
     """Sets the dtmfmode value.  If value matches allowable option in pjsip
        then map it, otherwise set it to none.
     """
-    # available pjsip.conf values: frc4733, inband, info, none
-    if val != 'inband' or val != 'info':
+    # available pjsip.conf values: rfc4733, inband, info, none
+    if val == 'inband' or val == 'info':
+        set_value(key, val, section, pjsip, nmapped)
+    elif val == 'rfc2833':
+        set_value(key, 'rfc4733', section, pjsip, nmapped)
+    else:
         nmapped(section, key, val + " ; did not fully map - set to none")
-        val = 'none'
-    set_value(key, val, section, pjsip, nmapped)
+        set_value(key, 'none', section, pjsip, nmapped)
 
 def from_nat(key, val, section, pjsip, nmapped):
     """Sets values from nat into the appropriate pjsip.conf options."""