pmcf 2.60.5 → 2.60.6
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 +2 -2
- package/src/services/kea.mjs +9 -16
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pmcf",
|
|
3
|
-
"version": "2.60.
|
|
3
|
+
"version": "2.60.6",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"pkg-dir": "^8.0.0"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@types/node": "^22.15.
|
|
54
|
+
"@types/node": "^22.15.23",
|
|
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: family
|
|
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)
|
|
@@ -362,13 +362,14 @@ export class KeaService extends Service {
|
|
|
362
362
|
.map(([k, networkInterface]) => {
|
|
363
363
|
let ip = {};
|
|
364
364
|
let addr = networkInterface.networkAddress(
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
if(addr && subnet.matchesAddress(addr)) {
|
|
369
|
-
ip =
|
|
370
|
-
|
|
371
|
-
|
|
365
|
+
n => n.family === `IPv${family}`
|
|
366
|
+
)?.address;
|
|
367
|
+
|
|
368
|
+
if (addr && subnet.matchesAddress(addr)) {
|
|
369
|
+
ip =
|
|
370
|
+
family == 6
|
|
371
|
+
? { "ip-addresses": [addr] }
|
|
372
|
+
: { "ip-address": addr };
|
|
372
373
|
}
|
|
373
374
|
|
|
374
375
|
return {
|
|
@@ -429,14 +430,6 @@ export class KeaService extends Service {
|
|
|
429
430
|
pools: subnet.dhcpPools.map(range => {
|
|
430
431
|
return { pool: range.join(" - ") };
|
|
431
432
|
}),
|
|
432
|
-
|
|
433
|
-
/*"pd-pools": [
|
|
434
|
-
{
|
|
435
|
-
prefix: "2001:db8:8::",
|
|
436
|
-
"prefix-len": 56,
|
|
437
|
-
"delegated-len": 64
|
|
438
|
-
}
|
|
439
|
-
],*/
|
|
440
433
|
reservations: reservations(subnet, "6")
|
|
441
434
|
};
|
|
442
435
|
})
|