mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	only attempt to do stun handling on ipv4 or ipv4 mapped to ipv6 addresses
Patch by: jkonieczny (modified) ASTERISK-18490 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@344330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -2091,7 +2091,18 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc | ||||
|  | ||||
| 	if (!(version = (seqno & 0xC0000000) >> 30)) { | ||||
| 		struct sockaddr_in addr_tmp; | ||||
| 		ast_sockaddr_to_sin(&addr, &addr_tmp); | ||||
| 		struct ast_sockaddr addr_v4; | ||||
| 		if (ast_sockaddr_is_ipv4(&addr)) { | ||||
| 			ast_sockaddr_to_sin(&addr, &addr_tmp); | ||||
| 		} else if (ast_sockaddr_ipv4_mapped(&addr, &addr_v4)) { | ||||
| 			ast_debug(1, "Using IPv6 mapped address %s for STUN\n", | ||||
| 				  ast_sockaddr_stringify(&addr)); | ||||
| 			ast_sockaddr_to_sin(&addr_v4, &addr_tmp); | ||||
| 		} else { | ||||
| 			ast_debug(1, "Cannot do STUN for non IPv4 address %s\n", | ||||
| 				  ast_sockaddr_stringify(&addr)); | ||||
| 			return &ast_null_frame; | ||||
| 		} | ||||
| 		if ((ast_stun_handle_packet(rtp->s, &addr_tmp, rtp->rawdata + AST_FRIENDLY_OFFSET, res, NULL, NULL) == AST_STUN_ACCEPT) && | ||||
| 		    ast_sockaddr_isnull(&remote_address)) { | ||||
| 			ast_sockaddr_from_sin(&addr, &addr_tmp); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user