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

chore: 调整uid系统判断位置

Browse source
This commit is contained in:
Skyxim 2022-05-29 18:12:43 +08:00
parent 067c02aba1
commit c7355510a2
4 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rule/common/uid.go
View file

@ -1,10 +1,12 @@
package common
import (
"fmt"
"github.com/Dreamacro/clash/common/utils"
"github.com/Dreamacro/clash/component/process"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/log"
"runtime"
"strconv"
"strings"
)
@ -20,6 +22,9 @@ func NewUid(oUid, adapter string) (*Uid, error) {
//if len(_uids) > 28 {
// return nil, fmt.Errorf("%s, too many uid to use, maximum support 28 uid", errPayload.Error())
//}
if !(runtime.GOOS == "linux" || runtime.GOOS == "android") {
return nil, fmt.Errorf("uid rule not support this platform")
}
var uidRange []utils.Range[int32]
for _, u := range strings.Split(oUid, "/") {

7
rule/logic/common.go
View file

@ -11,7 +11,6 @@ import (
"net/http"
"os"
"regexp"
"runtime"
"strings"
)
@ -106,11 +105,7 @@ func parseRule(tp, payload string, params []string) (C.Rule, error) {
noResolve := RC.HasNoResolve(params)
parsed, parseErr = provider.NewRuleSet(payload, "", noResolve)
case "UID":
if runtime.GOOS == "linux" || runtime.GOOS == "android" {
parsed, parseErr = RC.NewUid(payload, "")
} else {
parseErr = fmt.Errorf("uid rule not support this platform")
}
parsed, parseErr = RC.NewUid(payload, "")
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, "")
case "NOT":

7
rule/parser.go
View file

@ -6,7 +6,6 @@ import (
RC "github.com/Dreamacro/clash/rule/common"
"github.com/Dreamacro/clash/rule/logic"
RP "github.com/Dreamacro/clash/rule/provider"
"runtime"
)
func ParseRule(tp, payload, target string, params []string) (C.Rule, error) {
@ -43,11 +42,7 @@ func ParseRule(tp, payload, target string, params []string) (C.Rule, error) {
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, target)
case "UID":
if runtime.GOOS == "linux" || runtime.GOOS == "android" {
parsed, parseErr = RC.NewUid(payload, target)
} else {
parseErr = fmt.Errorf("uid rule not support this platform")
}
parsed, parseErr = RC.NewUid(payload, target)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
case "AND":

7
rule/provider/parse.go
View file

@ -7,7 +7,6 @@ import (
C "github.com/Dreamacro/clash/constant"
P "github.com/Dreamacro/clash/constant/provider"
RC "github.com/Dreamacro/clash/rule/common"
"runtime"
"time"
)
@ -86,11 +85,7 @@ func parseRule(tp, payload, target string, params []string) (C.Rule, error) {
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, target)
case "UID":
if runtime.GOOS == "linux" || runtime.GOOS == "android" {
parsed, parseErr = RC.NewUid(payload, target)
} else {
parseErr = fmt.Errorf("uid rule not support this platform")
}
parsed, parseErr = RC.NewUid(payload, target)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
default: