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

nftpinhole.c: update_pinhole() uses strchr() instead of strsep

This commit is contained in:
Thomas Bernard 2023-11-26 00:18:43 +01:00
parent c3f1a2cb30
commit 358f430924
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miniupnpd/netfilter_nft/nftpinhole.c
View File

@ -207,6 +207,7 @@ delete_pinhole(unsigned short uid)
strncpy(tmp_label, p->desc, sizeof(tmp_label)); strncpy(tmp_label, p->desc, sizeof(tmp_label));
tmp_label[sizeof(tmp_label) - 1] = '\0'; tmp_label[sizeof(tmp_label) - 1] = '\0';
strtok(tmp_label, " "); strtok(tmp_label, " ");
/* compare the uid value */
if (0 == strcmp(tmp_label, label_start)) { if (0 == strcmp(tmp_label, label_start)) {
r = rule_del_handle(p); r = rule_del_handle(p);
nft_send_rule(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER); nft_send_rule(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER);
@ -261,6 +262,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
strtok(tmp_label, " "); strtok(tmp_label, " ");
/* check for the right uid */ /* check for the right uid */
if (0 == strcmp(tmp_label, label_start)) { if (0 == strcmp(tmp_label, label_start)) {
char *pd;
/* Source IP Address */ /* Source IP Address */
// Check if empty // Check if empty
if (0 == memcmp(&rhost_addr, &p->saddr6, sizeof(struct in6_addr))) { if (0 == memcmp(&rhost_addr, &p->saddr6, sizeof(struct in6_addr))) {
@ -288,10 +290,11 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
ext_if_indx = p->ingress_ifidx; ext_if_indx = p->ingress_ifidx;
if_indextoname(ext_if_indx, ifname); if_indextoname(ext_if_indx, ifname);
tmp_p = tmp_label; pd = strchr(p->desc, ':');
strsep(&tmp_p, " "); if (pd) {
if (tmp_p) { pd += 2;
strncpy(desc, tmp_p, NFT_DESCR_SIZE); strncpy(desc, pd, sizeof(desc));
desc[sizeof(desc) - 1] = '\0';
} else { } else {
desc[0] = '\0'; desc[0] = '\0';
} }