mirror/mihomo
1
1
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2026-01-08 23:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: dhcp:// with special notation cannot be parsed

Browse Source
This commit is contained in:
xishang0128 2024-06-23 15:33:38 +08:00
parent a9ecc627e6
commit 9f4cd646c2
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
component/process/process_linux.go
View File

@ -209,7 +209,6 @@ func findPackageName(uid uint32) string {
}) })
if sharedPackage, loaded := packageManager.SharedPackageByID(uid % 100000); loaded { if sharedPackage, loaded := packageManager.SharedPackageByID(uid % 100000); loaded {
fmt.Println(loaded)
return sharedPackage return sharedPackage
} }
if packageName, loaded := packageManager.PackageByID(uid % 100000); loaded { if packageName, loaded := packageManager.PackageByID(uid % 100000); loaded {

14
config/config.go
View File

@ -1057,6 +1057,16 @@ func parseNameServer(servers []string, respectRules bool, preferH3 bool) ([]dns.
var nameservers []dns.NameServer var nameservers []dns.NameServer
for idx, server := range servers { for idx, server := range servers {
if strings.HasPrefix(server, "dhcp://") {
nameservers = append(
nameservers,
dns.NameServer{
Net: "dhcp",
Addr: server[len("dhcp://"):],
},
)
continue
}
server = parsePureDNSServer(server) server = parsePureDNSServer(server)
u, err := url.Parse(server) u, err := url.Parse(server)
if err != nil { if err != nil {
@ -1099,9 +1109,6 @@ func parseNameServer(servers []string, respectRules bool, preferH3 bool) ([]dns.
} }
} }
} }
case "dhcp":
addr = u.Host
dnsNetType = "dhcp" // UDP from DHCP
case "quic": case "quic":
addr, err = hostWithDefaultPort(u.Host, "853") addr, err = hostWithDefaultPort(u.Host, "853")
dnsNetType = "quic" // DNS over QUIC dnsNetType = "quic" // DNS over QUIC
@ -1174,6 +1181,7 @@ func parsePureDNSServer(server string) string {
} }
} }
} }
func parseNameServerPolicy(nsPolicy *orderedmap.OrderedMap[string, any], ruleProviders map[string]providerTypes.RuleProvider, respectRules bool, preferH3 bool) (*orderedmap.OrderedMap[string, []dns.NameServer], error) { func parseNameServerPolicy(nsPolicy *orderedmap.OrderedMap[string, any], ruleProviders map[string]providerTypes.RuleProvider, respectRules bool, preferH3 bool) (*orderedmap.OrderedMap[string, []dns.NameServer], error) {
policy := orderedmap.New[string, []dns.NameServer]() policy := orderedmap.New[string, []dns.NameServer]()
updatedPolicy := orderedmap.New[string, any]() updatedPolicy := orderedmap.New[string, any]()