Merge branch 'main' into ui-refactor

client/ui/frontend/src/modules/settings/SettingsAdvanced.tsx

@@ -18,7 +18,8 @@ const INTERFACE_NAME_RE = IS_MAC ? /^utun\d+$/ : /^[A-Za-z0-9._-]{1,15}$/;
 const INTERFACE_NAME_ERROR_KEY = IS_MAC
     ? "settings.advanced.interfaceName.errorMac"
     : "settings.advanced.interfaceName.error";
-const PORT_MIN = 1;
+// Port 0 means "let the daemon pick a random free port" (see the hint text).
+const PORT_MIN = 0;
 const PORT_MAX = 65535;
 // Mirrors client/iface/iface.go MinMTU / MaxMTU. 576 is the IPv4 "every host
 // must accept" datagram size from RFC 791 — safe floor when IPv6 is off; for
@@ -93,20 +94,23 @@ export function SettingsAdvanced() {
                     }
                 />
                 <div className={"grid grid-cols-2 gap-4"}>
-                    <Input
-                        label={t("settings.advanced.port.label")}
-                        type={"number"}
-                        min={PORT_MIN}
-                        max={PORT_MAX}
-                        value={values.wireguardPort}
-                        error={errors.wireguardPort}
-                        onChange={(e) =>
-                            setValues((v) => ({
-                                ...v,
-                                wireguardPort: Number(e.target.value),
-                            }))
-                        }
-                    />
+                    <div>
+                        <Input
+                            label={t("settings.advanced.port.label")}
+                            type={"number"}
+                            min={PORT_MIN}
+                            max={PORT_MAX}
+                            value={values.wireguardPort}
+                            error={errors.wireguardPort}
+                            onChange={(e) =>
+                                setValues((v) => ({
+                                    ...v,
+                                    wireguardPort: Number(e.target.value),
+                                }))
+                            }
+                        />
+                        <HelpText>{t("settings.advanced.port.help")}</HelpText>
+                    </div>
                     <Input
                         label={t("settings.advanced.mtu.label")}
                         type={"number"}

client/ui/i18n/locales/de/common.json

@@ -212,6 +212,7 @@
     "settings.advanced.interfaceName.errorMac": "Muss mit „utun“ und einer Zahl beginnen (z. B. utun100).",
     "settings.advanced.port.label": "Port",
     "settings.advanced.port.error": "Gib einen Port zwischen {min} und {max} ein.",
+    "settings.advanced.port.help": "Wenn auf 0 gesetzt, wird ein zufälliger freier Port verwendet.",
     "settings.advanced.mtu.label": "MTU",
     "settings.advanced.mtu.error": "Gib eine MTU zwischen {min} und {max} ein.",
     "settings.advanced.psk.label": "Pre-shared Key",

client/ui/i18n/locales/en/common.json

@@ -232,7 +232,10 @@
     "settings.advanced.section.security": "Security",
     "settings.advanced.interfaceName.label": "Name",
     "settings.advanced.port.label": "Port",
+    "settings.advanced.port.error": "Enter a port between {min} and {max}.",
+    "settings.advanced.port.help": "If set to 0, a random free port will be used.",
     "settings.advanced.mtu.label": "MTU",
+    "settings.advanced.mtu.error": "Enter an MTU value between {min} and {max}.",
     "settings.advanced.psk.label": "Pre-shared Key",
     "settings.advanced.psk.help": "Optional WireGuard PSK for extra symmetric encryption. Not the same as a NetBird Setup Key. You will only communicate with peers that use the same pre-shared key.",
 

client/ui/i18n/locales/hu/common.json

@@ -212,6 +212,7 @@
     "settings.advanced.interfaceName.errorMac": "„utun” után számmal kezdődjön (pl. utun100).",
     "settings.advanced.port.label": "Port",
     "settings.advanced.port.error": "Adj meg egy portot {min} és {max} között.",
+    "settings.advanced.port.help": "Ha 0-ra állítod, egy véletlenszerű szabad portot használ.",
     "settings.advanced.mtu.label": "MTU",
     "settings.advanced.mtu.error": "Adj meg egy MTU értéket {min} és {max} között.",
     "settings.advanced.psk.label": "Pre-shared kulcs",