kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

sip_to_pjsip: Map externhost/ip to Transports.

Browse Source 
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
This commit is contained in:
Alexander Traud
2016-08-18 15:11:02 +02:00
parent b35779c6c6
commit c0e0075718
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
View File

@@ -383,8 +383,6 @@ peer_map = [
['session-timers', set_timers], # timers ['session-timers', set_timers], # timers
['session-minse', set_value('timers_min_se')], ['session-minse', set_value('timers_min_se')],
['session-expires', set_value('timers_sess_expires')], ['session-expires', set_value('timers_sess_expires')],
['externip', set_value('external_media_address')],
['externhost', set_value('external_media_address')],
# identify_by ? # identify_by ?
['directmedia', set_direct_media], # direct_media ['directmedia', set_direct_media], # direct_media
# direct_media_method # direct_media_method
@@ -598,6 +596,8 @@ def create_udp(sip, pjsip, nmapped):
extern_addr = sip.multi_get('general', ['externaddr', 'externip', extern_addr = sip.multi_get('general', ['externaddr', 'externip',
'externhost'])[0] 'externhost'])[0]
host, port = split_hostport(extern_addr) 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, set_value('external_signaling_address', host, 'transport-udp', pjsip,
nmapped, 'transport') nmapped, 'transport')
if port: if port:
@@ -645,6 +645,8 @@ def create_tcp(sip, pjsip, nmapped):
tcpport = sip.get('general', 'externtcpport')[0] tcpport = sip.get('general', 'externtcpport')[0]
except: except:
tcpport = port tcpport = port
set_value('external_media_address', host, 'transport-tcp', pjsip,
nmapped, 'transport')
set_value('external_signaling_address', host, 'transport-tcp', pjsip, set_value('external_signaling_address', host, 'transport-tcp', pjsip,
nmapped, 'transport') nmapped, 'transport')
if tcpport: if tcpport:
@@ -789,6 +791,8 @@ def create_tls(sip, pjsip, nmapped):
tlsport = sip.get('general', 'externtlsport')[0] tlsport = sip.get('general', 'externtlsport')[0]
except: except:
tlsport = port tlsport = port
set_value('external_media_address', host, 'transport-tls', pjsip,
nmapped, 'transport')
set_value('external_signaling_address', host, 'transport-tls', pjsip, set_value('external_signaling_address', host, 'transport-tls', pjsip,
nmapped, 'transport') nmapped, 'transport')
if tlsport: if tlsport: