Preserve netmask if one isn't supplied in address

home-assistant · Dec 22, 2024 · fba89d2 · fba89d2
1 parent 523c38a
commit fba89d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/data/hassio/network.ts b/src/data/hassio/network.ts
@@ -117,11 +117,10 @@ export const accesspointScan = async (
 };
 
 export const parseAddress = (address: string) => {
-  const isIPv6 = address.includes(":");
-  const [ip, cidr] = address.includes("/")
-    ? address.split("/")
-    : [address, isIPv6 ? "64" : "24"];
-  return { ip, mask: cidrToNetmask(cidr, isIPv6) };
+  const [ip, cidr] = address.split("/");
+  const isIPv6 = ip.includes(":");
+  const mask = cidr ? cidrToNetmask(cidr, isIPv6) : null;
+  return { ip, mask };
 };
 
 export const formatAddress = (ip: string, mask: string) =>

diff --git a/src/panels/config/network/supervisor-network.ts b/src/panels/config/network/supervisor-network.ts
@@ -655,8 +655,9 @@ export class HassioNetwork extends LitElement {
     this._dirty = true;
     if (id === "address") {
       const index = (ev.target as any).index as number;
+      const { mask: oldMask } = parseAddress(this._interface![version]!.address![index]);
       const { mask } = parseAddress(value);
-      this._interface[version]!.address![index] = formatAddress(value, mask);
+      this._interface[version]!.address![index] = formatAddress(value, mask || oldMask);
       this.requestUpdate("_interface");
     } else if (id === "netmask") {
       const index = (ev.target as any).index as number;