him411/UA3F
1
0
Fork 0
mirror of https://github.com/SunBK201/UA3F.git synced 2025-12-19 02:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: accept empty tcp payload in first check

Browse Source
This commit is contained in:
SunBK201 2025-11-22 23:11:47 +08:00
parent f697c9f67f
commit 83235a79ff
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/internal/rewrite/packet.go
View File

@ -117,11 +117,6 @@ func (r *Rewriter) RewritePacketUserAgent(payload []byte, srcAddr, dstAddr strin
// RewriteTCP rewrites the TCP packet's User-Agent if applicable // RewriteTCP rewrites the TCP packet's User-Agent if applicable
func (r *Rewriter) RewriteTCP(tcp *layers.TCP, srcAddr, dstAddr string) *RewriteResult { func (r *Rewriter) RewriteTCP(tcp *layers.TCP, srcAddr, dstAddr string) *RewriteResult {
if len(tcp.Payload) == 0 {
log.LogDebugWithAddr(srcAddr, dstAddr, "TCP payload is empty")
return &RewriteResult{Modified: false}
}
hasUA, modified := r.RewritePacketUserAgent(tcp.Payload, srcAddr, dstAddr) hasUA, modified := r.RewritePacketUserAgent(tcp.Payload, srcAddr, dstAddr)
return &RewriteResult{ return &RewriteResult{
Modified: modified, Modified: modified,

3
src/internal/server/nfqueue/nfqueue_linux.go
View File

@ -73,7 +73,7 @@ func (s *Server) Close() (err error) {
// handlePacket processes a single NFQUEUE packet // handlePacket processes a single NFQUEUE packet
func (s *Server) handlePacket(packet *netfilter.Packet) { func (s *Server) handlePacket(packet *netfilter.Packet) {
if s.Cfg.RewriteMode == config.RewriteModeDirect || packet.TCP == nil { if s.Cfg.RewriteMode == config.RewriteModeDirect || packet.TCP == nil || len(packet.TCP.Payload) == 0 {
_ = s.nfqServer.Nf.SetVerdict(*packet.A.PacketID, nfq.NfAccept) _ = s.nfqServer.Nf.SetVerdict(*packet.A.PacketID, nfq.NfAccept)
return return
} }
@ -154,6 +154,7 @@ func (s *Server) getNextMark(packet *netfilter.Packet, result *rewrite.RewriteRe
} }
if mark == s.SniffCtMarkUpper { if mark == s.SniffCtMarkUpper {
slog.Debug("Connmark reached upper limit, marking as NotHTTP", slog.String("SrcAddr", packet.SrcAddr), slog.String("DstAddr", packet.DstAddr))
s.Cache.Add(packet.DstAddr, struct{}{}) s.Cache.Add(packet.DstAddr, struct{}{})
return true, s.NotHTTPCtMark return true, s.NotHTTPCtMark
} }