mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	Merge "sip_to_pjsip: Parse register even with transport." into 13
This commit is contained in:
		| @@ -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): | ||||
|         """ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user