make network up after it is availble

hiddify · Feb 22, 2024 · 3fb13ef · 3fb13ef
1 parent 8b10558
commit 3fb13ef
Showing 1 changed file with 43 additions and 22 deletions.
diff --git a/outbound/wireguard.go b/outbound/wireguard.go
@@ -210,27 +210,45 @@ func (w *WireGuard) Close() error {
 }
 
 func (w *WireGuard) InterfaceUpdated() {
-	w.logger.Warn("Hiddify! Wirguard! Interface updated!1")
-	err := w.device.BindUpdate()
-	// err := fmt.Errorf("Hiddify! downing wireguard interface failed")
+	w.logger.Warn("Hiddify! Wirguard! Interface updated!XXX")
+	// err := w.device.BindUpdate()
+	// // err := fmt.Errorf("Hiddify! downing wireguard interface failed")
 
-	if err != nil {
-		w.logger.Error("Hiddify! bind update failed", err)
-		e1 := w.device.Down()
-		if e1 != nil {
-			w.logger.Error("Hiddify! downing wireguard interface failed", e1)
-		}
-		w.logger.Warn("Hiddify! uping.... wireguard interface")
-		e2 := w.device.Up()
-		if e2 != nil {
-			w.logger.Error("Hiddify! Uping wireguard interface failed", e2)
-		} else {
-			w.logger.Warn("Hiddify! OK!Updating wireguard interface")
-
-		}
+	// if err != nil {
+	// 	w.logger.Error("Hiddify! bind update failed", err)
+	e1 := w.device.Down()
+	if e1 != nil {
+		w.logger.Error("Hiddify! downing wireguard interface failed", e1)
+	}
+	if pause.IsNetworkPaused {
+		return
+	}
+	// for i := 0; i < 5; i++ {
+	// 	if !pause.IsNetworkPaused {
+	// 		break
+	// 	}
+	// 	if i == 4 {
+	// 		w.logger.Errorf("No network is availble after 4 seconds, stopping wireguard.")
+	// 		return
+	// 	}
+	// 	w.logger.Warn("Network is pause waiting ", i)
+	// 	select {
+	// 	case <-time.After(1 * time.Second):
+	// 	case <-w.done:
+	// 		return
+	// 	}
+	// }
+	w.logger.Warn("Hiddify! uping.... wireguard interface")
+	e2 := w.device.Up()
+	if e2 != nil {
+		w.logger.Error("Hiddify! Uping wireguard interface failed", e2)
 	} else {
-		w.logger.Warn("Hiddify! OK2!Updating wireguard interface")
+		w.logger.Warn("Hiddify! OK!Updating wireguard interface")
+
 	}
+	// } else {
+	// 	w.logger.Warn("Hiddify! OK2!Updating wireguard interface")
+	// }
 	return
 }
 
@@ -240,12 +258,15 @@ func (w *WireGuard) onPauseUpdated(event int) {
 
 	case pause.EventDevicePaused:
 		w.device.Down()
-	// case EventNetworkPause://hiddify already handled in Interface Updated
-	// 	w.device.Down()
+	case pause.EventNetworkPause: //hiddify already handled in Interface Updated
+		err := w.device.Down()
+		w.logger.Warn("Hiddify! Wirguard! downing net! err=", err)
+
 	case pause.EventDeviceWake:
 		w.device.Up()
-		// case pause.EventNetworkWake://hiddify already handled in Interface Updated
-		// 	w.device.Up()
+	case pause.EventNetworkWake: //hiddify already handled in Interface Updated
+		err := w.device.Up()
+		w.logger.Warn("Hiddify! Wirguard! Uping net! err=", err)
 	}
 }