history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correct C.Metadata

Browse Source
This commit is contained in:
wwqgtxx
2022-12-04 22:08:20 +08:00
parent 62226e8b3d
commit 62474e0ed6
23 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
listener/tproxy/tproxy.go
View File

@ -9,11 +9,11 @@ import (
)
type Listener struct {
listener net.Listener
addr string
closed bool
name string
preferRulesName string
listener net.Listener
addr string
closed bool
name string
specialRules string
}
// RawAddress implements C.Listener
@ -32,17 +32,17 @@ func (l *Listener) Close() error {
return l.listener.Close()
}
func (l *Listener) handleTProxy(name, preferRulesName string, conn net.Conn, in chan<- C.ConnContext) {
func (l *Listener) handleTProxy(name, specialRules string, conn net.Conn, in chan<- C.ConnContext) {
target := socks5.ParseAddrToSocksAddr(conn.LocalAddr())
conn.(*net.TCPConn).SetKeepAlive(true)
in <- inbound.NewSocketWithInfos(target, conn, C.TPROXY, name, preferRulesName)
in <- inbound.NewSocketWithInfos(target, conn, C.TPROXY, name, specialRules)
}
func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
return NewWithInfos(addr, "DEFAULT-TPROXY", "", in)
}
func NewWithInfos(addr, name, preferRulesName string, in chan<- C.ConnContext) (*Listener, error) {
func NewWithInfos(addr, name, specialRules string, in chan<- C.ConnContext) (*Listener, error) {
l, err := net.Listen("tcp", addr)
if err != nil {
return nil, err
@ -60,10 +60,10 @@ func NewWithInfos(addr, name, preferRulesName string, in chan<- C.ConnContext) (
}
rl := &Listener{
listener: l,
addr: addr,
name: name,
preferRulesName: preferRulesName,
listener: l,
addr: addr,
name: name,
specialRules: specialRules,
}
go func() {
@ -75,7 +75,7 @@ func NewWithInfos(addr, name, preferRulesName string, in chan<- C.ConnContext) (
}
continue
}
go rl.handleTProxy(rl.name, rl.preferRulesName, c, in)
go rl.handleTProxy(rl.name, rl.specialRules, c, in)
}
}()

18
listener/tproxy/udp.go
View File

@ -11,11 +11,11 @@ import (
)
type UDPListener struct {
packetConn net.PacketConn
addr string
closed bool
name string
preferRulesName string
packetConn net.PacketConn
addr string
closed bool
name string
specialRules string
}
// RawAddress implements C.Listener
@ -38,7 +38,7 @@ func NewUDP(addr string, in chan<- C.PacketAdapter) (*UDPListener, error) {
return NewUDPWithInfos(addr, "DEFAULT-TPROXY", "", in)
}
func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- C.PacketAdapter) (*UDPListener, error) {
func NewUDPWithInfos(addr, name, specialRules string, in chan<- C.PacketAdapter) (*UDPListener, error) {
l, err := net.ListenPacket("udp", addr)
if err != nil {
return nil, err
@ -83,14 +83,14 @@ func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- C.PacketAdapt
// try to unmap 4in6 address
lAddr = netip.AddrPortFrom(lAddr.Addr().Unmap(), lAddr.Port())
}
handlePacketConn(rl.name, rl.preferRulesName, l, in, buf[:n], lAddr, rAddr)
handlePacketConn(rl.name, rl.specialRules, l, in, buf[:n], lAddr, rAddr)
}
}()
return rl, nil
}
func handlePacketConn(name, preferRulesName string, pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, lAddr, rAddr netip.AddrPort) {
func handlePacketConn(name, specialRules string, pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, lAddr, rAddr netip.AddrPort) {
target := socks5.AddrFromStdAddrPort(rAddr)
pkt := &packet{
pc: pc,
@ -98,7 +98,7 @@ func handlePacketConn(name, preferRulesName string, pc net.PacketConn, in chan<-
buf: buf,
}
select {
case in <- inbound.NewPacketWithInfos(target, pkt, C.TPROXY, name, preferRulesName):
case in <- inbound.NewPacketWithInfos(target, pkt, C.TPROXY, name, specialRules):
default:
}
}