icybear/omv-dijiang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge upstream & solve conflict

Browse Source
This commit is contained in:
n3t1zen
2026-05-04 17:33:44 +08:00
parent 5703fbc2fb
commit cd4766679d
5 changed files with 266 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
works/patch/route/route.go.patch
+6 -23
View File
@@ -1,27 +1,10 @@
--- a/route/route.go
+++ b/route/route.go
@@ -421,19 +421,19 @@
} else {
if processInfo.ProcessPath != "" {
if processInfo.UserName != "" {
- r.logger.InfoContext(ctx, "found process path: ", processInfo.ProcessPath, ", user: ", processInfo.UserName)
+ r.logger.DebugContext(ctx, "found process path: ", processInfo.ProcessPath, ", user: ", processInfo.UserName) // OMV: info -> debug
} else if processInfo.UserId != -1 {
- r.logger.InfoContext(ctx, "found process path: ", processInfo.ProcessPath, ", user id: ", processInfo.UserId)
+ r.logger.DebugContext(ctx, "found process path: ", processInfo.ProcessPath, ", user id: ", processInfo.UserId) // OMV: info -> debug
} else {
- r.logger.InfoContext(ctx, "found process path: ", processInfo.ProcessPath)
+ r.logger.DebugContext(ctx, "found process path: ", processInfo.ProcessPath) // OMV: info -> debug
}
} else if processInfo.AndroidPackageName != "" {
r.logger.InfoContext(ctx, "found package name: ", processInfo.AndroidPackageName)
} else if processInfo.UserId != -1 {
if processInfo.UserName != "" {
- r.logger.InfoContext(ctx, "found user: ", processInfo.UserName)
+ r.logger.DebugContext(ctx, "found user: ", processInfo.UserName) // OMV: info -> debug
} else {
- r.logger.InfoContext(ctx, "found user id: ", processInfo.UserId)
+ r.logger.DebugContext(ctx, "found user id: ", processInfo.UserId) // OMV: info -> debug
@@ -372,6 +372,7 @@
}
}
metadata.ProcessInfo = processInfo
} else {
+ // OMV: some codes about process routing are deleted here for unknown reason, it may break something.
for _, address := range metadata.DestinationAddresses {
if address.Is6() {
newDestination = address