463da578dd
* fixes #512: geo download failed when startup - 启动阶段，executor还未初始化tunnel，tcpIn==nil导致geo下载失败,阻塞在 tcpIn <- context * chore: handled by the upper layer * chore: remove useless parameters --------- Co-authored-by: Skyxim <noreply@skyxim.dev>
49 lines
1.2 KiB
Go
49 lines
1.2 KiB
Go
package inbound
|
|
|
|
import (
|
|
"net"
|
|
"net/netip"
|
|
|
|
C "github.com/Dreamacro/clash/constant"
|
|
"github.com/Dreamacro/clash/context"
|
|
"github.com/Dreamacro/clash/transport/socks5"
|
|
)
|
|
|
|
// NewSocket receive TCP inbound and return ConnContext
|
|
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type, additions ...Addition) *context.ConnContext {
|
|
metadata := parseSocksAddr(target)
|
|
metadata.NetWork = C.TCP
|
|
metadata.Type = source
|
|
for _, addition := range additions {
|
|
addition.Apply(metadata)
|
|
}
|
|
|
|
if ip, port, err := parseAddr(conn.RemoteAddr()); err == nil {
|
|
metadata.SrcIP = ip
|
|
metadata.SrcPort = port
|
|
}
|
|
if ip, port, err := parseAddr(conn.LocalAddr()); err == nil {
|
|
metadata.InIP = ip
|
|
metadata.InPort = port
|
|
}
|
|
|
|
return context.NewConnContext(conn, metadata)
|
|
}
|
|
|
|
func NewInner(conn net.Conn, address string) *context.ConnContext {
|
|
metadata := &C.Metadata{}
|
|
metadata.NetWork = C.TCP
|
|
metadata.Type = C.INNER
|
|
metadata.DNSMode = C.DNSNormal
|
|
metadata.Process = C.ClashName
|
|
if h, port, err := net.SplitHostPort(address); err == nil {
|
|
metadata.DstPort = port
|
|
if ip, err := netip.ParseAddr(h); err == nil {
|
|
metadata.DstIP = ip
|
|
} else {
|
|
metadata.Host = h
|
|
}
|
|
}
|
|
|
|
return context.NewConnContext(conn, metadata)
|
|
}
|