pmcf 6.44.7 → 6.44.9

package/package.json

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

package/src/common-attributes.mjs

@@ -155,11 +155,9 @@ export const networkAttributes = {
   multicastDNS: { ...boolean_attribute_writable, name: "multicastDNS" }
 };
 
-
 export const networkAddressAttributes = {
   hostName: hostname_attribute,
   cidrAddresses: cidr_addresses_attribute,
-  cidrAddress: cidr_address_attribute,
   addresses: { ...string_collection_attribute_writable, name: "addresses" },
   address: address_attribute
 };

package/src/host.mjs

@@ -9,7 +9,7 @@ import {
   priority_attribute,
   asArray
 } from "pacc";
-import { addresses, addType, assign } from "pmcf";
+import { cidrAddresses, addresses, addType, assign } from "pmcf";
 import {
   networkAddressAttributes,
   networkInterfaces_attribute,
@@ -297,6 +297,10 @@ export class Host extends ServiceOwner {
     return addresses(this.networkAddresses());
   }
 
+  get cidrAddresses() {
+    return cidrAddresses(this.networkAddresses());
+  }
+
   get subnets() {
     return new AggregatedMap(
       [...this.networkInterfaces.values()].map(ni => ni.subnets)

package/src/network-interfaces/network-interface.mjs

@@ -1,8 +1,7 @@
 import { join } from "node:path";
 import {
   string_attribute_writable,
-  default_collection_attribute_writable,
-  number_attribute_writable
+  default_collection_attribute_writable
 } from "pacc";
 import { network_attribute } from "../common-attributes.mjs";
 import { Host, cidrAddresses, addType } from "pmcf";
@@ -53,9 +52,9 @@ export class NetworkInterface extends SkeletonNetworkInterface {
       private: true
     },
     hwaddr: { ...string_attribute_writable, name: "hwaddr" },
-    destination: { ...string_attribute_writable, name: "destination" },
+    destination: { ...string_attribute_writable, name: "destination" }
 
-/*
+    /*
     InitialCongestionWindow: { ...number_attribute_writable, name: "InitialCongestionWindow", default: 10, configurable: true },
     InitialAdvertisedReceiveWindow: { ...number_attribute_writable, name: "InitialAdvertisedReceiveWindow", default: 10, configurable: true },
     */
@@ -73,6 +72,10 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   _hwaddr;
   _class;
 
+  get cidrAddresses() {
+    return cidrAddresses(this.networkAddresses());
+  }
+
   addSubnet(address) {
     if (this.network) {
       return this.network.addSubnet(address);
@@ -113,7 +116,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   set hostName(value) {
     this._hostName = value;
   }
-  
+
   get domains() {
     if (!this.host) {
       return new Set();