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

Merge remote branch

Browse Source
This commit is contained in:
yaling888
2021-10-21 22:37:30 +08:00
parent 63d07db4bf a7aea12aa6
commit 4b614090f8
97 changed files with 1147 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tunnel/tunnel.go
View File

@ -1,6 +1,7 @@
package tunnel
import (
"context"
"fmt"
"net"
"runtime"
@ -13,7 +14,7 @@ import (
S "github.com/Dreamacro/clash/component/script"
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"
@ -136,8 +137,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)
@ -215,14 +218,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())
@ -231,7 +236,7 @@ func handleUDPConn(packet *inbound.PacketAdapter) {
}
return
}
ctx.InjectPacketConn(rawPc)
pCtx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule)
switch true {
@ -254,10 +259,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
@ -268,13 +273,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())
@ -299,7 +306,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 {
@ -359,7 +366,6 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
}
}
//return proxies["DIRECT"], nil, nil
return proxies["REJECT"], nil, nil
}
@ -376,7 +382,6 @@ func matchScript(metadata *C.Metadata) (C.Proxy, error) {
preProcessCacheFinder.Match(metadata)
adapter, err := S.CallPyMainFunction(metadata)
if err != nil {
return nil, err
}