mirror/mihomo
1
1
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2025-12-20 17:10:08 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: simplify DNSPrefer serialization process

Browse Source
This commit is contained in:
wwqgtxx 2025-12-04 13:41:44 +08:00
parent 32ce513977
commit b509affe5b
20 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/outbound/anytls.go
View File

@ -95,7 +95,7 @@ func NewAnyTLS(option AnyTLSOption) (*AnyTLS, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
} }

2
adapter/outbound/base.go
View File

@ -164,7 +164,7 @@ type BasicOption struct {
MPTCP bool `proxy:"mptcp,omitempty"` MPTCP bool `proxy:"mptcp,omitempty"`
Interface string `proxy:"interface-name,omitempty"` Interface string `proxy:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty"` RoutingMark int `proxy:"routing-mark,omitempty"`
IPVersion string `proxy:"ip-version,omitempty"` IPVersion C.DNSPrefer `proxy:"ip-version,omitempty"`
DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
DialerForAPI C.Dialer `proxy:"-"` // the dialer used for API usage has higher priority than all the above configurations. DialerForAPI C.Dialer `proxy:"-"` // the dialer used for API usage has higher priority than all the above configurations.

2
adapter/outbound/direct.go
View File

@ -74,7 +74,7 @@ func NewDirectWithOption(option DirectOption) *Direct {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
loopBack: loopback.NewDetector(), loopBack: loopback.NewDetector(),
} }

2
adapter/outbound/dns.go
View File

@ -163,7 +163,7 @@ func NewDnsWithOption(option DnsOption) *Dns {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
} }
} }

2
adapter/outbound/http.go
View File

@ -174,7 +174,7 @@ func NewHttp(option HttpOption) (*Http, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
user: option.UserName, user: option.UserName,
pass: option.Password, pass: option.Password,

2
adapter/outbound/hysteria.go
View File

@ -247,7 +247,7 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
tfo: option.FastOpen, tfo: option.FastOpen,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
client: client, client: client,

4
adapter/outbound/hysteria2.go
View File

@ -113,7 +113,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
udp: true, udp: true,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
} }
@ -189,7 +189,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
CWND: option.CWND, CWND: option.CWND,
UdpMTU: option.UdpMTU, UdpMTU: option.UdpMTU,
ServerAddress: func(ctx context.Context) (*net.UDPAddr, error) { ServerAddress: func(ctx context.Context) (*net.UDPAddr, error) {
udpAddr, err := resolveUDPAddr(ctx, "udp", addr, C.NewDNSPrefer(option.IPVersion)) udpAddr, err := resolveUDPAddr(ctx, "udp", addr, option.IPVersion)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
adapter/outbound/mieru.go
View File

@ -172,7 +172,7 @@ func NewMieru(option MieruOption) (*Mieru, error) {
udp: option.UDP, udp: option.UDP,
xudp: false, xudp: false,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
client: c, client: c,

2
adapter/outbound/shadowsocks.go
View File

@ -463,7 +463,7 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
method: method, method: method,

2
adapter/outbound/shadowsocksr.go
View File

@ -167,7 +167,7 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
cipher: coreCiph, cipher: coreCiph,

2
adapter/outbound/snell.go
View File

@ -170,7 +170,7 @@ func NewSnell(option SnellOption) (*Snell, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
psk: psk, psk: psk,

2
adapter/outbound/socks5.go
View File

@ -195,7 +195,7 @@ func NewSocks5(option Socks5Option) (*Socks5, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
user: option.UserName, user: option.UserName,

2
adapter/outbound/ssh.go
View File

@ -189,7 +189,7 @@ func NewSsh(option SshOption) (*Ssh, error) {
udp: false, udp: false,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
config: &config, config: &config,

2
adapter/outbound/sudoku.go
View File

@ -243,7 +243,7 @@ func NewSudoku(option SudokuOption) (*Sudoku, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
table: table, table: table,

2
adapter/outbound/trojan.go
View File

@ -293,7 +293,7 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
hexPassword: trojan.Key(option.Password), hexPassword: trojan.Key(option.Password),

2
adapter/outbound/tuic.go
View File

@ -256,7 +256,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
tfo: option.FastOpen, tfo: option.FastOpen,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
option: &option, option: &option,
tlsConfig: tlsClientConfig, tlsConfig: tlsClientConfig,

2
adapter/outbound/vless.go
View File

@ -423,7 +423,7 @@ func NewVless(option VlessOption) (*Vless, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
client: client, client: client,
option: &option, option: &option,

2
adapter/outbound/vmess.go
View File

@ -433,7 +433,7 @@ func NewVmess(option VmessOption) (*Vmess, error) {
mpTcp: option.MPTCP, mpTcp: option.MPTCP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
client: client, client: client,
option: &option, option: &option,

2
adapter/outbound/wireguard.go
View File

@ -173,7 +173,7 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
udp: option.UDP, udp: option.UDP,
iface: option.Interface, iface: option.Interface,
rmark: option.RoutingMark, rmark: option.RoutingMark,
prefer: C.NewDNSPrefer(option.IPVersion), prefer: option.IPVersion,
}, },
} }
outbound.dialer = option.NewDialer(outbound.DialOptions()) outbound.dialer = option.NewDialer(outbound.DialOptions())

15
constant/dns.go
View File

@ -86,12 +86,17 @@ func (d DNSPrefer) String() string {
} }
} }
func NewDNSPrefer(prefer string) DNSPrefer { func (d DNSPrefer) MarshalText() ([]byte, error) {
if p, ok := dnsPreferMap[prefer]; ok { return []byte(d.String()), nil
return p }
} else {
return DualStack func (d *DNSPrefer) UnmarshalText(data []byte) error {
p, exist := dnsPreferMap[strings.ToLower(string(data))]
if !exist {
p = DualStack
} }
*d = p
return nil
} }
// FilterModeMapping is a mapping for FilterMode enum // FilterModeMapping is a mapping for FilterMode enum