nfqws2: fix wrong op priority

This commit is contained in:
bol-van
2026-04-25 18:55:36 +03:00
parent aa226e6e7a
commit 5aefa8610b
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1212,8 +1212,8 @@ static bool play_prolog(
return false; return false;
ps->bReverseFixed = ps->bReverse ^ params.server; ps->bReverseFixed = ps->bReverse ^ params.server;
setup_direction(dis, ps->bReverseFixed, &ps->src, &ps->dst, &ps->sdip4, &ps->sdip6, &ps->sdport); setup_direction(dis, ps->bReverseFixed, &ps->src, &ps->dst, &ps->sdip4, &ps->sdip6, &ps->sdport);
#ifdef HAS_FILTER_SSID
ifname = ps->bReverseFixed ? ifin : ifout; ifname = ps->bReverseFixed ? ifin : ifout;
#ifdef HAS_FILTER_SSID
ps->ssid = wlan_ssid_search_ifname(ifname); ps->ssid = wlan_ssid_search_ifname(ifname);
if (ps->ssid) DLOG("found ssid for %s : %s\n", ifname, ps->ssid); if (ps->ssid) DLOG("found ssid for %s : %s\n", ifname, ps->ssid);
#endif #endif
@@ -1248,8 +1248,8 @@ static bool play_prolog(
// in absence of conntrack guess direction by presence of interface names. won't work on BSD // in absence of conntrack guess direction by presence of interface names. won't work on BSD
ps->bReverseFixed = ps->ctrack ? (ps->bReverse ^ params.server) : (ps->bReverse = ifin && *ifin && (!ifout || !*ifout)); ps->bReverseFixed = ps->ctrack ? (ps->bReverse ^ params.server) : (ps->bReverse = ifin && *ifin && (!ifout || !*ifout));
setup_direction(dis, ps->bReverseFixed, &ps->src, &ps->dst, &ps->sdip4, &ps->sdip6, &ps->sdport); setup_direction(dis, ps->bReverseFixed, &ps->src, &ps->dst, &ps->sdip4, &ps->sdip6, &ps->sdport);
#ifdef HAS_FILTER_SSID
ifname = ps->bReverseFixed ? ifin : ifout; ifname = ps->bReverseFixed ? ifin : ifout;
#ifdef HAS_FILTER_SSID
ps->ssid = wlan_ssid_search_ifname(ifname); ps->ssid = wlan_ssid_search_ifname(ifname);
if (ps->ssid) DLOG("found ssid for %s : %s\n", ifname, ps->ssid); if (ps->ssid) DLOG("found ssid for %s : %s\n", ifname, ps->ssid);
#endif #endif
+1 -1
View File
@@ -2083,7 +2083,7 @@ bool lua_reconstruct_iphdr(lua_State *L, int idx, struct ip *ip, size_t *len)
{ {
if (lopt>40 || ((sizeof(struct ip) + ((lopt+3)&~3)) > *len)) goto err; if (lopt>40 || ((sizeof(struct ip) + ((lopt+3)&~3)) > *len)) goto err;
memcpy(ip+1,p,lopt); memcpy(ip+1,p,lopt);
memset(((uint8_t*)ip) + sizeof(struct ip) + lopt, 0, (4-lopt&3)&3); memset(((uint8_t*)ip) + sizeof(struct ip) + lopt, 0, (4-(lopt&3))&3);
lopt = (lopt+3) & ~3; lopt = (lopt+3) & ~3;
} }
} }