xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: find pkg not work

Browse source
This commit is contained in:
riolurs 2023-10-22 22:42:10 +08:00 committed by wwqgtxx
parent a883faae9d
commit 7d58238e06
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
component/process/patch.go
View file

@ -10,6 +10,5 @@ func FindPackageName(metadata *constant.Metadata) (string, error) {
if resolver := DefaultPackageNameResolver; resolver != nil { if resolver := DefaultPackageNameResolver; resolver != nil {
return resolver(metadata) return resolver(metadata)
} }
return "", ErrPlatformNotSupport return "", ErrPlatformNotSupport
} }

9
tunnel/tunnel.go
View file

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"net" "net"
"net/netip" "net/netip"
"path/filepath"
"runtime" "runtime"
"sync" "sync"
"time" "time"
@ -621,16 +620,14 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
} }
if !findProcessMode.Off() && !processFound && (findProcessMode.Always() || rule.ShouldFindProcess()) { if !findProcessMode.Off() && !processFound && (findProcessMode.Always() || rule.ShouldFindProcess()) {
uid, path, err := P.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, int(metadata.SrcPort)) pkg, err := P.FindPackageName(metadata)
if err != nil { if err != nil {
log.Debugln("[Process] find process %s: %v", metadata.String(), err) log.Debugln("[Process] find process %s: %v", metadata.String(), err)
} else { } else {
metadata.Process = filepath.Base(path) metadata.Process = pkg
metadata.ProcessPath = path
metadata.Uid = uid
processFound = true processFound = true
if procesCache != metadata.Process { if procesCache != metadata.Process {
log.Debugln("[Process] %s from process %s", metadata.String(), path) log.Debugln("[Process] %s from process %s", metadata.String(), metadata.Process)
} }
procesCache = metadata.Process procesCache = metadata.Process
} }