pmcf 1.35.0 → 1.35.2

package/bin/pmcf-named-defs

@@ -80,13 +80,13 @@ async function generateNamedDefs(owner, targetDir) {
     for (const subnet of owner.subnets()) {
       if (subnet.prefix) {
         const reverseArpa = reverseArpaAddress(subnet.prefix);
-        const zone = {
+        const reverseZone = {
           id: reverseArpa,
           file: `${reverseArpa}.zone`,
           records: new Set([SOARecord, NSRecord])
         };
-        zones.push(zone);
-        subnet.reverseZone = zone;
+        zones.push(reverseZone);
+        subnet.reverseZone = reverseZone;
       }
     }
 

package/package.json

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

package/src/utils.mjs

@@ -40,6 +40,10 @@ export function isIPv6Address(address) {
   return address.indexOf(":") >= 0;
 }
 
+export function isLinkLocal(address) {
+  return address.startsWith("fe80");
+}
+
 export function normalizeIPAddress(address) {
   address = address.replace(/\/\d+$/, "");
   if (isIPv4Address(address)) {
@@ -53,20 +57,51 @@ 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(/\//);
 
-  if (prefixLength) {
-    if (isIPv4Address(prefix)) {
-      const parts = prefix.split(/\./);
-      prefix = parts.slice(0, prefixLength / 8).join(".");
+  if (!prefixLength && isLinkLocal(address)) {
+    prefix = "fe80::";
+    prefixLength = 64;
+  } else {
+    if (prefixLength) {
+      if (isIPv4Address(prefix)) {
+        let n = encodeIPv4(prefix);
+        n = n & (0xffffffff << (32 - prefixLength));
+        prefix = decodeIPv4(n, prefixLength);
+      } else {
+        prefix = normalizeIPAddress(prefix);
+        const parts = prefix.split(/\:/);
+        prefix = parts.slice(0, prefixLength / 16).join(":");
+      }
     } else {
-      prefix = normalizeIPAddress(prefix);
+      return {};
     }
   }
-  else {
-    return {};
-  }
 
   return { prefix, prefixLength, cidr: `${prefix}/${prefixLength}` };
 }

package/types/utils.d.mts

@@ -4,6 +4,7 @@ export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
 export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
+export function isLinkLocal(address: any): any;
 export function normalizeIPAddress(address: any): any;
 export function normalizeCIDR(address: any): {
     prefix?: undefined;