Use numeric prefix for IPv6 mask

This commit is contained in:
Petar Petrov 2025-04-22 11:08:04 +03:00
parent 5a34560381
commit 1f4b973968
3 changed files with 37 additions and 14 deletions

View File

@ -120,7 +120,7 @@ export const parseAddress = (address: string) => {
const [ip, cidr] = address.split("/"); const [ip, cidr] = address.split("/");
const isIPv6 = ip.includes(":"); const isIPv6 = ip.includes(":");
const mask = cidr ? cidrToNetmask(cidr, isIPv6) : null; const mask = cidr ? cidrToNetmask(cidr, isIPv6) : null;
return { ip, mask }; return { ip, mask, prefix: cidr };
}; };
export const formatAddress = (ip: string, mask: string) => export const formatAddress = (ip: string, mask: string) =>

View File

@ -380,7 +380,7 @@ export class HassioNetwork extends LitElement {
? html` ? html`
${this._interface![version].address.map( ${this._interface![version].address.map(
(address: string, index: number) => { (address: string, index: number) => {
const { ip, mask } = parseAddress(address); const { ip, mask, prefix } = parseAddress(address);
return html` return html`
<div class="address-row"> <div class="address-row">
<ha-textfield <ha-textfield
@ -395,18 +395,35 @@ export class HassioNetwork extends LitElement {
.disabled=${disableInputs} .disabled=${disableInputs}
> >
</ha-textfield> </ha-textfield>
${version === "ipv6"
? html`
<ha-textfield
id="prefix"
.label=${this.hass.localize(
"ui.panel.config.network.supervisor.prefix"
)}
.version=${version}
.value=${prefix || ""}
.index=${index}
@change=${this._handleInputValueChanged}
.disabled=${disableInputs}
>
</ha-textfield>
`
: html`
<ha-textfield <ha-textfield
id="netmask" id="netmask"
.label=${this.hass.localize( .label=${this.hass.localize(
"ui.panel.config.network.supervisor.netmask" "ui.panel.config.network.supervisor.netmask"
)} )}
.version=${version} .version=${version}
.value=${mask} .value=${mask || ""}
.index=${index} .index=${index}
@change=${this._handleInputValueChanged} @change=${this._handleInputValueChanged}
.disabled=${disableInputs} .disabled=${disableInputs}
> >
</ha-textfield> </ha-textfield>
`}
${this._interface![version].address.length > 1 && ${this._interface![version].address.length > 1 &&
!disableInputs !disableInputs
? html` ? html`
@ -667,6 +684,11 @@ export class HassioNetwork extends LitElement {
const { ip } = parseAddress(this._interface![version]!.address![index]); const { ip } = parseAddress(this._interface![version]!.address![index]);
this._interface[version]!.address![index] = formatAddress(ip, value); this._interface[version]!.address![index] = formatAddress(ip, value);
this.requestUpdate("_interface"); this.requestUpdate("_interface");
} else if (id === "prefix") {
const index = (ev.target as any).index as number;
const { ip } = parseAddress(this._interface![version]!.address![index]);
this._interface[version]!.address![index] = `${ip}/${value}`;
this.requestUpdate("_interface");
} else if (id === "nameserver") { } else if (id === "nameserver") {
const index = (ev.target as any).index as number; const index = (ev.target as any).index as number;
this._interface[version]!.nameservers![index] = value; this._interface[version]!.nameservers![index] = value;

View File

@ -6319,6 +6319,7 @@
"disabled": "Disabled", "disabled": "Disabled",
"ip": "IP address", "ip": "IP address",
"netmask": "Netmask", "netmask": "Netmask",
"prefix": "Subnet prefix",
"add_address": "Add address", "add_address": "Add address",
"gateway": "Gateway address", "gateway": "Gateway address",
"dns_server": "DNS Server", "dns_server": "DNS Server",