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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Sep 11 13:53:26 2013
New Revision: 398833

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398833
Log:
Fix bugs in outboundproxy and dtlsenable settings.


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=398833&r1=398832&r2=398833
==============================================================================
--- 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 Wed Sep 11 13:53:26 2013
@@ -305,6 +305,9 @@
     if val == '32':
         set_value('srtp_tag_32', 'yes', section, pjsip, nmapped)
 
+def from_dtlsenable(key, val, section, pjsip, nmapped):
+    if val == 'yes':
+        set_value('media_encryption', 'dtls', section, pjsip, nmapped)
 
 ###############################################################################
 
@@ -371,7 +374,7 @@
     ['secret',             setup_auth],
     ['md5secret',          setup_auth],
     ['type',               setup_ident],
-    ['dtlsenable',         set_value('media_encryption', 'dtls')],
+    ['dtlsenable',         from_dtlsenable],
     ['dtlsverify',         set_value],
     ['dtlsrekey',          set_value],
     ['dtlscertfile',       set_value],
@@ -882,8 +885,8 @@
         set_value('server_uri', server_uri, section, pjsip, nmapped,
                   'registration')
 
-        if self.outboundproxy:
-            set_value('outboundproxy', self.outboundproxy, section, pjsip,
+        if self.outbound_proxy:
+            set_value('outboundproxy', self.outbound_proxy, section, pjsip,
                       nmapped, 'registartion')