Merge d4f2995ad6 into cc9ff74276

internal/native/eez/jetkvm.eez-project

@@ -8561,7 +8561,7 @@
                               },
                               "group": "",
                               "groupIndex": 0,
-                              "text": "Press and hold for\n5 seconds",
+                              "text": "Press and hold for\n10 seconds",
                               "textType": "literal",
                               "longMode": "WRAP",
                               "recolor": false,

internal/native/eez/src/ui/screens.c

@@ -2341,7 +2341,7 @@ void create_screen_switch_dhcp_client_screen() {
                                             lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT);
                                             add_style_info_content_label(obj);
                                             lv_obj_set_style_text_font(obj, &ui_font_font_book20, LV_PART_MAIN | LV_STATE_DEFAULT);
-                                            lv_label_set_text(obj, "Press and hold for\n5 seconds");
+                                            lv_label_set_text(obj, "Press and hold for\n10 seconds");
                                         }
                                     }
                                 }

network.go

@@ -151,7 +151,6 @@ func initNetwork() error {
 	if err := nm.AddInterface(NetIfName, nc); err != nil {
 		return fmt.Errorf("failed to add interface: %w", err)
 	}
-	_ = nm.CleanUpLegacyDHCPClients()
 
 	networkManager = nm
 
@@ -234,9 +233,5 @@ func rpcToggleDHCPClient() error {
 		config.NetworkConfig.DHCPClient.String = "jetdhcpc"
 	}
 
-	if err := SaveConfig(); err != nil {
-		return err
-	}
-
 	return rpcReboot(false)
 }

pkg/nmlite/jetdhcpc/legacy.go

@@ -8,8 +8,6 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
-
-	"github.com/rs/zerolog"
 )
 
 func readFileNoStat(filename string) ([]byte, error) {
@@ -38,8 +36,7 @@ func toCmdline(path string) ([]string, error) {
 	return strings.Split(string(bytes.TrimRight(data, "\x00")), "\x00"), nil
 }
 
-// KillUdhcpC kills all udhcpc processes
-func KillUdhcpC(l *zerolog.Logger) error {
+func (c *Client) killUdhcpc() error {
 	// read procfs for udhcpc processes
 	// we do not use procfs.AllProcs() because we want to avoid the overhead of reading the entire procfs
 	processes, err := os.ReadDir("/proc")
@@ -79,11 +76,11 @@ func KillUdhcpC(l *zerolog.Logger) error {
 	}
 
 	if len(matchedPids) == 0 {
-		l.Info().Msg("no udhcpc processes found")
+		c.l.Info().Msg("no udhcpc processes found")
 		return nil
 	}
 
-	l.Info().Ints("pids", matchedPids).Msg("found udhcpc processes, terminating")
+	c.l.Info().Ints("pids", matchedPids).Msg("found udhcpc processes, terminating")
 
 	for _, pid := range matchedPids {
 		err := syscall.Kill(pid, syscall.SIGTERM)
@@ -91,12 +88,8 @@ func KillUdhcpC(l *zerolog.Logger) error {
 			return err
 		}
 
-		l.Info().Int("pid", pid).Msg("terminated udhcpc process")
+		c.l.Info().Int("pid", pid).Msg("terminated udhcpc process")
 	}
 
 	return nil
 }
-
-func (c *Client) killUdhcpc() error {
-	return KillUdhcpC(c.l)
-}

pkg/nmlite/manager.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/jetkvm/kvm/internal/logging"
 	"github.com/jetkvm/kvm/internal/network/types"
-	"github.com/jetkvm/kvm/pkg/nmlite/jetdhcpc"
 	"github.com/jetkvm/kvm/pkg/nmlite/link"
 	"github.com/rs/zerolog"
 )
@@ -215,32 +214,6 @@ func (nm *NetworkManager) SetOnDHCPLeaseChange(callback func(iface string, lease
 	nm.onDHCPLeaseChange = callback
 }
 
-func (nm *NetworkManager) shouldKillLegacyDHCPClients() bool {
-	nm.mu.RLock()
-	defer nm.mu.RUnlock()
-
-	// TODO: remove it when we need to support multiple interfaces
-	for _, im := range nm.interfaces {
-		if im.dhcpClient.clientType != "udhcpc" {
-			return true
-		}
-
-		if im.config.IPv4Mode.String != "dhcp" {
-			return true
-		}
-	}
-	return false
-}
-
-// CleanUpLegacyDHCPClients cleans up legacy DHCP clients
-func (nm *NetworkManager) CleanUpLegacyDHCPClients() error {
-	shouldKill := nm.shouldKillLegacyDHCPClients()
-	if shouldKill {
-		return jetdhcpc.KillUdhcpC(nm.logger)
-	}
-	return nil
-}
-
 // Stop stops the network manager and all managed interfaces
 func (nm *NetworkManager) Stop() error {
 	nm.mu.Lock()

ui/package-lock.json

@@ -28,7 +28,6 @@
         "react": "^19.1.1",
         "react-animate-height": "^3.2.3",
         "react-dom": "^19.1.1",
-        "react-hook-form": "^7.62.0",
         "react-hot-toast": "^2.6.0",
         "react-icons": "^5.5.0",
         "react-router": "^7.9.3",
@@ -5857,6 +5856,8 @@
         "react": "^19.1.1"
       }
     },
+<<<<<<< Updated upstream
+=======
     "node_modules/react-hook-form": {
       "version": "7.62.0",
       "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.62.0.tgz",
@@ -5873,6 +5874,7 @@
         "react": "^16.8.0 || ^17 || ^18 || ^19"
       }
     },
