summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-08-19 17:54:50 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-08-19 17:54:50 -0500
commit283f809be135cb8047a1da5a3b63b891f3004ab2 (patch)
tree2617916deb6283793915c2bc6cd0d4330037fea8 /contrib
parent4474bc5d318873c854c185a02f792293b74544d7 (diff)
parent32fa73d108076782418380c00764b9c8a5a61d6c (diff)
Merge "sip_to_pjsip: Map externhost/ip to Transports." into 14
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/scripts/sip_to_pjsip/sip_to_pjsip.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
index ac5aa6cc1..ee01edfa2 100755
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
@@ -388,8 +388,6 @@ peer_map = [
['session-timers', set_timers], # timers
['session-minse', set_value('timers_min_se')],
['session-expires', set_value('timers_sess_expires')],
- ['externip', set_value('external_media_address')],
- ['externhost', set_value('external_media_address')],
# identify_by ?
['directmedia', set_direct_media], # direct_media
# direct_media_method
@@ -592,6 +590,8 @@ def create_udp(sip, pjsip, nmapped):
extern_addr = sip.multi_get('general', ['externaddr', 'externip',
'externhost'])[0]
host, port = split_hostport(extern_addr)
+ set_value('external_media_address', host, 'transport-udp', pjsip,
+ nmapped, 'transport')
set_value('external_signaling_address', host, 'transport-udp', pjsip,
nmapped, 'transport')
if port:
@@ -639,6 +639,8 @@ def create_tcp(sip, pjsip, nmapped):
tcpport = sip.get('general', 'externtcpport')[0]
except:
tcpport = port
+ set_value('external_media_address', host, 'transport-tcp', pjsip,
+ nmapped, 'transport')
set_value('external_signaling_address', host, 'transport-tcp', pjsip,
nmapped, 'transport')
if tcpport:
@@ -808,6 +810,8 @@ def create_tls(sip, pjsip, nmapped):
tlsport = sip.get('general', 'externtlsport')[0]
except:
tlsport = port
+ set_value('external_media_address', host, 'transport-tls', pjsip,
+ nmapped, 'transport')
set_value('external_signaling_address', host, 'transport-tls', pjsip,
nmapped, 'transport')
if tlsport: