kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "sip_to_pjsip: Parse register even with transport." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-08-18 11:50:11 -05:00
committed by Gerrit Code Review
parent e3d72c7aee 60275359bc
commit 43254c2db7
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -926,6 +926,17 @@ class Registration:
the right of the user, then finish by using rpartition calls to remove
everything to the left of the user.
"""
self.peer = ''
self.protocol = 'udp'
protocols = ['udp', 'tcp', 'tls']
for protocol in protocols:
position = user_part.find(protocol + '://')
if -1 < position:
post_transport = user_part[position + 6:]
self.peer, sep, self.protocol = user_part[:position + 3].rpartition('?')
user_part = post_transport
break
colons = user_part.count(':')
if (colons == 3):
# :domainport:secret:authuser
@@ -946,11 +957,7 @@ class Registration:
# Invalid setting
raise
pre_domain, sep, self.domain = pre_auth.partition('@')
self.peer, sep, post_peer = pre_domain.rpartition('?')
transport, sep, self.user = post_peer.rpartition('://')
self.protocol = transport if transport else 'udp'
self.user, sep, self.domain = pre_auth.partition('@')
def write(self, pjsip, nmapped):
"""