fix: running issue and no network on android (#264)

daeuniverse · Jan 1, 2024 · e466295 · e466295
1 parent 5360893
commit e466295
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/common/netutils/dns.go b/common/netutils/dns.go
@@ -59,10 +59,6 @@ func tryUpdateSystemDnsElapse(k time.Duration) (err error) {
 
 func tryUpdateSystemDns() (err error) {
 	dnsConf := dnsReadConfig("/etc/resolv.conf")
-	if len(dnsConf.servers) == 0 {
-		err = fmt.Errorf("no valid dns server in /etc/resolv.conf")
-		return err
-	}
 	systemDns = netip.AddrPort{}
 	for _, s := range dnsConf.servers {
 		ipPort := netip.MustParseAddrPort(s)

diff --git a/component/dns/dns.go b/component/dns/dns.go
@@ -141,7 +141,10 @@ func (s *Dns) InitUpstreams() {
 	for _, upstream := range s.upstream {
 		wg.Add(1)
 		go func(upstream *UpstreamResolver) {
-			upstream.GetUpstream()
+			_, err := upstream.GetUpstream()
+			if err != nil {
+				s.log.WithError(err).Debugln("Dns.GetUpstream")
+			}
 			wg.Done()
 		}(upstream)
 	}

diff --git a/control/control_plane.go b/control/control_plane.go
@@ -213,7 +213,7 @@ func NewControlPlane(
 	// Bind to WAN
 	if len(global.WanInterface) > 0 {
 		if err = core.setupSkPidMonitor(); err != nil {
-			return nil, err
+			log.WithError(err).Warnln("cgroup2 is not enabled; pname routing cannot be used")
 		}
 		for _, ifname := range global.WanInterface {
 			if err = core.bindWan(ifname, global.AutoConfigKernelParameter); err != nil {