node-ikev2 0.1.4 → 0.3.0

package/lib/src/ip-address.d.ts

@@ -0,0 +1,6 @@
+export declare function parseIPv4AddressString(addressString: string): Buffer;
+export declare function formatIPv4AddressBuffer(buffer: Buffer): string;
+export declare function parseIPv6AddressString(addressString: string): Buffer;
+export declare function formatIPv6AddressBuffer(addressBuffer: Buffer): string;
+export declare function parseIPAddressString(addressString: string): Buffer;
+export declare function formatIPAddressBuffer(addressBuffer: Buffer): string;

package/lib/src/ip-address.js

@@ -0,0 +1,159 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseIPv4AddressString = parseIPv4AddressString;
+exports.formatIPv4AddressBuffer = formatIPv4AddressBuffer;
+exports.parseIPv6AddressString = parseIPv6AddressString;
+exports.formatIPv6AddressBuffer = formatIPv6AddressBuffer;
+exports.parseIPAddressString = parseIPAddressString;
+exports.formatIPAddressBuffer = formatIPAddressBuffer;
+function parseIPv4AddressString(addressString) {
+    if (addressString.length === 0) {
+        throw new Error(`Invalid IPv4 address ${addressString}`);
+    }
+    const buffer = Buffer.alloc(4);
+    const stringParts = addressString.split(".");
+    const parts = stringParts.map((p) => {
+        if (!/^\d+$/.test(p)) {
+            throw new Error(`Invalid IPv4 address ${addressString}: part "${p}" contains non-digit characters.`);
+        }
+        const parsed = parseInt(p, 10);
+        if (parsed < 0 || parsed > 255) {
+            throw new Error(`Invalid IPv4 address ${addressString}: part "${p}" is not a valid octet.`);
+        }
+        return parsed;
+    });
+    if (parts.length !== 4) {
+        throw new Error(`Invalid IPv4 address ${addressString}`);
+    }
+    buffer.writeUInt8(parts[0], 0);
+    buffer.writeUInt8(parts[1], 1);
+    buffer.writeUInt8(parts[2], 2);
+    buffer.writeUInt8(parts[3], 3);
+    return buffer;
+}
+function formatIPv4AddressBuffer(buffer) {
+    if (buffer.length === 0) {
+        throw new Error(`Invalid IPv4 address ${buffer}`);
+    }
+    if (buffer.length !== 4) {
+        throw new Error(`Invalid IPv4 address ${buffer}`);
+    }
+    const parts = [
+        buffer.readUInt8(0),
+        buffer.readUInt8(1),
+        buffer.readUInt8(2),
+        buffer.readUInt8(3),
+    ];
+    return parts.join(".");
+}
+function parseIPv6AddressString(addressString) {
+    if (addressString.length === 0) {
+        return Buffer.alloc(0);
+    }
+    const buffer = Buffer.alloc(16);
+    let parts;
+    let zeroFillCount = 0;
+    let currentBufferIndex = 0;
+    if (addressString.includes("::")) {
+        const partsSplitted = addressString.split("::");
+        if (partsSplitted.length > 2) {
+            throw new Error(`Invalid IPv6 address ${addressString}: multiple '::' sequences.`);
+        }
+        const [beforeDoubleColon, afterDoubleColon] = partsSplitted;
+        const beforeParts = beforeDoubleColon.split(":").filter((p) => p !== "");
+        const afterParts = afterDoubleColon.split(":").filter((p) => p !== "");
+        // Calculate how many zero groups are needed for '::'
+        zeroFillCount = 8 - (beforeParts.length + afterParts.length);
+        if (zeroFillCount < 0) {
+            throw new Error(`Invalid IPv6 address ${addressString}: too many parts for '::' expansion.`);
+        }
+        parts = [...beforeParts];
+        for (let i = 0; i < zeroFillCount; i++) {
+            parts.push("0"); // Represent the zero groups
+        }
+        parts.push(...afterParts);
+    }
+    else {
+        parts = addressString.split(":");
+    }
+    if (parts.length !== 8) {
+        throw new Error(`Invalid IPv6 address ${addressString}: expected 8 parts, got ${parts.length}.`);
+    }
+    for (let i = 0; i < 8; i++) {
+        const part = parts[i];
+        if (part.length > 4) {
+            throw new Error(`Invalid IPv6 address ${addressString}: part length: ${part}`);
+        }
+        const value = parseInt(part, 16);
+        if (isNaN(value) || value < 0 || value > 0xffff) {
+            throw new Error(`Invalid IPv6 address ${addressString}: part: ${part}`);
+        }
+        buffer.writeUInt16BE(value, currentBufferIndex);
+        currentBufferIndex += 2;
+    }
+    return buffer;
+}
+function formatIPv6AddressBuffer(addressBuffer) {
+    if (addressBuffer.length === 0) {
+        return "";
+    }
+    if (addressBuffer.length !== 16) {
+        throw new Error(`Invalid buffer length for IPv6 address ${addressBuffer}: expected 16 bytes.`);
+    }
+    const parts = Array.from({ length: 8 }, (_, i) => addressBuffer
+        .readUInt16BE(i * 2)
+        .toString(16)
+        .replace(/^0+/, "") || "0");
+    let maxZeroLength = 0;
+    let maxZeroIndex = -1;
+    let currentZeroLength = 0;
+    let currentZeroIndex = -1;
+    for (let i = 0; i < parts.length; i++) {
+        if (parts[i] === "0") {
+            if (currentZeroLength === 0) {
+                currentZeroIndex = i;
+            }
+            currentZeroLength++;
+        }
+        else {
+            if (currentZeroLength > maxZeroLength) {
+                maxZeroLength = currentZeroLength;
+                maxZeroIndex = currentZeroIndex;
+            }
+            currentZeroLength = 0;
+        }
+    }
+    if (currentZeroLength > maxZeroLength) {
+        maxZeroLength = currentZeroLength;
+        maxZeroIndex = currentZeroIndex;
+    }
+    if (maxZeroLength > 1) {
+        const before = parts.slice(0, maxZeroIndex).join(":");
+        const after = parts.slice(maxZeroIndex + maxZeroLength).join(":");
+        return `${before}::${after}`;
+    }
+    else {
+        return parts.join(":");
+    }
+}
+function parseIPAddressString(addressString) {
+    if (addressString.length === 0) {
+        return Buffer.alloc(0);
+    }
+    if (addressString.includes(":")) {
+        return parseIPv6AddressString(addressString);
+    }
+    return parseIPv4AddressString(addressString);
+}
+function formatIPAddressBuffer(addressBuffer) {
+    if (addressBuffer.length === 0) {
+        return "";
+    }
+    if (addressBuffer.length === 4) {
+        return formatIPv4AddressBuffer(addressBuffer);
+    }
+    if (addressBuffer.length === 16) {
+        return formatIPv6AddressBuffer(addressBuffer);
+    }
+    throw new Error(`Invalid buffer length for IP address ${addressBuffer}: expected 4 or 16 bytes.`);
+}

