From 5470c0d9a245ac68fc70567854d66c81d238bed2 Mon Sep 17 00:00:00 2001 From: Torrey Searle Date: Tue, 3 Oct 2017 22:16:49 +0200 Subject: contrib/thirdparty/sip_to_pjsip: add additional flag mappings add mappings for udptl redundancy, rtptimeout, and debug flags Change-Id: Ie73cf5c83c05dee01eb9624ede76c1a30225d73a --- contrib/scripts/sip_to_pjsip/sip_to_pjsip.py | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py index 98a5e9546..eb3aab3b8 100755 --- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py +++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py @@ -116,6 +116,27 @@ def set_dtmfmode(key, val, section, pjsip, nmapped): set_value(key, 'none', section, pjsip, nmapped) +def setup_udptl(section, pjsip, nmapped): + """Sets values from udptl into the appropriate pjsip.conf options.""" + try: + val = sip.get(section, 't38pt_udptl')[0] + except LookupError: + try: + val = sip.get('general', 't38pt_udptl')[0] + except LookupError: + return + + ec = 'none' + if 'yes' in val: + set_value('t38_udptl', 'yes', section, pjsip, nmapped) + if 'no' in val: + set_value('t38_udptl', 'no', section, pjsip, nmapped) + if 'redundancy' in val: + ec = 'redundancy' + if 'fec' in val: + ec = 'fec' + set_value('t38_udptl_ec', ec, section, pjsip, nmapped) + def from_nat(key, val, section, pjsip, nmapped): """Sets values from nat into the appropriate pjsip.conf options.""" # nat from sip.conf can be comma separated list of values: @@ -387,6 +408,7 @@ peer_map = [ ['allow', merge_value], ['nat', from_nat], # rtp_symmetric, force_rport, # rewrite_contact + ['rtptimeout', set_value('rtp_timeout')], ['icesupport', set_value('ice_support')], ['autoframing', set_value('use_ptime')], ['outboundproxy', set_value('outbound_proxy')], @@ -1068,6 +1090,7 @@ def map_peer(sip, section, pjsip, nmapped): except LookupError: pass # key not found in sip.conf + setup_udptl(section, pjsip, nmapped) def find_non_mapped(sections, nmapped): """ @@ -1101,6 +1124,13 @@ def map_system(sip, pjsip, nmapped): except LookupError: pass + + try: + sipdebug = sip.get('general', 'sipdebug')[0] + set_value('debug', sipdebug, 'global', pjsip, nmapped, 'global') + except LookupError: + pass + try: useroption_parsing = sip.get('general', 'legacy_useroption_parsing')[0] set_value('ignore_uri_user_options', useroption_parsing, 'global', pjsip, nmapped, 'global') -- cgit v1.2.3