fix /install error when resolve dns(only happend in network change

cmdctrl/cmdctrl.go

@@ -101,17 +101,24 @@ func (cc *CommandCtrl) Start(name string) error {
 	return pkeeper.start()
 }
 
-// Stop send stop signal and quit immediately
-func (cc *CommandCtrl) Stop(name string) error {
+// Stop send stop signal
+// Stop("demo") will quit immediately
+// Stop("demo", true) will quit until command really killed
+func (cc *CommandCtrl) Stop(name string, waits ...bool) error {
 	cc.rl.RLock()
 	defer cc.rl.RUnlock()
 	pkeeper, ok := cc.cmds[name]
 	if !ok {
 		return errors.New("cmdctl not found: " + name)
 	}
-	return pkeeper.stop(false)
+	wait := false
+	if len(waits) > 0 {
+		wait = waits[0]
+	}
+	return pkeeper.stop(wait)
 }
 
+// StopAll command and wait until all program quited
 func (cc *CommandCtrl) StopAll() {
 	for _, pkeeper := range cc.cmds {
 		pkeeper.stop(true)

initialize.go

@@ -21,7 +21,15 @@ var (
 	httpServer *http.Server
 )
 
-func dnsLookupHost(hostname string, dnsServer string) (ip net.IP, err error) {
+func dnsLookupHost(hostname string) (ip net.IP, err error) {
+	dnsServer := getProperty("net.dns1")
+	if dnsServer == "" {
+		dnsServer = "8.8.8.8"
+	}
+	return dnsLookupHostWithDNS(hostname, dnsServer)
+}
+
+func dnsLookupHostWithDNS(hostname string, dnsServer string) (ip net.IP, err error) {
 	if !strings.HasSuffix(hostname, ".") {
 		hostname += "."
 	}
@@ -46,7 +54,7 @@ func dnsLookupHost(hostname string, dnsServer string) (ip net.IP, err error) {
 		return t.A, nil
 	}
 	if t, ok := in.Answer[0].(*dns.CNAME); ok {
-		return dnsLookupHost(t.Target, dnsServer)
+		return dnsLookupHostWithDNS(t.Target, dnsServer)
 	}
 	return nil, errors.New("dns resolve failed: " + hostname)
 }
@@ -57,16 +65,12 @@ func init() {
 		KeepAlive: 30 * time.Second,
 		DualStack: true,
 	}
-	// get default dns server
-	dnsServer := getProperty("net.dns1")
-	if dnsServer == "" {
-		dnsServer = "8.8.8.8"
-	}
+
 	// manualy dns resolve
 	newDialContext := func(ctx context.Context, network, addr string) (net.Conn, error) {
 		host, port, _ := net.SplitHostPort(addr)
 		if net.ParseIP(host) == nil {
-			ip, err := dnsLookupHost(host, dnsServer)
+			ip, err := dnsLookupHost(host)
 			if err != nil {
 				return nil, err
 			}

main.go

@@ -473,7 +473,7 @@ func ServeHTTP(lis net.Listener, tunnel *TunnelProxy) error {
 	}).Methods("POST")
 
 	m.HandleFunc("/uiautomator", func(w http.ResponseWriter, r *http.Request) {
-		err := service.Stop("uiautomator")
+		err := service.Stop("uiautomator", true) // wait until program quit
 		if err == nil {
 			io.WriteString(w, "Success")
 		} else {