pmcf 2.10.2 → 2.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "publishConfig": {
     "access": "public"
   },

package/src/host.mjs

@@ -564,6 +564,14 @@ export class NetworkInterface extends Base {
     return this.rawAddresses[0];
   }
 
+  get rawIPv4Address() {
+    return this.rawAddresses.filter(a=>isIPv4Address(a))[0];
+  }
+  
+  get rawIPv6Address() {
+    return this.rawAddresses.filter(a=>isIPv6Address(a))[0];
+  }
+
   get rawAddresses() {
     return [...this._ipAddresses].map(([address]) => address);
   }

package/src/services/dhcp.mjs

@@ -60,11 +60,6 @@ export class DHCPService extends Service {
     };
 
     const commonConfig = {
-      "interfaces-config": {
-        interfaces: [...host.networkInterfaces.values()]
-          .filter(ni => ni.kind !== "loopback")
-          .map(ni => `${ni.name}/${ni.rawAddress}`)
-      },
       "lease-database": {
         type: "memfile",
         "lfc-interval": 3600
@@ -179,6 +174,11 @@ export class DHCPService extends Service {
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig,
+        "interfaces-config": {
+          interfaces: [...host.networkInterfaces.values()]
+            .filter(ni => ni.kind !== "loopback")
+            .map(ni => `${ni.name}/${ni.rawIPv4Address}`)
+        },  
         "multi-threading": {
           "enable-multi-threading": false
         },
@@ -218,6 +218,11 @@ export class DHCPService extends Service {
     const dhcp6 = {
       Dhcp6: {
         ...commonConfig,
+        "interfaces-config": {
+          interfaces: [...host.networkInterfaces.values()]
+            .filter(ni => ni.kind !== "loopback")
+            .map(ni => `${ni.name}/${ni.rawIPv6Address}`)
+        },  
         "control-socket": {
           "socket-type": "unix",
           "socket-name": "/run/kea/6-ctrl-socket"

package/src/subnet.mjs

@@ -2,7 +2,8 @@ import {
   normalizeCIDR,
   isLinkLocal,
   isIPv4Address,
-  isIPv6Address
+  isIPv6Address,
+  addressWithPrefixLength
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
@@ -62,23 +63,14 @@ export class Subnet extends Base {
   }
 
   get addressRange() {
-    const l = this.prefixLength;
-    return l === 24
-      ? [this.prefix + ".0", this.prefix + ".255"]
-      : [this.prefix + ".0.0", this.prefix + ".255.255"];
+    return [
+      addressWithPrefixLength(this.prefix, this.prefixLength),
+      this.prefix + ".255".repeat((32 - this.prefixLength) / 8)
+    ];
   }
 
   get longPrefix() {
-    const prefix = this.prefix;
-
-    switch (this.prefixLength) {
-      case 24:
-        return prefix + ".0";
-      case 16:
-        return prefix + ".0.0";
-    }
-
-    return prefix;
+    return addressWithPrefixLength(this.prefix, this.prefixLength);
   }
 
   get prefix() {

package/src/utils.mjs

@@ -143,6 +143,15 @@ const ipv6 = {
   base: 16
 };
 
+export function addressWithPrefixLength(address, prefixLength) {
+  const definition = ipv4;
+
+  return (
+    address +
+    ".0".repeat((definition.length - prefixLength) / definition.segmentLength)
+  );
+}
+
 function _decode(definition, address, length = definition.length) {
   if (typeof address === "string") {
     return address;

package/types/host.d.mts

@@ -430,6 +430,8 @@ export class NetworkInterface extends Base {
     set ipAddresses(value: Map<any, any>);
     get ipAddresses(): Map<any, any>;
     get rawAddress(): any;
+    get rawIPv4Address(): any;
+    get rawIPv6Address(): any;
     get rawAddresses(): any[];
     get cidrAddress(): any;
     get cidrAddresses(): any[];

package/types/utils.d.mts

@@ -11,6 +11,7 @@ export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): boolean;
 export function isLocalhost(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
+export function addressWithPrefixLength(address: any, prefixLength: any): string;
 export function _encode(definition: any, address: any): any;
 export function decodeIPv6(address: any, length: any): string;
 export function encodeIPv6(address: any): any;