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

pcpserver.c: rewrite DeletePCPMap() to work with netfilter_nft 

try to fix #611
This commit is contained in:
Thomas Bernard 2022-07-01 07:15:36 +02:00
parent 16366f5db4
commit b8d66c5f7c
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
miniupnpd/pcpserver.c
View File

@ -1095,57 +1095,66 @@ static void DeletePCPMap(pcp_info_t *pcp_msg_info)
int r=-1;
/* remove the mapping */
/* remove all the mappings for this client */
int index;
unsigned short eport2, iport2;
char iaddr2[INET6_ADDRSTRLEN];
int proto2;
char desc[64];
unsigned int timestamp;
#ifdef ENABLE_UPNPPINHOLE
int uid = -1;
#endif /* ENABLE_UPNPPINHOLE */
syslog(LOG_DEBUG, "is_fw=%d addr=%s iport=%hu proto=%d",
pcp_msg_info->is_fw, pcp_msg_info->mapped_str, iport, (int)proto);
/* iterate through all rules and delete the requested ones */
for (index = 0 ;
(!pcp_msg_info->is_fw &&
get_redirect_rule_by_index(index, 0,
if (!pcp_msg_info->is_fw) {
int index;
/* iterate through all rules and delete the requested ones */
for (index = 0;
get_redirect_rule_by_index(index, 0,
&eport2, iaddr2, sizeof(iaddr2),
&iport2, &proto2,
desc, sizeof(desc),
0, 0, &timestamp, 0, 0) >= 0)
0, 0, &timestamp, 0, 0) >= 0;
index++) {
syslog(LOG_DEBUG, "%d: %s %hu %d", index, iaddr2, iport2, proto2);
if(0 == strcmp(iaddr2, pcp_msg_info->mapped_str)
&& (proto2==proto)
&& ((iport2==iport) || (iport==0))) {
if(0 != strcmp(desc, pcp_msg_info->desc)) {
/* nonce does not match */
pcp_msg_info->result_code = PCP_ERR_NOT_AUTHORIZED;
syslog(LOG_ERR, "Unauthorized to remove PCP mapping internal port %hu, protocol %s",
iport, (pcp_msg_info->protocol == IPPROTO_TCP)?"TCP":"UDP");
return;
} else {
r = _upnp_delete_redir(eport2, proto2);
}
break;
}
}
} else {
#ifdef ENABLE_UPNPPINHOLE
||
(pcp_msg_info->is_fw &&
(uid=upnp_get_pinhole_uid_by_index(index))>=0 &&
upnp_get_pinhole_info((unsigned short)uid,
NULL, 0, NULL,
iaddr2, sizeof(iaddr2), &iport2,
&proto2, desc, sizeof(desc),
&timestamp, NULL) >= 0)
#endif /* ENABLE_UPNPPINHOLE */
;
index++) {
syslog(LOG_DEBUG, "%d: %s %hu %d", index, iaddr2, iport2, proto2);
if(0 == strcmp(iaddr2, pcp_msg_info->mapped_str)
&& (proto2==proto)
&& ((iport2==iport) || (iport==0))) {
int uid;
uid = upnp_find_inboundpinhole(NULL, 0,
pcp_msg_info->mapped_str, iport,
pcp_msg_info->protocol,
desc, sizeof(desc),
NULL /* lifetime */);
if (uid < 0) {
syslog(LOG_ERR, "Failed to find mapping to %s:%hu, protocol %s",
pcp_msg_info->mapped_str, iport, (pcp_msg_info->protocol == IPPROTO_TCP)?"TCP":"UDP");
return;
} else {
if(0 != strcmp(desc, pcp_msg_info->desc)) {
/* nonce does not match */
pcp_msg_info->result_code = PCP_ERR_NOT_AUTHORIZED;
syslog(LOG_ERR, "Unauthorized to remove PCP mapping internal port %hu, protocol %s",
iport, (pcp_msg_info->protocol == IPPROTO_TCP)?"TCP":"UDP");
return;
} else if (!pcp_msg_info->is_fw) {
r = _upnp_delete_redir(eport2, proto2);
} else {
#ifdef ENABLE_UPNPPINHOLE
r = upnp_delete_inboundpinhole(uid);
#endif /* ENABLE_UPNPPINHOLE */
}
break;
}
#else
syslog(LOG_WARN, "ENABLE_UPNPPINHOLE was not enabled at compile time");
#endif /* ENABLE_UPNPPINHOLE */
}
if (r >= 0) {
syslog(LOG_INFO, "PCP: %s port %hu mapping removed",