Merge "contrib/thirdparty/sip_to_pjsip: add additional flag mappings"

This commit is contained in:
Jenkins2 2017-10-10 12:51:42 -05:00 committed by Gerrit Code Review
commit 65366a435e
1 changed files with 30 additions and 0 deletions

View File

@ -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')