From 40ca8397716720266130aaf8eecdef2a7e1b47fb Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Mon, 1 Dec 2025 16:20:30 -0500
Subject: [PATCH] Handle hp and other stuff

---
 clients.go         |  2 +-
 clients/clients.go | 28 ++--------------------------
 main.go            |  5 -----
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/clients.go b/clients.go
index 42f9187..13f73fc 100644
--- a/clients.go
+++ b/clients.go
@@ -29,7 +29,7 @@ func setupClients(client *websocket.Client) {
 
 	logger.Info("Setting up clients with netstack2...")
 	// Create WireGuard service
-	wgService, err = wgnetstack.NewWireGuardService(interfaceName, mtuInt, generateAndSaveKeyTo, host, id, client, "9.9.9.9", useNativeInterface)
+	wgService, err = wgnetstack.NewWireGuardService(interfaceName, mtuInt, host, id, client, dns, useNativeInterface)
 	if err != nil {
 		logger.Fatal("Failed to create WireGuard service: %v", err)
 	}
diff --git a/clients/clients.go b/clients/clients.go
index 4b4f2b5..cd1fbab 100644
--- a/clients/clients.go
+++ b/clients/clients.go
@@ -105,36 +105,12 @@ type WireGuardService struct {
 	netstackListenerMu sync.Mutex
 }
 
-func NewWireGuardService(interfaceName string, mtu int, generateAndSaveKeyTo string, host string, newtId string, wsClient *websocket.Client, dns string, useNativeInterface bool) (*WireGuardService, error) {
-	var key wgtypes.Key
-	var err error
-
-	key, err = wgtypes.GeneratePrivateKey()
+func NewWireGuardService(interfaceName string, mtu int, host string, newtId string, wsClient *websocket.Client, dns string, useNativeInterface bool) (*WireGuardService, error) {
+	key, err := wgtypes.GeneratePrivateKey()
 	if err != nil {
 		return nil, fmt.Errorf("failed to generate private key: %v", err)
 	}
 
-	// Load or generate private key
-	if generateAndSaveKeyTo != "" {
-		if _, err := os.Stat(generateAndSaveKeyTo); os.IsNotExist(err) {
-			// File doesn't exist, save the generated key
-			err = os.WriteFile(generateAndSaveKeyTo, []byte(key.String()), 0600)
-			if err != nil {
-				return nil, fmt.Errorf("failed to save private key: %v", err)
-			}
-		} else {
-			// File exists, read the existing key
-			keyData, err := os.ReadFile(generateAndSaveKeyTo)
-			if err != nil {
-				return nil, fmt.Errorf("failed to read private key: %v", err)
-			}
-			key, err = wgtypes.ParseKey(strings.TrimSpace(string(keyData)))
-			if err != nil {
-				return nil, fmt.Errorf("failed to parse private key: %v", err)
-			}
-		}
-	}
-
 	// Find an available port
 	port, err := util.FindAvailableUDPPort(49152, 65535)
 
diff --git a/main.go b/main.go
index a141141..2943227 100644
--- a/main.go
+++ b/main.go
@@ -116,7 +116,6 @@ var (
 	err                                error
 	logLevel                           string
 	interfaceName                      string
-	generateAndSaveKeyTo               string
 	acceptClients                      bool
 	updownScript                       string
 	dockerSocket                       string
@@ -168,7 +167,6 @@ func main() {
 	logLevel = os.Getenv("LOG_LEVEL")
 	updownScript = os.Getenv("UPDOWN_SCRIPT")
 	interfaceName = os.Getenv("INTERFACE")
-	generateAndSaveKeyTo = os.Getenv("GENERATE_AND_SAVE_KEY_TO")
 
 	// Metrics/observability env mirrors
 	metricsEnabledEnv := os.Getenv("NEWT_METRICS_PROMETHEUS_ENABLED")
@@ -237,9 +235,6 @@ func main() {
 	if interfaceName == "" {
 		flag.StringVar(&interfaceName, "interface", "newt", "Name of the WireGuard interface")
 	}
-	if generateAndSaveKeyTo == "" {
-		flag.StringVar(&generateAndSaveKeyTo, "generateAndSaveKeyTo", "", "Path to save generated private key")
-	}
 	if useNativeInterfaceEnv == "" {
 		flag.BoolVar(&useNativeInterface, "native", false, "Use native WireGuard interface (requires WireGuard kernel module) and linux")
 	}