Fixed server exception #2362
Ylian Saint-Hilaire committed
Mar 9, 2021 at 17:38 UTC
bd4f76ac1ec764e9830ba9f3fc36846add814d06
1 file changed
+12
-1
meshrelay.js
+12
-1
@@ -342,7 +342,18 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
342
} else {
343
// Write the recording file header
344
parent.parent.debug('relay', 'Relay: Started recoding to file: ' + recFullFilename);
345
- var metadata = { magic: 'MeshCentralRelaySession', ver: 1, userid: sessionUser._id, username: sessionUser.name, sessionid: obj.id, ipaddr1: obj.req.clientIp, ipaddr2: obj.peer.req.clientIp, time: new Date().toLocaleString(), protocol: (((obj.req == null) || (obj.req.query == null)) ? null : obj.req.query.p), nodeid: (((obj.req == null) || (obj.req.query == null)) ? null : obj.req.query.nodeid ) };
345
+ var metadata = {
346
+ magic: 'MeshCentralRelaySession',
347
+ ver: 1,
348
+ userid: sessionUser._id,
349
+ username: sessionUser.name,
350
+ sessionid: obj.id,
351
+ ipaddr1: (obj.req == null) ? null : obj.req.clientIp,
352
+ ipaddr2: ((obj.peer == null) || (obj.peer.req == null)) ? null : obj.peer.req.clientIp,
353
+ time: new Date().toLocaleString(),
354
+ protocol: (((obj.req == null) || (obj.req.query == null)) ? null : obj.req.query.p),
355
+ nodeid: (((obj.req == null) || (obj.req.query == null)) ? null : obj.req.query.nodeid)
356
+ };
357
if (xdevicename2 != null) { metadata.devicename = xdevicename2; }
358
var firstBlock = JSON.stringify(metadata);
359
var logfile = { fd: fd, lock: false, filename: recFullFilename, startTime: Date.now(), size: 0 };