pmcf 2.60.3 → 2.60.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/services/kea.mjs +7 -4
- package/src/subnet.mjs +2 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pmcf",
|
|
3
|
-
"version": "2.60.
|
|
3
|
+
"version": "2.60.5",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -45,13 +45,13 @@
|
|
|
45
45
|
"lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"ip-utilties": "^1.4.
|
|
48
|
+
"ip-utilties": "^1.4.5",
|
|
49
49
|
"npm-pkgbuild": "^18.2.8",
|
|
50
50
|
"pacc": "^3.4.3",
|
|
51
51
|
"pkg-dir": "^8.0.0"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@types/node": "^22.15.
|
|
54
|
+
"@types/node": "^22.15.22",
|
|
55
55
|
"ava": "^6.3.0",
|
|
56
56
|
"c8": "^10.1.3",
|
|
57
57
|
"documentation": "^14.0.3",
|
package/src/services/kea.mjs
CHANGED
|
@@ -261,7 +261,7 @@ export class KeaService extends Service {
|
|
|
261
261
|
loggers,
|
|
262
262
|
"option-data": [
|
|
263
263
|
{
|
|
264
|
-
name: "domain-name-servers",
|
|
264
|
+
name: family === 4 ? "domain-name-servers" : "dns-servers",
|
|
265
265
|
data: dnsServerEndpoints
|
|
266
266
|
.filter(endpoint => endpoint.family === `IPv${family}`)
|
|
267
267
|
.map(endpoint => endpoint.address)
|
|
@@ -360,17 +360,20 @@ export class KeaService extends Service {
|
|
|
360
360
|
const reservations = (subnet, family) =>
|
|
361
361
|
[...hwmap]
|
|
362
362
|
.map(([k, networkInterface]) => {
|
|
363
|
+
let ip = {};
|
|
363
364
|
let addr = networkInterface.networkAddress(
|
|
364
365
|
n => n.family === `IPv${family}`
|
|
365
366
|
)?.address;
|
|
366
367
|
|
|
367
|
-
if(
|
|
368
|
-
|
|
368
|
+
if(addr && subnet.matchesAddress(addr)) {
|
|
369
|
+
ip = family === "6" ?
|
|
370
|
+
{ "ip-addresses" : [addr]} :
|
|
371
|
+
{ "ip-address" : addr };
|
|
369
372
|
}
|
|
370
373
|
|
|
371
374
|
return {
|
|
372
375
|
"hw-address": k,
|
|
373
|
-
|
|
376
|
+
...ip,
|
|
374
377
|
hostname: networkInterface.domainName,
|
|
375
378
|
"client-classes": ["SKIP_DDNS"]
|
|
376
379
|
};
|
package/src/subnet.mjs
CHANGED
|
@@ -40,12 +40,13 @@ export class Subnet extends Base {
|
|
|
40
40
|
constructor(owner, address) {
|
|
41
41
|
const { longPrefix, prefix, prefixLength, cidr } = normalizeCIDR(address);
|
|
42
42
|
super(owner, cidr);
|
|
43
|
-
owner.addObject(this);
|
|
44
43
|
|
|
45
44
|
this.prefix = prefix;
|
|
46
45
|
this.prefixLength = prefixLength;
|
|
47
46
|
this.longPrefix = longPrefix;
|
|
48
47
|
this.family = familyIP(address);
|
|
48
|
+
|
|
49
|
+
owner.addObject(this);
|
|
49
50
|
}
|
|
50
51
|
|
|
51
52
|
get fullName() {
|