gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-20 08:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

zapret-lib: fix seq number substraction

Browse Source
This commit is contained in:
bol-van
2025-12-05 22:31:51 +03:00
parent 0c2abab6a9
commit fd1eac2ef1
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lua/zapret-lib.lua
View File

@@ -85,7 +85,7 @@ function apply_execution_plan(desync, plan)
desync.arg = deepcopy(plan.arg)
apply_arg_prefix(desync.arg)
end
-- produce resulting verdict from 2 verdict
-- produce resulting verdict from 2 verdicts
function verdict_aggregate(v1, v2)
local v
v1 = v1 or VERDICT_PASS
@@ -142,7 +142,7 @@ function pos_get(desync, mode)
elseif mode=='b' then
return desync.outgoing and desync.track.pbcounter_orig or desync.track.pbcounter_reply
elseif mode=='s' and desync.track.tcp then
return desync.outgoing and (desync.track.tcp.seq - desync.track.tcp.seq0) or (desync.track.tcp.ack - desync.track.tcp.ack0)
return desync.outgoing and u32add(desync.track.tcp.seq, -desync.track.tcp.seq0) or u32add(desync.track.tcp.ack, -desync.track.tcp.ack0)
end
end
return 0
@@ -1032,6 +1032,11 @@ function genhost(len, template)
end
end
-- return hostname if present or ip address in text form otherwise
function host_or_ip(desync)
return desync.hostname or (desync.dis.ip and ntop(desync.dis.ip) or desync.dis.ip6 and ntop(desync.dis.ip6))
end
function is_absolute_path(path)
if string.sub(path,1,1)=='/' then return true end
local un = uname()