summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAlexander Traud <pabstraud@compuserve.com>2016-08-18 15:11:02 +0200
committerAlexander Traud <pabstraud@compuserve.com>2016-08-18 08:25:56 -0500
commitcbc1b2d020fbafbfee1da0adb81ecdfefad6cffb (patch)
tree2d8c2f8ff7bf6aa7f1ff786fc72d6561acaede62 /contrib
parent56e0aed17758b1cad338e84c5457824cee874d95 (diff)
sip_to_pjsip: Map externhost/ip to Transports.
When using the migration script sip_to_pjsip.py, the externhost or externip of sip.conf were erroneously written to Endpoints instead to Transports. ASTERISK-22374 Change-Id: I2c5873386cfc388899fa9cf2368639dd12f1b8e4
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 890921673..bf4553090 100755
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
@@ -383,8 +383,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
@@ -598,6 +596,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:
@@ -645,6 +645,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:
@@ -789,6 +791,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: