mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
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
This commit is contained in:
@@ -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:
|
||||
|
Reference in New Issue
Block a user