+>>>>>>> Stashed changes
     "node_modules/react-hot-toast": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.6.0.tgz",

ui/src/components/ConfirmDialog.tsx

@@ -67,55 +67,46 @@ export function ConfirmDialog({
 }: ConfirmDialogProps) {
   const { icon: Icon, iconClass, iconBgClass, buttonTheme } = variantConfig[variant];
 
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
-    if (e.key === "Escape") {
-      e.stopPropagation();
-      onClose();
-    }
-  };
-
   return (
-    <div onKeyDown={handleKeyDown}>
-      <Modal open={open} onClose={onClose}>
-        <div className="mx-auto max-w-xl px-4 transition-all duration-300 ease-in-out">
-          <div className="pointer-events-auto relative w-full overflow-hidden rounded-lg bg-white p-6 text-left align-middle shadow-xl transition-all dark:bg-slate-800">
-            <div className="space-y-4">
-              <div className="sm:flex sm:items-start">
-                <div
-                  className={cx(
-                    "mx-auto flex size-12 shrink-0 items-center justify-center rounded-full sm:mx-0 sm:size-10",
-                    iconBgClass,
-                  )}
-                >
-                  <Icon aria-hidden="true" className={cx("size-6", iconClass)} />
-                </div>
-                <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-                  <h2 className="text-lg leading-tight font-bold text-black dark:text-white">
-                    {title}
-                  </h2>
-                  <div className="mt-2 text-sm leading-snug text-slate-600 dark:text-slate-400">
-                    {description}
-                  </div>
-                </div>
-              </div>
-
-              <div className="flex justify-end gap-x-2" autoFocus>
-                {cancelText && (
-                  <CloseButton as={Button} size="SM" theme="blank" text={cancelText} />
+    <Modal open={open} onClose={onClose}>
+      <div className="mx-auto max-w-xl px-4 transition-all duration-300 ease-in-out">
+        <div className="pointer-events-auto relative w-full overflow-hidden rounded-lg bg-white p-6 text-left align-middle shadow-xl transition-all dark:bg-slate-800">
+          <div className="space-y-4">
+            <div className="sm:flex sm:items-start">
+              <div
+                className={cx(
+                  "mx-auto flex size-12 shrink-0 items-center justify-center rounded-full sm:mx-0 sm:size-10",
+                  iconBgClass,
                 )}
-                <Button
-                  size="SM"
-                  type="button"
-                  theme={buttonTheme}
-                  text={isConfirming ? `${confirmText}...` : confirmText}
-                  onClick={onConfirm}
-                  disabled={isConfirming}
-                />
+              >
+                <Icon aria-hidden="true" className={cx("size-6", iconClass)} />
               </div>
+              <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+                <h2 className="text-lg leading-tight font-bold text-black dark:text-white">
+                  {title}
+                </h2>
+                <div className="mt-2 text-sm leading-snug text-slate-600 dark:text-slate-400">
+                  {description}
+                </div>
+              </div>
+            </div>
+
+            <div className="flex justify-end gap-x-2" autoFocus>
+              {cancelText && (
+                <CloseButton as={Button} size="SM" theme="blank" text={cancelText} />
+              )}
+              <Button
+                size="SM"
+                type="button"
+                theme={buttonTheme}
+                text={isConfirming ? `${confirmText}...` : confirmText}
+                onClick={onConfirm}
+                disabled={isConfirming}
+              />
             </div>
           </div>
         </div>
-      </Modal>
-    </div>
+      </div>
+    </Modal>
   );
 }

ui/src/components/useCopyToClipBoard.tsx

@@ -1,49 +0,0 @@
-import { useCallback, useState } from "react";
-
-export function useCopyToClipboard(resetInterval = 2000) {
-  const [isCopied, setIsCopied] = useState(false);
-
-  const copy = useCallback(async (text: string) => {
-    if (!text) return false;
-
-    let success = false;
-
-    if (navigator.clipboard && window.isSecureContext) {
-      try {
-        await navigator.clipboard.writeText(text);
-        success = true;
-      } catch (err) {
-        console.warn("Clipboard API failed:", err);
-      }
-    }
-
-    // Fallback for insecure contexts
-    if (!success) {
-      const textarea = document.createElement("textarea");
-      textarea.value = text;
-      textarea.style.position = "fixed";
-      textarea.style.opacity = "0";
-      document.body.appendChild(textarea);
-      textarea.focus();
-      textarea.select();
-
-      try {
-        success = document.execCommand("copy");
-      } catch (err) {
-        console.error("Fallback copy failed:", err);
-        success = false;
-      } finally {
-        document.body.removeChild(textarea);
-      }
-    }
-
-    setIsCopied(success);
-    if (success && resetInterval > 0) {
-      setTimeout(() => setIsCopied(false), resetInterval);
-    }
-
-    return success;
-  }, [resetInterval]);
-
-  return { copy, isCopied };
-}

ui/src/routes/devices.$id.settings.network.tsx

@@ -2,7 +2,7 @@ import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { FieldValues, FormProvider, useForm } from "react-hook-form";
-import { LuCopy, LuEthernetPort } from "react-icons/lu";
+import { LuEthernetPort } from "react-icons/lu";
 import validator from "validator";
 
 import { ConfirmDialog } from "@/components/ConfirmDialog";
@@ -24,7 +24,6 @@ import StaticIpv4Card from "../components/StaticIpv4Card";
 import StaticIpv6Card from "../components/StaticIpv6Card";
 import { useJsonRpc } from "../hooks/useJsonRpc";
 import { SettingsItem } from "../components/SettingsItem";
-import { useCopyToClipboard } from "../components/useCopyToClipBoard";
 
 dayjs.extend(relativeTime);
 
@@ -191,7 +190,6 @@ export default function SettingsNetworkRoute() {
       // Label is for the UI, key is the internal key of the field
       { label: "IPv4 mode", key: "ipv4_mode" },
       { label: "IPv6 mode", key: "ipv6_mode" },
-      { label: "DHCP client", key: "dhcp_client" },
     ] as { label: string; key: keyof NetworkSettings }[];
 
     const criticalChanged = criticalFields.some(field => dirty[field.key]);
@@ -227,8 +225,6 @@ export default function SettingsNetworkRoute() {
     });
   };
 
