status-im/miniupnp
2
0
Fork 0
mirror of https://github.com/status-im/miniupnp.git synced 2025-01-27 22:54:54 +00:00
Code Issues Projects Releases Wiki Activity

fix tickets

Browse Source 
see https://github.com/miniupnp/miniupnp/pull/671#issuecomment-2160247176
This commit is contained in:
Thomas Bernard 2024-06-13 01:33:50 +02:00
parent 2be63c9572
commit 622d28fd37
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
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/pf/obsdrdr.c
View File

@ -1144,6 +1144,7 @@ priv_delete_redirect_rule_check_desc(const char * ifname, unsigned short eport,
syslog(LOG_ERR, "pfctl_get_rules_info: %m");
return -1;
}
pr.ticket = ri.ticket;
n = ri.nr;
#else /* USE_LIBPFCTL */
if(ioctl(dev, DIOCGETRULES, &pr) < 0)
@ -1413,13 +1414,13 @@ get_redirect_rule_by_index(int index,
{
int n, r;
unsigned int tnum;
struct pfioc_rule pr;
#ifdef USE_LIBPFCTL
struct pfctl_rules_info ri;
struct pfctl_rule rule;
#define RULE (rule)
char anchor_call[MAXPATHLEN] = "";
#else /* USE_LIBPFCTL */
struct pfioc_rule pr;
#define RULE (pr.rule)
#endif /* USE_LIBPFCTL */
#ifndef PF_NEWSTYLE
@ -1450,11 +1451,11 @@ get_redirect_rule_by_index(int index,
return -1;
}
n = pr.nr;
#endif /* USE_LIBPFCTL */
r = -1;
#ifdef PF_RELEASETICKETS
tnum = pr.ticket;
#endif /* PF_RELEASETICKETS */
#endif /* USE_LIBPFCTL */
r = -1;
if(index >= n)
goto error;
#ifdef USE_LIBPFCTL
@ -1506,7 +1507,11 @@ get_redirect_rule_by_index(int index,
strlcpy(pp.anchor, anchor_name, MAXPATHLEN);
pp.r_action = PF_RDR;
pp.r_num = index;
#ifdef USE_LIBPFCTL
pp.ticket = ri.ticket;
#else /* USE_LIBPFCTL */
pp.ticket = pr.ticket;
#endif /* USE_LIBPFCTL */
if(ioctl(dev, DIOCGETADDRS, &pp) < 0)
{
syslog(LOG_ERR, "ioctl(dev, DIOCGETADDRS, ...): %m");