2dust
e7a141c7da
Return an error when destination IP or port is missing before attempting to find the owning process (getConnectionOwnerUid only works for established connections). Also standardize error/panic messages to use a consistent "processFinder" prefix. Small defensive/recovery tweaks to avoid resolving unestablished connections.
53 lines
2.1 KiB
Go
53 lines
2.1 KiB
Go
package libv2ray
|
|
|
|
import (
|
|
"fmt"
|
|
corenet "github.com/xtls/xray-core/common/net"
|
|
)
|
|
|
|
// ProcessFinder is an interface for Android process finding functionality.
|
|
// Apps using AndroidLibXrayLite should implement FindProcessByConnection()
|
|
// and pass the implementation to RegisterProcessFinder() before starting the core.
|
|
type ProcessFinder interface {
|
|
// FindProcessByConnection finds the UID of the process that owns the given connection.
|
|
//
|
|
// network: Protocol type: "tcp" or "udp"
|
|
// srcIP: Source IP address
|
|
// srcPort: Source port
|
|
// destIP: Destination IP address
|
|
// destPort: Destination port
|
|
// Returns the UID of the owning process, or -1 if not found.
|
|
FindProcessByConnection(network, srcIP string, srcPort int, destIP string, destPort int) int
|
|
}
|
|
|
|
// RegisterProcessFinder registers an Android process finder with Xray-core,
|
|
// enabling per-app routing based on UID. Must be called before starting the
|
|
// core for process-based routing rules to work.
|
|
// Pass nil to unregister a previously registered finder.
|
|
func (x *CoreController) RegisterProcessFinder(finder ProcessFinder) {
|
|
if finder == nil {
|
|
corenet.RegisterAndroidProcessFinder(nil)
|
|
return
|
|
}
|
|
|
|
corenet.RegisterAndroidProcessFinder(func(network, srcIP string, srcPort uint16, destIP string, destPort uint16) (uid int, name string, path string, err error) {
|
|
// getConnectionOwnerUid only works for established connections,
|
|
// so if dest is missing, it likely means the connection is not fully established yet.
|
|
// In that case, we can return an error to indicate that the process cannot be determined at this time.
|
|
if destPort == 0 || destIP == "" {
|
|
return 0, "", "", fmt.Errorf("processFinder, no dest for %s %s:%d", network, srcIP, srcPort)
|
|
}
|
|
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
uid, name, path, err = 0, "", "", fmt.Errorf("processFinder panic: %v", r)
|
|
}
|
|
}()
|
|
uid = finder.FindProcessByConnection(network, srcIP, int(srcPort), destIP, int(destPort))
|
|
if uid < 0 {
|
|
return 0, "", "", fmt.Errorf("processFinder, not found for %s %s:%d -> %s:%d", network, srcIP, srcPort, destIP, destPort)
|
|
}
|
|
return uid, fmt.Sprintf("%d", uid), "", nil
|
|
})
|
|
}
|