-  const { copy } = useCopyToClipboard();
-
   return (
     <>
       <FormProvider {...formMethods}>
@@ -252,26 +248,19 @@ export default function SettingsNetworkRoute() {
             }
           />
           <div className="space-y-4">
-            <div className="flex items-center justify-between">
-              <SettingsItem
-                title="MAC Address"
-                description="Hardware identifier for the network interface"
+            <SettingsItem
+              title="MAC Address"
+              description="Hardware identifier for the network interface"
+            >
+              <InputField
+                type="text"
+                size="SM"
+                value={networkState?.mac_address}
+                error={""}
+                readOnly={true}
+                className="dark:!text-opacity-60"
               />
-              <div className="flex items-center">
-                <GridCard cardClassName="rounded-r-none">
-                  <div className=" h-[34px] flex items-center text-xs select-all text-black font-mono dark:text-white px-3 ">
-                    {networkState?.mac_address} {" "}
-                  </div>
-                </GridCard>
-                <Button className="rounded-l-none border-l-blue-900 dark:border-l-blue-600" size="SM" type="button" theme="primary" LeadingIcon={LuCopy} onClick={async () => {
-                  if (await copy(networkState?.mac_address || "")) {
-                    notifications.success("MAC address copied to clipboard");
-                  } else {
-                    notifications.error("Failed to copy MAC address");
-                  }
-                }} />
-              </div>
-            </div>
+            </SettingsItem>
             <SettingsItem title="Hostname" description="Set the device hostname">
               <InputField
                 size="SM"

ui/src/utils/ip.ts

@@ -1,10 +0,0 @@
-export const netMaskFromCidr4 = (cidr: number) => {
-  const mask = [];
-  let bitCount = cidr;
-  for(let i=0; i<4; i++) {
-    const n = Math.min(bitCount, 8);
-    mask.push(256 - Math.pow(2, 8-n));
-    bitCount -= n;
-  }
-  return mask.join('.');
-};