pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-03-10 04:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dont restart netstack

Browse Source
This commit is contained in:
Owen
2025-07-25 11:01:54 -07:00
parent 499ebcd928
commit 27561f52ca
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
linux.go
View File

@@ -9,11 +9,11 @@ import (
"github.com/fosrl/newt/logger" "github.com/fosrl/newt/logger"
"github.com/fosrl/newt/proxy" "github.com/fosrl/newt/proxy"
"github.com/fosrl/newt/websocket" "github.com/fosrl/newt/websocket"
"golang.zx2c4.com/wireguard/tun/netstack"
// "github.com/fosrl/newt/wg" // "github.com/fosrl/newt/wg"
"github.com/fosrl/newt/wgnetstack" "github.com/fosrl/newt/wgnetstack"
"github.com/fosrl/newt/wgtester" "github.com/fosrl/newt/wgtester"
"golang.zx2c4.com/wireguard/tun/netstack"
) )
var wgService *wgnetstack.WireGuardService var wgService *wgnetstack.WireGuardService
@@ -35,20 +35,20 @@ func setupClients(client *websocket.Client) {
logger.Fatal("Failed to create WireGuard service: %v", err) logger.Fatal("Failed to create WireGuard service: %v", err)
} }
wgTesterServer = wgtester.NewServer("0.0.0.0", wgService.Port, id) // TODO: maybe make this the same ip of the wg server? // // Set up callback to restart wgtester with netstack when WireGuard is ready
wgService.SetOnNetstackReady(func(tnet *netstack.Net) {
wgTesterServer = wgtester.NewServerWithNetstack("0.0.0.0", wgService.Port, id, tnet) // TODO: maybe make this the same ip of the wg server?
err := wgTesterServer.Start() err := wgTesterServer.Start()
if err != nil { if err != nil {
logger.Error("Failed to start WireGuard tester server: %v", err) logger.Error("Failed to start WireGuard tester server: %v", err)
} }
// logger.Info("WireGuard netstack is ready, restarting wgtester with netstack")
// Set up callback to restart wgtester with netstack when WireGuard is ready // if err := wgTesterServer.RestartWithNetstack(tnet); err != nil {
wgService.SetOnNetstackReady(func(tnet *netstack.Net) { // logger.Error("Failed to restart wgtester with netstack: %v", err)
logger.Info("WireGuard netstack is ready, restarting wgtester with netstack") // } else {
if err := wgTesterServer.RestartWithNetstack(tnet); err != nil { // logger.Info("WGTester successfully restarted with netstack")
logger.Error("Failed to restart wgtester with netstack: %v", err) // }
} else {
logger.Info("WGTester successfully restarted with netstack")
}
}) })
client.OnTokenUpdate(func(token string) { client.OnTokenUpdate(func(token string) {