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

nftpinhole.c: fix get_pinhole_info() and log inet_ntop() errors

This commit is contained in:
Thomas Bernard 2023-11-25 23:46:07 +01:00
parent 90fb7801eb
commit 215091b546
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miniupnpd/netfilter_nft/nftpinhole.c
View File

@ -265,7 +265,9 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
raddr[1] = '\0';
} else {
rhost_addr_p = &p->saddr6;
inet_ntop(AF_INET6, rhost_addr_p, raddr, INET6_ADDRSTRLEN);
if (inet_ntop(AF_INET6, rhost_addr_p, raddr, INET6_ADDRSTRLEN) == NULL) {
syslog(LOG_WARNING, "%s: inet_ntop(raddr): %m", "update_pinhole");
}
}
/* Source Port */
@ -356,10 +358,13 @@ get_pinhole_info(unsigned short uid,
strtok(tmp_label, " ");
if (0 == strcmp(tmp_label, label_start)) {
/* Source IP Address */
if (rem_host && (rem_host[0] != '\0')) {
if(inet_ntop(AF_INET6, &p->saddr6, rem_host, rem_hostlen) == NULL)
if (rem_host) {
if(inet_ntop(AF_INET6, &p->saddr6, rem_host, rem_hostlen) == NULL) {
syslog(LOG_ERR, "%s: inet_ntop(rem_host): %m",
"get_pinhole_info");
return -1;
}
}
/* Source Port */
if (rem_port)
@ -367,9 +372,12 @@ get_pinhole_info(unsigned short uid,
/* Destination IP Address */
if (int_client) {
if(inet_ntop(AF_INET6, &p->daddr6, int_client, int_clientlen) == NULL)
if(inet_ntop(AF_INET6, &p->daddr6, int_client, int_clientlen) == NULL) {
syslog(LOG_ERR, "%s: inet_ntop(rem_host): %m",
"get_pinhole_info");
return -1;
}
}
/* Destination Port */
if (int_port)