Merge 87f36167f3 into 951173ba19

.devcontainer/default/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "JetKVM",
+	"name": "JetKVM Default",
 	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {

.devcontainer/podman/devcontainer.json

@@ -0,0 +1,19 @@
+{
+	"name": "JetKVM Podman",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			// Should match what is defined in ui/package.json
+			"version": "21.1.0"
+		}
+	},
+	"runArgs": [
+		"--userns=keep-id",
+		"--security-opt=label=disable",
+		"--security-opt=label=nested"
+	],
+	"containerUser": "vscode",
+	"containerEnv": {
+		"HOME": "/home/vscode"
+	}
+}

dev_deploy.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Exit immediately if a command exits with a non-zero status
 set -e
 

network.go

@@ -13,6 +13,8 @@ import (
 	"github.com/vishvananda/netlink/nl"
 )
 
+var mDNSConn *mdns.Conn
+
 var networkState struct {
 	Up   bool
 	IPv4 string
@@ -91,13 +93,26 @@ func checkNetworkState() {
 	}
 
 	if newState != networkState {
-		networkState = newState
 		fmt.Println("network state changed")
+		//restart MDNS
+		startMDNS()
+		networkState = newState
 		requestDisplayUpdate()
 	}
 }
 
 func startMDNS() error {
+	//If server was previously running, stop it
+	if mDNSConn != nil {
+		fmt.Printf("Stopping mDNS server\n")
+		err := mDNSConn.Close()
+		if err != nil {
+			fmt.Printf("failed to stop mDNS server: %v\n", err)
+		}
+	}
+
+	//Start a new server
+	fmt.Printf("Starting mDNS server on jetkvm.local\n")
 	addr4, err := net.ResolveUDPAddr("udp4", mdns.DefaultAddressIPv4)
 	if err != nil {
 		return err
@@ -118,10 +133,11 @@ func startMDNS() error {
 		return err
 	}
 
-	_, err = mdns.Server(ipv4.NewPacketConn(l4), ipv6.NewPacketConn(l6), &mdns.Config{
+	mDNSConn, err = mdns.Server(ipv4.NewPacketConn(l4), ipv6.NewPacketConn(l6), &mdns.Config{
 		LocalNames: []string{"jetkvm.local"}, //TODO: make it configurable
 	})
 	if err != nil {
+		mDNSConn = nil
 		return err
 	}
 	//defer server.Close()
@@ -157,7 +173,6 @@ func init() {
 			}
 		}
 	}()
-	fmt.Println("Starting mDNS server")
 	err := startMDNS()
 	if err != nil {
 		fmt.Println("failed to run mDNS: %v", err)