pmcf 3.8.16 → 3.8.18

package/package.json

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

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

@@ -101,9 +101,12 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get gatewayAddress() {
-    for (const a of this.gateway.networkAddresses()) {
-      if (a.networkInterface.network === this.network) {
-        return a.address;
+    const gateway = this.gateway;
+    if (gateway) {
+      for (const a of gateway.networkAddresses()) {
+        if (a.networkInterface.network === this.network) {
+          return a.address;
+        }
       }
     }
   }
@@ -208,7 +211,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     const routeSectionExtra = this.destination
       ? { Destination: this.destination }
-      : { Gateway: this.gatewayAddress };
+      : this.gateway ? { Gateway: this.gatewayAddress } : {};
 
     const networkSectionExtra = this.arpbridge
       ? {

package/src/network-interfaces/tun.mjs

@@ -23,4 +23,6 @@ export class TUNNetworkInterface extends NetworkInterface {
   get kind() {
     return TUNdNetworkInterfaceTypeDefinition.name;
   }
+
+  async systemdDefinitions(packageData) {}
 }

package/src/services/kea.mjs

@@ -402,7 +402,8 @@ export class KeaService extends Service {
           endpoint.type === "dhcp" &&
           endpoint.family === family &&
           endpoint.networkInterface.kind !== "loopback" &&
-          endpoint.networkInterface.kind !== "wlan"
+          endpoint.networkInterface.kind !== "wlan" &&
+          endpoint.networkInterface.kind !== "tun"
       ).map(
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
@@ -411,7 +412,7 @@ export class KeaService extends Service {
       s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
     );
 
-    const pools = (subnet) => {
+    const pools = subnet => {
       return subnet.dhcpPools.map(pool => {
         return { pool: Array.isArray(pool) ? pool.join(" - ") : pool };
       });
@@ -421,7 +422,9 @@ export class KeaService extends Service {
       Dhcp4: {
         ...(await commonConfig("4")),
         subnet4: subnets
-          .filter(s => s.family === "IPv4")
+          .filter(s => s.family === "IPv4" &&
+            // TODO keep out tailscale
+            s.cidr !== "100.64.0.2/32")
           .map((subnet, index) => {
             return {
               id: index + 1,
@@ -442,7 +445,13 @@ export class KeaService extends Service {
       Dhcp6: {
         ...(await commonConfig("6")),
         subnet6: subnets
-          .filter(s => s.family === "IPv6" && !isLinkLocal(s.address))
+          .filter(
+            s =>
+              s.family === "IPv6" &&
+              !isLinkLocal(s.address) &&
+              // TODO keep out tailscale
+              s.cidr !== "fd7a:115c:a1e0::/64"
+          )
           .map((subnet, index) => {
             return {
               id: index + 1,