status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #42 from libpcp/master 

PCP fixes
This commit is contained in:
Thomas BERNARD 2013-07-30 04:34:27 -07:00
parent 98fcc3c757 4bdec457a2
commit 940b36b94b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miniupnpd/pcpserver.c
View File

@ -833,7 +833,7 @@ static void CreatePCPMap(pcp_info_t *pcp_msg_info)
if(r==0) {
if((strncmp(pcp_msg_info->senderaddrstr, iaddr_old,
sizeof(iaddr_old))!=0)
sizeof(iaddr_old))!=0)
|| (pcp_msg_info->int_port != iport_old)) {
/* redirection already existing */
if (pcp_msg_info->pfailure_present) {
@ -843,14 +843,19 @@ static void CreatePCPMap(pcp_info_t *pcp_msg_info)
} else {
if (_upnp_delete_redir(pcp_msg_info->ext_port,
pcp_msg_info->protocol)==0) {
return;
break;
}
}
pcp_msg_info->ext_port++;
}
} while (r==0);
if (pcp_msg_info->ext_port == 0) {
if ((pcp_msg_info->ext_port == 0) ||
(IN6_IS_ADDR_V4MAPPED(pcp_msg_info->int_ip) &&
(!check_upnp_rule_against_permissions(upnppermlist,
num_upnpperm, pcp_msg_info->ext_port,
((struct in_addr*)pcp_msg_info->int_ip->s6_addr)[3],
pcp_msg_info->int_port)))) {
pcp_msg_info->result_code = PCP_ERR_CANNOT_PROVIDE_EXTERNAL;
return;
}