diff --git a/nfq2/desync.c b/nfq2/desync.c index f3460c1..30b0d72 100644 --- a/nfq2/desync.c +++ b/nfq2/desync.c @@ -1212,8 +1212,8 @@ static bool play_prolog( return false; ps->bReverseFixed = ps->bReverse ^ params.server; setup_direction(dis, ps->bReverseFixed, &ps->src, &ps->dst, &ps->sdip4, &ps->sdip6, &ps->sdport); -#ifdef HAS_FILTER_SSID ifname = ps->bReverseFixed ? ifin : ifout; +#ifdef HAS_FILTER_SSID ps->ssid = wlan_ssid_search_ifname(ifname); if (ps->ssid) DLOG("found ssid for %s : %s\n", ifname, ps->ssid); #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 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); -#ifdef HAS_FILTER_SSID ifname = ps->bReverseFixed ? ifin : ifout; +#ifdef HAS_FILTER_SSID ps->ssid = wlan_ssid_search_ifname(ifname); if (ps->ssid) DLOG("found ssid for %s : %s\n", ifname, ps->ssid); #endif diff --git a/nfq2/lua.c b/nfq2/lua.c index a801cae..6aad541 100644 --- a/nfq2/lua.c +++ b/nfq2/lua.c @@ -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; 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; } }