pmcf 1.35.1 → 1.35.3

package/bin/pmcf-named-defs

@@ -78,7 +78,7 @@ async function generateNamedDefs(owner, targetDir) {
     zones.push(zone);
 
     for (const subnet of owner.subnets()) {
-      if (subnet.prefix) {
+      if (!subnet.isLinkLocal && subnet.prefix) {
         const reverseArpa = reverseArpaAddress(subnet.prefix);
         const reverseZone = {
           id: reverseArpa,
@@ -108,7 +108,6 @@ async function generateNamedDefs(owner, targetDir) {
         );
         hosts.add(host);
         for (const service of host.services()) {
-          //console.log(service.name);
           if (service.master && service.alias) {
             zone.records.add(
               createRecord(service.alias, "CNAME", `${host.domainName}.`)
@@ -133,7 +132,7 @@ async function generateNamedDefs(owner, targetDir) {
 
       const reverseZone = networkInterface.network.subnet?.reverseZone;
 
-      if (reverseZone && isIPv4Address(address)) {
+      if (reverseZone) {
         reverseZone.records.add(
           createRecord(
             reverseArpaAddress(address) + ".",

package/package.json

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

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { asArray, normalizeCIDR } from "./utils.mjs";
+import { asArray, normalizeCIDR, isLinkLocal } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
 
@@ -368,6 +368,11 @@ export class Subnet extends Base {
     return address.startsWith(this.prefix);
   }
 
+  get isLinkLocal()
+  {
+    return isLinkLocal(this.address);
+  }
+
   get prefix() {
     const [prefix] = this.name.split("/");
     return prefix;

package/src/utils.mjs

@@ -57,6 +57,30 @@ export function normalizeIPAddress(address) {
   return parts.map(s => s.padStart(4, "0")).join(":");
 }
 
+function encodeIPv4(address) {
+  const octets = [0, 0, 0, 0];
+
+  let i = 0;
+  for (const a of address.split(/\./)) {
+    octets[i++] = parseInt(a);
+  }
+
+  return (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + octets[3];
+}
+
+function decodeIPv4(address, length = 32) {
+  const octets = [
+    (address >> 24) & 0xff,
+    (address >> 16) & 0xff,
+    (address >> 8) & 0xff,
+    address & 0xff
+  ];
+
+  octets.length = Math.ceil(length / 8);
+
+  return octets.join(".");
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
 
@@ -66,8 +90,9 @@ export function normalizeCIDR(address) {
   } else {
     if (prefixLength) {
       if (isIPv4Address(prefix)) {
-        const parts = prefix.split(/\./);
-        prefix = parts.slice(0, prefixLength / 8).join(".");
+        let n = encodeIPv4(prefix);
+        n = n & (0xffffffff << (32 - prefixLength));
+        prefix = decodeIPv4(n, prefixLength);
       } else {
         prefix = normalizeIPAddress(prefix);
         const parts = prefix.split(/\:/);

package/types/owner.d.mts

@@ -43,6 +43,7 @@ export class Network extends Owner {
 export class Subnet extends Base {
     networks: Set<any>;
     matchesAddress(address: any): any;
+    get isLinkLocal(): any;
     get prefix(): any;
     get prefixLength(): number;
     get address(): any;