node-mbed-dtls - npm Package Compare versions

Comparing version 2.3.4 to 2.4.0

CHANGELOG.md

@@ -0,1 +1,5 @@
+# 2.4.0
+
+* Handle DTLS packets with content type of 254 as IP change packets.
+
 # 2.3.4
@@ -2,0 +6,0 @@

package.json

 {
   "name": "node-mbed-dtls",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "Node mbed DTLS",
@@ -5,0 +5,0 @@ "main": "index.js",

server.js

@@ -86,5 +86,72 @@ 'use strict';
 
-	_onMessage(msg, rinfo) {
+	_handleIpChange(msg, key, rinfo, deviceId) {
+		const lookedUp = this.emit('lookupKey', deviceId, (err, oldRinfo) => {
+			if (!err && oldRinfo) {
+				this._onMessage(msg, oldRinfo, (client, received) => {
+					// if the message went through OK
+					if (received) {
+						// change IP
+						client.remoteAddress = rinfo.address;
+						client.remotePort = rinfo.port;
+						// move in lookup table
+						this.sockets[key] = client;
+						const oldKey = `${oldRinfo.address}:${oldRinfo.port}`;
+						delete this.sockets[oldKey];
+						// tell the world
+						client.emit('ipChanged', oldRinfo);
+					}
+				});
+			}
+		});
+		return lookedUp;
+	}
+
+	_attemptResume(client, msg, key, cb) {
+		const lcb = cb || (() => {});
+		const called = this.emit('resumeSession', key, client, (err, session) => {
+			if (!err && session) {
+				const resumed = client.resumeSession(session);
+				if (resumed) {
+					client.cork();
+
+					const received = client.receive(msg);
+					// callback before secureConnection so
+					// IP can be changed
+					lcb(client, received);
+					if (received) {
+						this.emit('secureConnection', client, session);
+					}
+
+					client.uncork();
+					return;
+				}
+			}
+			client.receive(msg);
+			lcb(null, false);
+		});
+
+		// if somebody was listening, session will attempt to be resumed
+		// do not process with receive until resume finishes
+		return called;
+	}
+
+	_onMessage(msg, rinfo, cb) {
 		const key = `${rinfo.address}:${rinfo.port}`;
 
+		// special IP changed content type
+		if (msg.length > 0 && msg[0] === 254) {
+			rinfo.port = 7777;
+			const idLen = msg[msg.length - 1];
+			const idStartIndex = msg.length - idLen - 1;
+			const deviceId = msg.slice(idStartIndex, idStartIndex + idLen).toString('hex').toLowerCase();
+
+			// slice off id and length, return content type to ApplicationData
+			msg = msg.slice(0, idStartIndex);
+			msg[0] = 23;
+
+			if (this._handleIpChange(msg, key, rinfo, deviceId)) {
+				return;
+			}
+		}
+
 		let client = this.sockets[key];
@@ -96,19 +163,3 @@ if (!client) {
 			if (msg.length > 0 && msg[0] === 23) {
-				const called = this.emit('resumeSession', key, client, (err, session) => {
-					if (!err && session) {
-						if (client.resumeSession(session)) {
-							client.cork();
-							if (client.receive(msg)) {
-								this.emit('secureConnection', client, session);
-							}
-							client.uncork();
-							return;
-						}
-					}
-					client.receive(msg);
-				});
-
-				// if somebody was listening, session will attempt to be resumed
-				// do not process with receive until resume finishes
-				if (called) {
+				if (this._attemptResume(client, msg, key, cb)) {
 					return;
@@ -119,3 +170,12 @@ }
 
-		client.receive(msg);
+		if (cb) {
+			// we cork because we want the callback to happen
+			// before the implications of the message do
+			client.cork();
+			const received = client.receive(msg);
+			cb(client, received);
+			client.uncork();
+		} else {
+			client.receive(msg);
+		}
 	}
@@ -122,0 +182,0 @@

No alert changes

Improved metrics

Total package byte prevSize

8851295

increased by0.02%

Lines of code

541

increased by10.86%

No dependency changes