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

Merge branch 'dev' of https://github.com/Dreamacro/clash into Alpha

Browse Source
This commit is contained in:
wwqgtxx
2022-11-12 20:43:48 +08:00
parent 75d339392b de264c42a8
commit dc3e144b6a
51 changed files with 641 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tunnel/tunnel.go
View File

@ -276,9 +276,15 @@ func handleUDPConn(packet *inbound.PacketAdapter) {
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())
log.Warnln(
"[UDP] dial %s %s --> %s error: %s",
proxy.Name(),
metadata.SourceAddress(),
metadata.RemoteAddress(),
err.Error(),
)
} else {
log.Warnln("[UDP] dial %s (match %s/%s) to %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.RemoteAddress(), err.Error())
log.Warnln("[UDP] dial %s (match %s/%s) %s --> %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.SourceAddress(), metadata.RemoteAddress(), err.Error())
}
return
}
@ -351,7 +357,13 @@ func handleTCPConn(connCtx C.ConnContext) {
remoteConn, err := proxy.DialContext(ctx, dialMetadata)
if err != nil {
if rule == nil {
log.Warnln("[TCP] dial %s to %s error: %s", proxy.Name(), metadata.RemoteAddress(), err.Error())
log.Warnln(
"[TCP] dial %s %s --> %s error: %s",
proxy.Name(),
metadata.SourceAddress(),
metadata.RemoteAddress(),
err.Error(),
)
} else {
log.Warnln("[TCP] dial %s (match %s(%s)) to %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.RemoteAddress(), err.Error())
}
@ -375,7 +387,11 @@ func handleTCPConn(connCtx C.ConnContext) {
case mode == Direct:
log.Infoln("[TCP] %s --> %s using DIRECT", metadata.SourceDetail(), metadata.RemoteAddress())
default:
log.Infoln("[TCP] %s --> %s doesn't match any rule using DIRECT", metadata.SourceAddress(), metadata.RemoteAddress())
log.Infoln(
"[TCP] %s --> %s doesn't match any rule using DIRECT",
metadata.SourceAddress(),
metadata.RemoteAddress(),
)
}
handleSocket(connCtx, remoteConn)
@ -422,9 +438,7 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
} else {
metadata.Process = filepath.Base(path)
metadata.ProcessPath = path
if uid != -1 {
metadata.Uid = &uid
}
metadata.Uid = uid
processFound = true
}
}