mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-14 09:48:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

refactor/fix: match dscp instead of tos (#294)

Browse Source 
Co-authored-by: dae-bot[bot] <136105375+dae-bot[bot]@users.noreply.github.com>
This commit is contained in:
mzz
2023-08-20 23:43:33 +08:00
committed by GitHub
parent 5c9e0cfa15
commit c6557ce207
16 changed files with 150 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
control/tcp.go
View File

@ -83,6 +83,7 @@ destRetrieved:
Domain: domain,
Mac: routingResult.Mac,
ProcessName: routingResult.Pname,
Dscp: routingResult.Dscp,
Src: src,
Dest: dst,
Mark: routingResult.Mark,
@ -110,6 +111,7 @@ type RouteDialParam struct {
Outbound consts.OutboundIndex
Domain string
Mac [6]uint8
Dscp uint8
ProcessName [16]uint8
Src netip.AddrPort
Dest netip.AddrPort
@ -119,9 +121,12 @@ type RouteDialParam struct {
func (c *ControlPlane) RouteDialTcp(p *RouteDialParam) (conn netproxy.Conn, err error) {
routingResult := &bpfRoutingResult{
Mark: p.Mark,
Must: 0,
Mac: p.Mac,
Outbound: uint8(p.Outbound),
Pname: p.ProcessName,
Pid: 0,
Dscp: p.Dscp,
}
outboundIndex := consts.OutboundIndex(routingResult.Outbound)
domain := p.Domain
@ -182,7 +187,7 @@ func (c *ControlPlane) RouteDialTcp(p *RouteDialParam) (conn netproxy.Conn, err
"sniffed": domain,
"ip": RefineAddrPortToShow(dst),
"pid": routingResult.Pid,
"tos": routingResult.Tos,
"dscp": routingResult.Dscp,
"pname": ProcessName2String(routingResult.Pname[:]),
"mac": Mac2String(routingResult.Mac[:]),
}).Infof("%v <-> %v", RefineSourceToShow(src, dst.Addr(), consts.LanWanFlag_NotApplicable), dialTarget)