diff --git a/lua/zapret-antidpi.lua b/lua/zapret-antidpi.lua index ea1c885..4255d56 100644 --- a/lua/zapret-antidpi.lua +++ b/lua/zapret-antidpi.lua @@ -125,7 +125,7 @@ function http_domcase(ctx, desync) local host_range = resolve_multi_pos(desync.dis.payload,desync.l7payload,"host,endhost") if #host_range == 2 then local host = string.sub(desync.dis.payload,host_range[1],host_range[2]-1) - local newhost="", i + local newhost="" for i = 1, #host do newhost=newhost..((i%2)==0 and string.lower(string.sub(host,i,i)) or string.upper(string.sub(host,i,i))) end @@ -221,7 +221,7 @@ function http_unixeol(ctx, desync) if #http < #desync.dis.payload then hdis.headers[idx_ua].value = hdis.headers[idx_ua].value .. string.rep(" ", #desync.dis.payload - #http) end - local http = http_reconstruct_req(hdis, true) + http = http_reconstruct_req(hdis, true) if #http==#desync.dis.payload then desync.dis.payload = http DLOG("http_unixeol: applied") @@ -939,7 +939,7 @@ function fakeddisorder(ctx, desync) if b_debug then DLOG("fakeddisorder: resolved split pos: "..tostring(pos-1)) end -- do not apply fooling to original parts except tcp_ts_up but apply ip_id - local fake, part, pat + local fake, part local opts_orig = {rawsend = rawsend_opts_base(desync), reconstruct = {}, ipfrag = {}, ipid = desync.arg, fooling = {tcp_ts_up = desync.arg.tcp_ts_up}} local opts_fake = {rawsend = rawsend_opts(desync), reconstruct = reconstruct_opts(desync), ipfrag = {}, ipid = desync.arg, fooling = desync.arg} diff --git a/lua/zapret-auto.lua b/lua/zapret-auto.lua index fe9bc09..2714771 100644 --- a/lua/zapret-auto.lua +++ b/lua/zapret-auto.lua @@ -313,7 +313,7 @@ function circular(ctx, desync) local function count_strategies(hrec) if not hrec.ctstrategy then local uniq={} - local n=0 + local n for i,instance in pairs(desync.plan) do if instance.arg.strategy then n = tonumber(instance.arg.strategy) diff --git a/lua/zapret-lib.lua b/lua/zapret-lib.lua index 560c38a..a625aba 100644 --- a/lua/zapret-lib.lua +++ b/lua/zapret-lib.lua @@ -644,7 +644,7 @@ function parse_tcp_flags(s) local s_upper = string.upper(s) for flag in string.gmatch(s_upper, "[^,]+") do if flags[flag] then - f = bitor(f,flags[flag]) + f = bitor(f,flags[flag]) else error("tcp flag '"..flag.."' is invalid") end @@ -1566,11 +1566,11 @@ function tls_client_hello_mod(tls, options) table.insert(tdis.handshake[TLS_HANDSHAKE_TYPE_CLIENT].dis.ext[idx_sni].dis.list, { name = options.sni_last, type = options.sni_snt_new } ) end end - local tls = tls_reconstruct(tdis) - if not tls then + local rtls = tls_reconstruct(tdis) + if not rtls then DLOG_ERR("tls_client_hello_mod: reconstruct error") end - return tls + return rtls end -- checks if filename is gzip compressed @@ -1659,7 +1659,7 @@ function readfile(filename) if not f then error("readfile: "..err) end - local s,err = f:read("*a") + local s, err = f:read("*a") f:close() if err then error("readfile: "..err) @@ -1677,7 +1677,7 @@ function writefile(filename, data) if not f then error("writefile: "..err) end - local s,err = f:write(data) + local s, err = f:write(data) f:close() if not s then error("writefile: "..err) @@ -1697,7 +1697,7 @@ function http_dissect_header(header) end -- make table with structured http header representation function http_dissect_headers(http, pos) - local eol,pnext,header,value,idx,headers,pos_endheader,pos_startvalue,pos_headers_end + local eol,pnext,header,value,headers,pos_endheader,pos_startvalue,pos_headers_end headers={} while pos do eol,pnext = find_next_line(http,pos) @@ -2261,7 +2261,8 @@ function tls_dissect_ext(ext) return left, off end - local dis={}, off, len, left + local dis={} + local off, len, left ext.dis = nil diff --git a/lua/zapret-tests.lua b/lua/zapret-tests.lua index ddda913..b16d3bc 100644 --- a/lua/zapret-tests.lua +++ b/lua/zapret-tests.lua @@ -119,7 +119,7 @@ function test_aes() print("* aes") local clear_text="test "..brandom_az09(11) - local iv, key, encrypted, decrypted + local encrypted, decrypted for key_size=16,32,8 do local key = brandom(key_size) @@ -507,7 +507,7 @@ end function test_dissect() print("* dissect") - local dis, raw1, raw2 + local raw1, raw2 for i=1,20 do print("* dissect test "..tostring(i)) @@ -611,7 +611,7 @@ function test_dissect() }, payload = brandom(math.random(0, 20)) } - + raw1 = reconstruct_dissect(ip6_udp) print("IP6+UDP : "..string2hex(raw1)) dis1 = dissect(raw1) @@ -772,11 +772,6 @@ function test_csum() uh_ulen = UDP_BASE_LEN + #payload } - ip.ip_p = IPPROTO_UDP - ip4b = reconstruct_iphdr(ip) - ip6.ip6_plen = packet_len({ip6=ip6,udp=udp,payload=payload}) - IP6_BASE_LEN - ip6b = reconstruct_ip6hdr(ip6, {ip6_last_proto=IPPROTO_UDP}) - udpb = reconstruct_udphdr(udp) raw = bu16(udp.uh_sport) .. bu16(udp.uh_dport) .. @@ -787,6 +782,7 @@ function test_csum() raw = reconstruct_dissect({ip=ip, udp=udp, payload=payload}) dis1 = dissect(raw) + ip.ip_p = IPPROTO_UDP ip.ip_len = IP_BASE_LEN + #ip.options + #udpb + #payload ip4b = reconstruct_iphdr(ip) udpb = csum_udp_fix(ip4b,udpb,payload) @@ -794,6 +790,8 @@ function test_csum() print( dis1.udp.uh_sum==dis2.udp.uh_sum and "UDP+IP4 CSUM OK" or "UDP+IP4 CSUM FAILED" ) test_assert(dis1.udp.uh_sum==dis2.udp.uh_sum) + ip6.ip6_plen = packet_len({ip6=ip6,udp=udp,payload=payload}) - IP6_BASE_LEN + ip6b = reconstruct_ip6hdr(ip6, {ip6_last_proto=IPPROTO_UDP}) raw = reconstruct_dissect({ip6=ip6, udp=udp, payload=payload}) dis1 = dissect(raw) udpb = csum_udp_fix(ip6b,udpb,payload) @@ -949,7 +947,6 @@ function test_rawsend(opts) end local ip, ip6, udp, dis, ddis, raw_ip, raw_udp, raw local payload = brandom(math.random(100,1200)) - local b local target for ifname,ifinfo in pairs(get_ifaddrs()) do @@ -997,7 +994,6 @@ function test_rawsend(opts) print("send ipv4 udp using pure rawsend without dissect") test_assert(rawsend_print(raw, {repeats=5})) - local target for ifname,ifinfo in pairs(get_ifaddrs()) do for k,v in pairs(ifinfo.addr) do if #v.addr==16 and (string.sub(v.addr,1,1)=="\xFC" or string.sub(v.addr,1,1)=="\xFD") then @@ -1083,7 +1079,7 @@ function test_rawsend(opts) print("send ipv6 icmp") test_assert(rawsend_dissect_print(dis, {fwmark = 0x8E10, repeats=3})) - local ip2 = { + ip2 = { ip_tos = 0, ip_id = math.random(0,0xFFFF), ip_off = 0,