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

Merge from remote branch

Browse Source
This commit is contained in:
yaling888
2021-10-28 11:36:11 +08:00
parent 2953772a0e ebbc9604ce
commit 2680e8ffa3
86 changed files with 1065 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tunnel/mode.go
View File

@ -8,14 +8,12 @@ import (
type TunnelMode int
var (
// ModeMapping is a mapping for Mode enum
ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
)
// ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
const (
Global TunnelMode = iota

34
tunnel/tunnel.go
View File

@ -1,6 +1,7 @@
package tunnel
import (
"context"
"fmt"
"net"
"runtime"
@ -12,7 +13,7 @@ import (
"github.com/Dreamacro/clash/component/resolver"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/constant/provider"
"github.com/Dreamacro/clash/context"
icontext "github.com/Dreamacro/clash/context"
"github.com/Dreamacro/clash/log"
R "github.com/Dreamacro/clash/rule"
"github.com/Dreamacro/clash/tunnel/statistic"
@ -100,8 +101,8 @@ func processUDP() {
func process() {
numUDPWorkers := 4
if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num
}
for i := 0; i < numUDPWorkers; i++ {
go processUDP()
@ -135,8 +136,10 @@ func preHandleMetadata(metadata *C.Metadata) error {
if exist {
metadata.Host = host
metadata.AddrType = C.AtypDomainName
metadata.DNSMode = C.DNSMapping
if resolver.FakeIPEnabled() {
metadata.DstIP = nil
metadata.DNSMode = C.DNSFakeIP
} else if node := resolver.DefaultHosts.Search(host); node != nil {
// redir-host should lookup the hosts
metadata.DstIP = node.Data.(net.IP)
@ -212,14 +215,16 @@ func handleUDPConn(packet *inbound.PacketAdapter) {
cond.Broadcast()
}()
ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata)
pCtx := icontext.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(pCtx, metadata)
if err != nil {
log.Warnln("[UDP] Parse metadata failed: %s", err.Error())
return
}
rawPc, err := proxy.DialUDP(metadata)
ctx, cancel := context.WithTimeout(context.Background(), C.DefaultUDPTimeout)
defer cancel()
rawPc, err := proxy.ListenPacketContext(ctx, metadata.Pure())
if err != nil {
if rule == nil {
log.Warnln("[UDP] dial %s to %s error: %s", proxy.Name(), metadata.RemoteAddress(), err.Error())
@ -228,7 +233,7 @@ func handleUDPConn(packet *inbound.PacketAdapter) {
}
return
}
ctx.InjectPacketConn(rawPc)
pCtx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule)
switch true {
@ -249,10 +254,10 @@ func handleUDPConn(packet *inbound.PacketAdapter) {
}()
}
func handleTCPConn(ctx C.ConnContext) {
defer ctx.Conn().Close()
func handleTCPConn(connCtx C.ConnContext) {
defer connCtx.Conn().Close()
metadata := ctx.Metadata()
metadata := connCtx.Metadata()
if !metadata.Valid() {
log.Warnln("[Metadata] not valid: %#v", metadata)
return
@ -263,13 +268,15 @@ func handleTCPConn(ctx C.ConnContext) {
return
}
proxy, rule, err := resolveMetadata(ctx, metadata)
proxy, rule, err := resolveMetadata(connCtx, metadata)
if err != nil {
log.Warnln("[Metadata] parse failed: %s", err.Error())
return
}
remoteConn, err := proxy.Dial(metadata)
ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTCPTimeout)
defer cancel()
remoteConn, err := proxy.DialContext(ctx, metadata.Pure())
if err != nil {
if rule == nil {
log.Warnln("[TCP] dial %s to %s error: %s", proxy.Name(), metadata.RemoteAddress(), err.Error())
@ -292,7 +299,7 @@ func handleTCPConn(ctx C.ConnContext) {
log.Infoln("[TCP] %s(%s) --> %s doesn't match any rule using DIRECT", metadata.SourceAddress(), metadata.Process, metadata.RemoteAddress())
}
handleSocket(ctx, remoteConn)
handleSocket(connCtx, remoteConn)
}
func shouldResolveIP(rule C.Rule, metadata *C.Metadata) bool {
@ -352,6 +359,5 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
}
}
//return proxies["DIRECT"], nil, nil
return proxies["REJECT"], nil, nil
}