Skip to content

Commit a3c023a

Browse files
wwqgtxxwwqgtxx
committed
chore: cleanup import path for component/process
1 parent 8b32c43 commit a3c023a

File tree

2 files changed

+77
-77
lines changed

2 files changed

+77
-77
lines changed

‎config/config.go‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/metacubex/mihomo/component/cidr"
2121
"github.com/metacubex/mihomo/component/fakeip"
2222
"github.com/metacubex/mihomo/component/geodata"
23-
P "github.com/metacubex/mihomo/component/process"
23+
"github.com/metacubex/mihomo/component/process"
2424
"github.com/metacubex/mihomo/component/resolver"
2525
"github.com/metacubex/mihomo/component/sniffer"
2626
"github.com/metacubex/mihomo/component/trie"
@@ -44,27 +44,27 @@ import (
4444
// General config
4545
type General struct {
4646
Inbound
47-
Mode T.TunnelMode `json:"mode"`
48-
UnifiedDelay bool `json:"unified-delay"`
49-
LogLevel log.LogLevel `json:"log-level"`
50-
IPv6 bool `json:"ipv6"`
51-
Interface string `json:"interface-name"`
52-
RoutingMark int `json:"routing-mark"`
53-
GeoXUrl GeoXUrl `json:"geox-url"`
54-
GeoAutoUpdate bool `json:"geo-auto-update"`
55-
GeoUpdateInterval int `json:"geo-update-interval"`
56-
GeodataMode bool `json:"geodata-mode"`
57-
GeodataLoader string `json:"geodata-loader"`
58-
GeositeMatcher string `json:"geosite-matcher"`
59-
TCPConcurrent bool `json:"tcp-concurrent"`
60-
FindProcessMode P.FindProcessMode `json:"find-process-mode"`
61-
Sniffing bool `json:"sniffing"`
62-
GlobalClientFingerprint string `json:"global-client-fingerprint"`
63-
GlobalUA string `json:"global-ua"`
64-
ETagSupport bool `json:"etag-support"`
65-
KeepAliveIdle int `json:"keep-alive-idle"`
66-
KeepAliveInterval int `json:"keep-alive-interval"`
67-
DisableKeepAlive bool `json:"disable-keep-alive"`
47+
Mode T.TunnelMode `json:"mode"`
48+
UnifiedDelay bool `json:"unified-delay"`
49+
LogLevel log.LogLevel `json:"log-level"`
50+
IPv6 bool `json:"ipv6"`
51+
Interface string `json:"interface-name"`
52+
RoutingMark int `json:"routing-mark"`
53+
GeoXUrl GeoXUrl `json:"geox-url"`
54+
GeoAutoUpdate bool `json:"geo-auto-update"`
55+
GeoUpdateInterval int `json:"geo-update-interval"`
56+
GeodataMode bool `json:"geodata-mode"`
57+
GeodataLoader string `json:"geodata-loader"`
58+
GeositeMatcher string `json:"geosite-matcher"`
59+
TCPConcurrent bool `json:"tcp-concurrent"`
60+
FindProcessMode process.FindProcessMode `json:"find-process-mode"`
61+
Sniffing bool `json:"sniffing"`
62+
GlobalClientFingerprint string `json:"global-client-fingerprint"`
63+
GlobalUA string `json:"global-ua"`
64+
ETagSupport bool `json:"etag-support"`
65+
KeepAliveIdle int `json:"keep-alive-idle"`
66+
KeepAliveInterval int `json:"keep-alive-interval"`
67+
DisableKeepAlive bool `json:"disable-keep-alive"`
6868
}
6969

7070
// Inbound config
@@ -382,51 +382,51 @@ type RawTLS struct {
382382
}
383383

384384
type RawConfig struct {
385-
Port int `yaml:"port" json:"port"`
386-
SocksPort int `yaml:"socks-port" json:"socks-port"`
387-
RedirPort int `yaml:"redir-port" json:"redir-port"`
388-
TProxyPort int `yaml:"tproxy-port" json:"tproxy-port"`
389-
MixedPort int `yaml:"mixed-port" json:"mixed-port"`
390-
ShadowSocksConfig string `yaml:"ss-config" json:"ss-config"`
391-
VmessConfig string `yaml:"vmess-config" json:"vmess-config"`
392-
InboundTfo bool `yaml:"inbound-tfo" json:"inbound-tfo"`
393-
InboundMPTCP bool `yaml:"inbound-mptcp" json:"inbound-mptcp"`
394-
Authentication []string `yaml:"authentication" json:"authentication"`
395-
SkipAuthPrefixes []netip.Prefix `yaml:"skip-auth-prefixes" json:"skip-auth-prefixes"`
396-
LanAllowedIPs []netip.Prefix `yaml:"lan-allowed-ips" json:"lan-allowed-ips"`
397-
LanDisAllowedIPs []netip.Prefix `yaml:"lan-disallowed-ips" json:"lan-disallowed-ips"`
398-
AllowLan bool `yaml:"allow-lan" json:"allow-lan"`
399-
BindAddress string `yaml:"bind-address" json:"bind-address"`
400-
Mode T.TunnelMode `yaml:"mode" json:"mode"`
401-
UnifiedDelay bool `yaml:"unified-delay" json:"unified-delay"`
402-
LogLevel log.LogLevel `yaml:"log-level" json:"log-level"`
403-
IPv6 bool `yaml:"ipv6" json:"ipv6"`
404-
ExternalController string `yaml:"external-controller" json:"external-controller"`
405-
ExternalControllerPipe string `yaml:"external-controller-pipe" json:"external-controller-pipe"`
406-
ExternalControllerUnix string `yaml:"external-controller-unix" json:"external-controller-unix"`
407-
ExternalControllerTLS string `yaml:"external-controller-tls" json:"external-controller-tls"`
408-
ExternalControllerCors RawCors `yaml:"external-controller-cors" json:"external-controller-cors"`
409-
ExternalUI string `yaml:"external-ui" json:"external-ui"`
410-
ExternalUIURL string `yaml:"external-ui-url" json:"external-ui-url"`
411-
ExternalUIName string `yaml:"external-ui-name" json:"external-ui-name"`
412-
ExternalDohServer string `yaml:"external-doh-server" json:"external-doh-server"`
413-
Secret string `yaml:"secret" json:"secret"`
414-
Interface string `yaml:"interface-name" json:"interface-name"`
415-
RoutingMark int `yaml:"routing-mark" json:"routing-mark"`
416-
Tunnels []LC.Tunnel `yaml:"tunnels" json:"tunnels"`
417-
GeoAutoUpdate bool `yaml:"geo-auto-update" json:"geo-auto-update"`
418-
GeoUpdateInterval int `yaml:"geo-update-interval" json:"geo-update-interval"`
419-
GeodataMode bool `yaml:"geodata-mode" json:"geodata-mode"`
420-
GeodataLoader string `yaml:"geodata-loader" json:"geodata-loader"`
421-
GeositeMatcher string `yaml:"geosite-matcher" json:"geosite-matcher"`
422-
TCPConcurrent bool `yaml:"tcp-concurrent" json:"tcp-concurrent"`
423-
FindProcessMode P.FindProcessMode `yaml:"find-process-mode" json:"find-process-mode"`
424-
GlobalClientFingerprint string `yaml:"global-client-fingerprint" json:"global-client-fingerprint"`
425-
GlobalUA string `yaml:"global-ua" json:"global-ua"`
426-
ETagSupport bool `yaml:"etag-support" json:"etag-support"`
427-
KeepAliveIdle int `yaml:"keep-alive-idle" json:"keep-alive-idle"`
428-
KeepAliveInterval int `yaml:"keep-alive-interval" json:"keep-alive-interval"`
429-
DisableKeepAlive bool `yaml:"disable-keep-alive" json:"disable-keep-alive"`
385+
Port int `yaml:"port" json:"port"`
386+
SocksPort int `yaml:"socks-port" json:"socks-port"`
387+
RedirPort int `yaml:"redir-port" json:"redir-port"`
388+
TProxyPort int `yaml:"tproxy-port" json:"tproxy-port"`
389+
MixedPort int `yaml:"mixed-port" json:"mixed-port"`
390+
ShadowSocksConfig string `yaml:"ss-config" json:"ss-config"`
391+
VmessConfig string `yaml:"vmess-config" json:"vmess-config"`
392+
InboundTfo bool `yaml:"inbound-tfo" json:"inbound-tfo"`
393+
InboundMPTCP bool `yaml:"inbound-mptcp" json:"inbound-mptcp"`
394+
Authentication []string `yaml:"authentication" json:"authentication"`
395+
SkipAuthPrefixes []netip.Prefix `yaml:"skip-auth-prefixes" json:"skip-auth-prefixes"`
396+
LanAllowedIPs []netip.Prefix `yaml:"lan-allowed-ips" json:"lan-allowed-ips"`
397+
LanDisAllowedIPs []netip.Prefix `yaml:"lan-disallowed-ips" json:"lan-disallowed-ips"`
398+
AllowLan bool `yaml:"allow-lan" json:"allow-lan"`
399+
BindAddress string `yaml:"bind-address" json:"bind-address"`
400+
Mode T.TunnelMode `yaml:"mode" json:"mode"`
401+
UnifiedDelay bool `yaml:"unified-delay" json:"unified-delay"`
402+
LogLevel log.LogLevel `yaml:"log-level" json:"log-level"`
403+
IPv6 bool `yaml:"ipv6" json:"ipv6"`
404+
ExternalController string `yaml:"external-controller" json:"external-controller"`
405+
ExternalControllerPipe string `yaml:"external-controller-pipe" json:"external-controller-pipe"`
406+
ExternalControllerUnix string `yaml:"external-controller-unix" json:"external-controller-unix"`
407+
ExternalControllerTLS string `yaml:"external-controller-tls" json:"external-controller-tls"`
408+
ExternalControllerCors RawCors `yaml:"external-controller-cors" json:"external-controller-cors"`
409+
ExternalUI string `yaml:"external-ui" json:"external-ui"`
410+
ExternalUIURL string `yaml:"external-ui-url" json:"external-ui-url"`
411+
ExternalUIName string `yaml:"external-ui-name" json:"external-ui-name"`
412+
ExternalDohServer string `yaml:"external-doh-server" json:"external-doh-server"`
413+
Secret string `yaml:"secret" json:"secret"`
414+
Interface string `yaml:"interface-name" json:"interface-name"`
415+
RoutingMark int `yaml:"routing-mark" json:"routing-mark"`
416+
Tunnels []LC.Tunnel `yaml:"tunnels" json:"tunnels"`
417+
GeoAutoUpdate bool `yaml:"geo-auto-update" json:"geo-auto-update"`
418+
GeoUpdateInterval int `yaml:"geo-update-interval" json:"geo-update-interval"`
419+
GeodataMode bool `yaml:"geodata-mode" json:"geodata-mode"`
420+
GeodataLoader string `yaml:"geodata-loader" json:"geodata-loader"`
421+
GeositeMatcher string `yaml:"geosite-matcher" json:"geosite-matcher"`
422+
TCPConcurrent bool `yaml:"tcp-concurrent" json:"tcp-concurrent"`
423+
FindProcessMode process.FindProcessMode `yaml:"find-process-mode" json:"find-process-mode"`
424+
GlobalClientFingerprint string `yaml:"global-client-fingerprint" json:"global-client-fingerprint"`
425+
GlobalUA string `yaml:"global-ua" json:"global-ua"`
426+
ETagSupport bool `yaml:"etag-support" json:"etag-support"`
427+
KeepAliveIdle int `yaml:"keep-alive-idle" json:"keep-alive-idle"`
428+
KeepAliveInterval int `yaml:"keep-alive-interval" json:"keep-alive-interval"`
429+
DisableKeepAlive bool `yaml:"disable-keep-alive" json:"disable-keep-alive"`
430430

431431
ProxyProvider map[string]map[string]any `yaml:"proxy-providers" json:"proxy-providers"`
432432
RuleProvider map[string]map[string]any `yaml:"rule-providers" json:"rule-providers"`
@@ -479,7 +479,7 @@ func DefaultRawConfig() *RawConfig {
479479
Proxy: []map[string]any{},
480480
ProxyGroup: []map[string]any{},
481481
TCPConcurrent: false,
482-
FindProcessMode: P.FindProcessStrict,
482+
FindProcessMode: process.FindProcessStrict,
483483
GlobalUA: "clash.meta/" + C.Version,
484484
ETagSupport: true,
485485
DNS: RawDNS{

‎tunnel/tunnel.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/metacubex/mihomo/common/utils"
1818
"github.com/metacubex/mihomo/component/loopback"
1919
"github.com/metacubex/mihomo/component/nat"
20-
P "github.com/metacubex/mihomo/component/process"
20+
"github.com/metacubex/mihomo/component/process"
2121
"github.com/metacubex/mihomo/component/resolver"
2222
"github.com/metacubex/mihomo/component/slowdown"
2323
"github.com/metacubex/mihomo/component/sniffer"
@@ -59,7 +59,7 @@ var (
5959
// default timeout for UDP session
6060
udpTimeout = 60 * time.Second
6161

62-
findProcessMode = atomic.NewInt32Enum(P.FindProcessStrict)
62+
findProcessMode = atomic.NewInt32Enum(process.FindProcessStrict)
6363

6464
snifferDispatcher *sniffer.Dispatcher
6565
sniffingEnable = false
@@ -263,13 +263,13 @@ func SetMode(m TunnelMode) {
263263
mode = m
264264
}
265265

266-
func FindProcessMode() P.FindProcessMode {
266+
func FindProcessMode() process.FindProcessMode {
267267
return findProcessMode.Load()
268268
}
269269

270270
// SetFindProcessMode replace SetAlwaysFindProcess
271271
// always find process info if legacyAlways = true or mode.Always() = true, may be increase many memory
272-
func SetFindProcessMode(mode P.FindProcessMode) {
272+
func SetFindProcessMode(mode process.FindProcessMode) {
273273
findProcessMode.Store(mode)
274274
}
275275

@@ -358,21 +358,21 @@ func resolveMetadata(metadata *C.Metadata) (proxy C.Proxy, rule C.Rule, err erro
358358
attemptProcessLookup = false
359359
if !features.CMFA {
360360
// normal check for process
361-
uid, path, err := P.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, int(metadata.SrcPort))
361+
uid, path, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, int(metadata.SrcPort))
362362
if err != nil {
363363
log.Debugln("[Process] find process error for %s: %v", metadata.String(), err)
364364
} else {
365365
metadata.Process = filepath.Base(path)
366366
metadata.ProcessPath = path
367367
metadata.Uid = uid
368368

369-
if pkg, err := P.FindPackageName(metadata); err == nil { // for android (not CMFA) package names
369+
if pkg, err := process.FindPackageName(metadata); err == nil { // for android (not CMFA) package names
370370
metadata.Process = pkg
371371
}
372372
}
373373
} else {
374374
// check package names
375-
pkg, err := P.FindPackageName(metadata)
375+
pkg, err := process.FindPackageName(metadata)
376376
if err != nil {
377377
log.Debugln("[Process] find process error for %s: %v", metadata.String(), err)
378378
} else {
@@ -384,10 +384,10 @@ func resolveMetadata(metadata *C.Metadata) (proxy C.Proxy, rule C.Rule, err erro
384384
}
385385

386386
switch FindProcessMode() {
387-
case P.FindProcessAlways:
387+
case process.FindProcessAlways:
388388
helper.FindProcess()
389389
helper.FindProcess = nil
390-
case P.FindProcessOff:
390+
case process.FindProcessOff:
391391
helper.FindProcess = nil
392392
}
393393

0 commit comments

Comments
 (0)