package/lib/src/payload.d.ts

@@ -106,7 +106,6 @@ export declare class PayloadSA extends Payload {
     nextPayload: payloadType;
     proposals: Proposal[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, proposals: Proposal[], critical?: boolean, length?: number);
     /**
      * Parses a Security Association Payload from a buffer
@@ -153,7 +152,6 @@ export declare class PayloadKE extends Payload {
     dhGroup: number;
     keyData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, dhGroup: number, keyData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Key Exchange Payload from a buffer
@@ -213,7 +211,6 @@ export declare class PayloadID extends Payload {
     idType: number;
     idData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an Identification Payload from a buffer
@@ -260,7 +257,6 @@ export declare class PayloadIDi extends PayloadID {
     idType: number;
     idData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical?: boolean, length?: number);
 }
 /**
@@ -273,8 +269,7 @@ export declare class PayloadIDr extends PayloadID {
     idType: number;
     idData: Buffer;
     critical: boolean;
-    length: number;
-    constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical: boolean, length: number);
+    constructor(nextPayload: payloadType, idType: number, idData: Buffer, critical?: boolean, length?: number);
 }
 /**
  * IKEv2 Notify Message Types
@@ -307,7 +302,6 @@ export declare class PayloadCERT extends Payload {
     certEncoding: number;
     certData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, certEncoding: number, certData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Certificate Payload from a buffer
@@ -354,7 +348,6 @@ export declare class PayloadCERTREQ extends Payload {
     certEncoding: number;
     certAuthority: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, certEncoding: number, certAuthority: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Certificate Request Payload from a buffer
@@ -401,7 +394,6 @@ export declare class PayloadAUTH extends Payload {
     authMethod: number;
     authData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, authMethod: number, authData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an Authentication Payload from a buffer
@@ -447,7 +439,6 @@ export declare class PayloadNONCE extends Payload {
     nextPayload: payloadType;
     nonceData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, nonceData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Nonce Payload from a buffer
@@ -593,7 +584,6 @@ export declare class PayloadNOTIFY extends Payload {
     spi: Buffer;
     notifyData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, protocolId: securityProtocolId, spiSize: number, notifyType: number, spi: Buffer, notifyData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Notify Payload from a buffer
@@ -642,7 +632,6 @@ export declare class PayloadDELETE extends Payload {
     numSpi: number;
     spis: Buffer[];
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, protocolId: number, spiSize: number, numSpi: number, spis: Buffer[], critical?: boolean, length?: number);
     /**
      * Parses a Delete Payload from a buffer
@@ -688,7 +677,6 @@ export declare class PayloadVENDOR extends Payload {
     nextPayload: payloadType;
     vendorId: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, vendorId: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Vendor ID Payload from a buffer
@@ -732,11 +720,10 @@ export declare class PayloadVENDOR extends Payload {
  */
 export declare class PayloadTS extends Payload {
     nextPayload: payloadType;
-    numTs: number;
+    tsType: payloadType;
     tsList: TrafficSelector[];
     critical: boolean;
-    length: number;
-    constructor(nextPayload: payloadType, numTs: number, tsList: TrafficSelector[], critical?: boolean, length?: number);
+    constructor(nextPayload: payloadType, tsType: payloadType, tsList: TrafficSelector[], critical?: boolean, length?: number);
     /**
      * Parses a Traffic Selector Payload from a buffer
      * @param buffer
@@ -779,11 +766,9 @@ export declare class PayloadTS extends Payload {
  */
 export declare class PayloadTSi extends PayloadTS {
     nextPayload: payloadType;
-    numTs: number;
     tsList: TrafficSelector[];
     critical: boolean;
-    length: number;
-    constructor(nextPayload: payloadType, numTs: number, tsList: TrafficSelector[], critical?: boolean, length?: number);
+    constructor(nextPayload: payloadType, tsList: TrafficSelector[], critical?: boolean, length?: number);
 }
 /**
  * IKEv2 Traffic Selector - Responder Payload
@@ -792,11 +777,9 @@ export declare class PayloadTSi extends PayloadTS {
  */
 export declare class PayloadTSr extends PayloadTS {
     nextPayload: payloadType;
-    numTs: number;
     tsList: TrafficSelector[];
     critical: boolean;
-    length: number;
-    constructor(nextPayload: payloadType, numTs: number, tsList: TrafficSelector[], critical?: boolean, length?: number);
+    constructor(nextPayload: payloadType, tsList: TrafficSelector[], critical?: boolean, length?: number);
 }
 /**
  * IKEv2 Encrypted and Authenticated Payload
@@ -807,7 +790,6 @@ export declare class PayloadSK extends Payload {
     nextPayload: payloadType;
     encryptedData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, encryptedData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an SK Payload from a buffer
@@ -914,7 +896,6 @@ export declare class PayloadCP extends Payload {
     cfgType: number;
     cfgData: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, cfgType: number, cfgData: Buffer, critical?: boolean, length?: number);
     /**
      * Parses a Configuration Payload from a buffer
@@ -960,7 +941,6 @@ export declare class PayloadEAP extends Payload {
     nextPayload: payloadType;
     eapMessage: Buffer;
     critical: boolean;
-    length: number;
     constructor(nextPayload: payloadType, eapMessage: Buffer, critical?: boolean, length?: number);
     /**
      * Parses an EAP Payload from a buffer

package/lib/src/payload.js

@@ -226,7 +226,6 @@ class PayloadSA extends Payload {
         this.nextPayload = nextPayload;
         this.proposals = proposals;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Security Association Payload from a buffer
@@ -339,7 +338,6 @@ class PayloadKE extends Payload {
         this.dhGroup = dhGroup;
         this.keyData = keyData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Key Exchange Payload from a buffer
@@ -469,12 +467,11 @@ var IDType;
  */
 class PayloadID extends Payload {
     constructor(nextPayload, idType, idData, critical = false, length = 0) {
-        super(payloadType.NONE, nextPayload, critical, length > 0 ? length : 5 + idData.length);
+        super(payloadType.NONE, nextPayload, critical, length > 0 ? length : 8 + idData.length);
         this.nextPayload = nextPayload;
         this.idType = idType;
         this.idData = idData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an Identification Payload from a buffer
@@ -593,12 +590,11 @@ exports.PayloadID = PayloadID;
  */
 class PayloadIDi extends PayloadID {
     constructor(nextPayload, idType, idData, critical = false, length = 0) {
-        super(nextPayload, idType, idData, critical, length > 0 ? length : 5 + idData.length);
+        super(nextPayload, idType, idData, critical, length > 0 ? length : 8 + idData.length);
         this.nextPayload = nextPayload;
         this.idType = idType;
         this.idData = idData;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.IDi;
     }
 }
@@ -609,13 +605,12 @@ exports.PayloadIDi = PayloadIDi;
  * @extends PayloadID
  */
 class PayloadIDr extends PayloadID {
-    constructor(nextPayload, idType, idData, critical, length) {
-        super(nextPayload, idType, idData, critical, length > 0 ? length : 5 + idData.length);
+    constructor(nextPayload, idType, idData, critical = false, length = 0) {
+        super(nextPayload, idType, idData, critical, length > 0 ? length : 8 + idData.length);
         this.nextPayload = nextPayload;
         this.idType = idType;
         this.idData = idData;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.IDr;
     }
 }
@@ -654,7 +649,6 @@ class PayloadCERT extends Payload {
         this.certEncoding = certEncoding;
         this.certData = certData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Certificate Payload from a buffer
@@ -740,7 +734,6 @@ class PayloadCERTREQ extends Payload {
         this.certEncoding = certEncoding;
         this.certAuthority = certAuthority;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Certificate Request Payload from a buffer
@@ -813,12 +806,11 @@ exports.PayloadCERTREQ = PayloadCERTREQ;
  */
 class PayloadAUTH extends Payload {
     constructor(nextPayload, authMethod, authData, critical = false, length = 0) {
-        super(payloadType.AUTH, nextPayload, critical, length > 0 ? length : 5 + authData.length);
+        super(payloadType.AUTH, nextPayload, critical, length > 0 ? length : 8 + authData.length);
         this.nextPayload = nextPayload;
         this.authMethod = authMethod;
         this.authData = authData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an Authentication Payload from a buffer
@@ -901,7 +893,6 @@ class PayloadNONCE extends Payload {
         this.nextPayload = nextPayload;
         this.nonceData = nonceData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Nonce Payload from a buffer
@@ -1079,7 +1070,6 @@ class PayloadNOTIFY extends Payload {
         this.spi = spi;
         this.notifyData = notifyData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Notify Payload from a buffer
@@ -1176,7 +1166,6 @@ class PayloadDELETE extends Payload {
         this.numSpi = numSpi;
         this.spis = spis;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Delete Payload from a buffer
@@ -1279,7 +1268,6 @@ class PayloadVENDOR extends Payload {
         this.nextPayload = nextPayload;
         this.vendorId = vendorId;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Vendor ID Payload from a buffer
@@ -1347,13 +1335,12 @@ exports.PayloadVENDOR = PayloadVENDOR;
  * @extends Payload
  */
 class PayloadTS extends Payload {
-    constructor(nextPayload, numTs, tsList, critical = false, length = 0) {
-        super(payloadType.NONE, nextPayload, critical, length > 0 ? length : 5 + tsList.reduce((acc, ts) => acc + ts.length, 0));
+    constructor(nextPayload, tsType, tsList, critical = false, length = 0) {
+        super(tsType, nextPayload, critical, length > 0 ? length : 8 + tsList.reduce((acc, ts) => acc + ts.length, 0));
         this.nextPayload = nextPayload;
-        this.numTs = numTs;
+        this.tsType = tsType;
         this.tsList = tsList;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Traffic Selector Payload from a buffer
@@ -1372,7 +1359,7 @@ class PayloadTS extends Payload {
             tsList.push(ts);
             offset += ts.length;
         }
-        return new PayloadTS(genericPayload.nextPayload, numTs, tsList, genericPayload.critical, genericPayload.length);
+        return new PayloadTS(genericPayload.nextPayload, genericPayload.type, tsList, genericPayload.critical, genericPayload.length);
     }
     /**
      * Serializes a JSON representation of the TS payload to a buffer
@@ -1387,7 +1374,7 @@ class PayloadTS extends Payload {
         const genericPayload = Payload.serializeJSON(json);
         genericPayload.copy(buffer);
         buffer.writeUInt8(json.numTs, 4);
-        const tsListBuffer = ((_a = json.tList) === null || _a === void 0 ? void 0 : _a.lenght) > 0
+        const tsListBuffer = ((_a = json.tsList) === null || _a === void 0 ? void 0 : _a.length) > 0
             ? json.tsList.map((ts) => selector_1.TrafficSelector.serializeJSON(ts))
             : [Buffer.alloc(0)];
         let offset = 8;
@@ -1404,13 +1391,16 @@ class PayloadTS extends Payload {
      */
     serialize() {
         // Encode deep first to calculate length
+        if (this.tsList.length > 255) {
+            throw new Error(`Too many traffic selectors ${this.tsList.length}`);
+        }
         const tsListBuffer = this.tsList.map((ts) => ts.serialize());
         const tsBuffer = Buffer.concat(tsListBuffer);
         // Fix the length
-        this.length = 5 + tsBuffer.length;
+        this.length = 8 + tsBuffer.length;
         const buffer = Buffer.alloc(this.length);
         super.serialize().copy(buffer);
-        buffer.writeUInt8(this.numTs, 4);
+        buffer.writeUInt8(this.tsList.length, 4);
         // No need to blank 3 reserved bytes, Buffer.alloc does that
         tsBuffer.copy(buffer, 8);
         return buffer;
@@ -1422,7 +1412,6 @@ class PayloadTS extends Payload {
      */
     toJSON() {
         const json = super.genToJSON();
-        json.numTs = this.numTs;
         json.tsList = this.tsList.map((ts) => ts.toJSON());
         return json;
     }
@@ -1433,7 +1422,7 @@ class PayloadTS extends Payload {
      */
     toString() {
         const genericString = super.genToString();
-        return `${genericString}\nnumTs: ${this.numTs}\ntsList: ${this.tsList.map((ts) => ts.toString()).join(", ")}`;
+        return `${genericString}\ntsList: ${this.tsList.map((ts) => ts.toString()).join(", ")}`;
     }
 }
 exports.PayloadTS = PayloadTS;
@@ -1443,13 +1432,11 @@ exports.PayloadTS = PayloadTS;
  * @extends Payload
  */
 class PayloadTSi extends PayloadTS {
-    constructor(nextPayload, numTs, tsList, critical = false, length = 0) {
-        super(nextPayload, numTs, tsList, critical, length > 0 ? length : 5 + tsList.reduce((acc, ts) => acc + ts.length, 0));
+    constructor(nextPayload, tsList, critical = false, length = 0) {
+        super(nextPayload, payloadType.TSi, tsList, critical, length);
         this.nextPayload = nextPayload;
-        this.numTs = numTs;
         this.tsList = tsList;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.TSi;
     }
 }
@@ -1460,13 +1447,11 @@ exports.PayloadTSi = PayloadTSi;
  * @extends Payload
  */
 class PayloadTSr extends PayloadTS {
-    constructor(nextPayload, numTs, tsList, critical = false, length = 0) {
-        super(nextPayload, numTs, tsList, critical, length > 0 ? length : 5 + tsList.reduce((acc, ts) => acc + ts.length, 0));
+    constructor(nextPayload, tsList, critical = false, length = 0) {
+        super(nextPayload, payloadType.TSr, tsList, critical, length);
         this.nextPayload = nextPayload;
-        this.numTs = numTs;
         this.tsList = tsList;
         this.critical = critical;
-        this.length = length;
         this.type = payloadType.TSr;
     }
 }
@@ -1482,7 +1467,6 @@ class PayloadSK extends Payload {
         this.nextPayload = nextPayload;
         this.encryptedData = encryptedData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an SK Payload from a buffer
@@ -1667,12 +1651,11 @@ var cfgType;
  */
 class PayloadCP extends Payload {
     constructor(nextPayload, cfgType, cfgData, critical = false, length = 0) {
-        super(payloadType.CP, nextPayload, critical, length > 0 ? length : 5 + cfgData.length);
+        super(payloadType.CP, nextPayload, critical, length > 0 ? length : 8 + cfgData.length);
         this.nextPayload = nextPayload;
         this.cfgType = cfgType;
         this.cfgData = cfgData;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses a Configuration Payload from a buffer
@@ -1684,7 +1667,7 @@ class PayloadCP extends Payload {
     static parse(buffer) {
         const genericPayload = Payload.parse(buffer);
         const cfgType = buffer.readUInt8(4);
-        const cfgData = buffer.subarray(5, genericPayload.length);
+        const cfgData = buffer.subarray(8, genericPayload.length);
         return new PayloadCP(genericPayload.nextPayload, cfgType, cfgData, genericPayload.critical, genericPayload.length);
     }
     /**
@@ -1699,10 +1682,7 @@ class PayloadCP extends Payload {
         const genericPayload = Payload.serializeJSON(json);
         genericPayload.copy(buffer);
         buffer.writeUInt8(json.cfgType, 4);
-        // Write 3-byte reserved field as zeros in big-endian order
-        buffer.writeUInt8(0, 5);
-        buffer.writeUInt8(0, 6);
-        buffer.writeUInt8(0, 7);
+        // 3-bytes reserved field as zeros in big-endian order
         Buffer.from(json.cfgData, "hex").copy(buffer, 8);
         return buffer;
     }
@@ -1754,7 +1734,6 @@ class PayloadEAP extends Payload {
         this.nextPayload = nextPayload;
         this.eapMessage = eapMessage;
         this.critical = critical;
-        this.length = length;
     }
     /**
      * Parses an EAP Payload from a buffer

package/lib/src/selector.d.ts

@@ -37,12 +37,12 @@ export declare enum TrafficSelectorType {
 export declare class TrafficSelector {
     type: number;
     protocolId: number;
-    length: number;
     startPort: number;
     endPort: number;
     startAddress: Buffer;
     endAddress: Buffer;
-    constructor(type: number, protocolId: number, length: number, startPort: number, endPort: number, startAddress: Buffer, endAddress: Buffer);
+    length: number;
+    constructor(type: number, protocolId: number, startPort: number, endPort: number, startAddress: Buffer, endAddress: Buffer, length?: number);
     /**
      * Parses a Traffic Selector from a buffer
      * @param buffer The buffer to parse from.