RDP integration fixes.
Ylian Saint-Hilaire committed
May 4, 2022 at 14:18 UTC
fa07d414c63d2b4b66bc391563a276c2f0f2620a
2 files changed
+3
-3
apprelays.js
+2
-2
@@ -114,7 +114,7 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
114
obj.relayActive = true; obj.relaySocket.resume();
115
} else {
116
obj.wsClient._socket.pause();
117
- try { obj.relaySocket.write(data, function () { obj.wsClient._socket.resume(); }); } catch (ex) { obj.close(); }
117
+ try { obj.relaySocket.write(data, function () { try { obj.wsClient._socket.resume(); } catch (ex) { } }); } catch (ex) { obj.close(); }
118
}
119
});
120
obj.wsClient.on('close', function () { parent.parent.debug('relay', 'RDP: Relay websocket closed'); obj.close(); });
@@ -186,7 +186,7 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
186
// Event node change if needed
187
if (changed) {
188
// Event the node change
189
- const event = { etype: 'node', action: 'changenode', nodeid: obj.nodeid, domain: domain.id, userid: obj.cookie.userid, node: parent.CloneSafeNode(node), msg: "Changed RDP credentials" };
189
+ const event = { etype: 'node', action: 'changenode', nodeid: obj.nodeid, domain: domain.id, userid: obj.userid, node: parent.CloneSafeNode(node), msg: "Changed RDP credentials" };
190
if (parent.parent.db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the node. Another event will come.
191
parent.parent.DispatchEvent(parent.CreateMeshDispatchTargets(node.meshid, [obj.nodeid]), obj, event);
192
}
views/default.handlebars
+1
-1
@@ -8588,7 +8588,7 @@
8588
if ((currentNode.rdp == 1) && (Q('d2mode').value == 1)) {
8589
connectDesktop(null, 4, { servercred: true, width: width, height: height, flags: (desktopsettings.rdpflags != null) ? desktopsettings.rdpflags : 0x2F });
8590
} else {
8591
- savecred = false;
8591
+ var savecred = false;
8592
if ((features2 & 0x00400000) == 0) { savecred = Q('d2savecred').checked; }
8593
connectDesktop(null, 4, { domain: Q('d2domain').value, username: Q('d2user').value, password: Q('d2pass').value, savecred: savecred, width: width, height: height, flags: (desktopsettings.rdpflags != null) ? desktopsettings.rdpflags : 0x2F });
8594
}