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

chore: change C.PacketAdapter from a struct to an interface

Browse Source
This commit is contained in:
wwqgtxx
2022-12-04 14:37:52 +08:00
parent 4f75201a98
commit 6fc62da7ae
32 changed files with 267 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
listener/socks/tcp.go
View File

@ -13,11 +13,11 @@ import (
)
type Listener struct {
listener net.Listener
addr string
closed bool
preferRulesName string
name string
listener net.Listener
addr string
closed bool
preferRulesName string
name string
}
// RawAddress implements C.Listener
@ -37,19 +37,19 @@ func (l *Listener) Close() error {
}
func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
return NewWithInfos(addr,"DEFAULT-SOCKS","",in)
return NewWithInfos(addr, "DEFAULT-SOCKS", "", in)
}
func NewWithInfos(addr,name,preferRulesName string, in chan<- C.ConnContext) (*Listener, error) {
func NewWithInfos(addr, name, preferRulesName string, in chan<- C.ConnContext) (*Listener, error) {
l, err := inbound.Listen("tcp", addr)
if err != nil {
return nil, err
}
sl := &Listener{
listener: l,
addr: addr,
name: name,
listener: l,
addr: addr,
name: name,
preferRulesName: preferRulesName,
}
go func() {
@ -61,14 +61,14 @@ func NewWithInfos(addr,name,preferRulesName string, in chan<- C.ConnContext) (*L
}
continue
}
go handleSocks(sl.name,sl.preferRulesName,c, in)
go handleSocks(sl.name, sl.preferRulesName, c, in)
}
}()
return sl, nil
}
func handleSocks(name,preferRulesName string,conn net.Conn, in chan<- C.ConnContext) {
func handleSocks(name, preferRulesName string, conn net.Conn, in chan<- C.ConnContext) {
conn.(*net.TCPConn).SetKeepAlive(true)
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
@ -79,24 +79,24 @@ func handleSocks(name,preferRulesName string,conn net.Conn, in chan<- C.ConnCont
switch head[0] {
case socks4.Version:
HandleSocks4(name,preferRulesName,bufConn, in)
HandleSocks4(name, preferRulesName, bufConn, in)
case socks5.Version:
HandleSocks5(name,preferRulesName,bufConn, in)
HandleSocks5(name, preferRulesName, bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(name,preferRulesName string, conn net.Conn, in chan<- C.ConnContext) {
func HandleSocks4(name, preferRulesName string, conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
in <- inbound.NewSocketWithInfos(socks5.ParseAddr(addr), conn, C.SOCKS4,name,preferRulesName)
in <- inbound.NewSocketWithInfos(socks5.ParseAddr(addr), conn, C.SOCKS4, name, preferRulesName)
}
func HandleSocks5(name,preferRulesName string,conn net.Conn, in chan<- C.ConnContext) {
func HandleSocks5(name, preferRulesName string, conn net.Conn, in chan<- C.ConnContext) {
target, command, err := socks5.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
@ -107,5 +107,5 @@ func HandleSocks5(name,preferRulesName string,conn net.Conn, in chan<- C.ConnCon
io.Copy(io.Discard, conn)
return
}
in <- inbound.NewSocketWithInfos(target, conn, C.SOCKS5,name,preferRulesName)
in <- inbound.NewSocketWithInfos(target, conn, C.SOCKS5, name, preferRulesName)
}

26
listener/socks/udp.go
View File

@ -12,10 +12,10 @@ import (
)
type UDPListener struct {
packetConn net.PacketConn
addr string
closed bool
name string
packetConn net.PacketConn
addr string
closed bool
name string
preferRulesName string
}
@ -35,11 +35,11 @@ func (l *UDPListener) Close() error {
return l.packetConn.Close()
}
func NewUDP(addr string, in chan<- *C.PacketAdapter) (*UDPListener, error) {
return NewUDPWithInfos(addr,"DEFAULT-SOCKS","",in)
func NewUDP(addr string, in chan<- C.PacketAdapter) (*UDPListener, error) {
return NewUDPWithInfos(addr, "DEFAULT-SOCKS", "", in)
}
func NewUDPWithInfos(addr,name ,preferRulesName string, in chan<- *C.PacketAdapter) (*UDPListener, error) {
func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- C.PacketAdapter) (*UDPListener, error) {
l, err := net.ListenPacket("udp", addr)
if err != nil {
return nil, err
@ -50,10 +50,10 @@ func NewUDPWithInfos(addr,name ,preferRulesName string, in chan<- *C.PacketAdapt
}
sl := &UDPListener{
packetConn: l,
addr: addr,
packetConn: l,
addr: addr,
preferRulesName: preferRulesName,
name: name,
name: name,
}
go func() {
for {
@ -66,14 +66,14 @@ func NewUDPWithInfos(addr,name ,preferRulesName string, in chan<- *C.PacketAdapt
}
continue
}
handleSocksUDP(sl.name,sl.preferRulesName,l, in, buf[:n], remoteAddr)
handleSocksUDP(sl.name, sl.preferRulesName, l, in, buf[:n], remoteAddr)
}
}()
return sl, nil
}
func handleSocksUDP(name,preferRulesName string,pc net.PacketConn, in chan<- *C.PacketAdapter, buf []byte, addr net.Addr) {
func handleSocksUDP(name, preferRulesName string, pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, addr net.Addr) {
target, payload, err := socks5.DecodeUDPPacket(buf)
if err != nil {
// Unresolved UDP packet, return buffer to the pool
@ -87,7 +87,7 @@ func handleSocksUDP(name,preferRulesName string,pc net.PacketConn, in chan<- *C.
bufRef: buf,
}
select {
case in <- inbound.NewPacketWithInfos(target, packet, C.SOCKS5,name,preferRulesName):
case in <- inbound.NewPacketWithInfos(target, packet, C.SOCKS5, name, preferRulesName):
default:
}
}