CN-JS-HuiBai/SingboxForPanel
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve process searcher

Browse Source
This commit is contained in:
世界
2022-08-20 10:38:12 +08:00
parent 0377a11719
commit 84e4677a94
16 changed files with 77 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/process/searcher_android.go
View File

@@ -17,22 +17,22 @@ func NewSearcher(config Config) (Searcher, error) {
return &androidSearcher{config.PackageManager}, nil
}
func (s *androidSearcher) FindProcessInfo(ctx context.Context, network string, srcIP netip.Addr, srcPort int) (*Info, error) {
_, uid, err := resolveSocketByNetlink(network, srcIP, srcPort)
func (s *androidSearcher) FindProcessInfo(ctx context.Context, network string, source netip.AddrPort, destination netip.AddrPort) (*Info, error) {
socket, err := resolveSocketByNetlink(network, source, destination)
if err != nil {
return nil, err
}
if sharedPackage, loaded := s.packageManager.SharedPackageByID(uint32(uid)); loaded {
if sharedPackage, loaded := s.packageManager.SharedPackageByID(socket.UID); loaded {
return &Info{
UserId: uid,
UserId: int32(socket.UID),
PackageName: sharedPackage,
}, nil
}
if packageName, loaded := s.packageManager.PackageByID(uint32(uid)); loaded {
if packageName, loaded := s.packageManager.PackageByID(socket.UID); loaded {
return &Info{
UserId: uid,
UserId: int32(socket.UID),
PackageName: packageName,
}, nil
}
return &Info{UserId: uid}, nil
return &Info{UserId: int32(socket.UID)}, nil
}