From bd4f76ac1ec764e9830ba9f3fc36846add814d06 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 9 Mar 2021 17:38:15 -0800
Subject: [PATCH] Fixed server exception #2362

---
 meshrelay.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/meshrelay.js b/meshrelay.js
index 2fdc56fd..22795894 100644
--- a/meshrelay.js
+++ b/meshrelay.js
@@ -342,7 +342,18 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
                                 } else {
                                     // Write the recording file header
                                     parent.parent.debug('relay', 'Relay: Started recoding to file: ' + recFullFilename);
-                                    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 ) };
+                                    var metadata = {
+                                        magic: 'MeshCentralRelaySession',
+                                        ver: 1,
+                                        userid: sessionUser._id,
+                                        username: sessionUser.name,
+                                        sessionid: obj.id,
+                                        ipaddr1: (obj.req == null) ? null : obj.req.clientIp,
+                                        ipaddr2: ((obj.peer == null) || (obj.peer.req == null)) ? null : 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)
+                                    };
                                     if (xdevicename2 != null) { metadata.devicename = xdevicename2; }
                                     var firstBlock = JSON.stringify(metadata);
                                     var logfile = { fd: fd, lock: false, filename: recFullFilename, startTime: Date.now(), size: 0 };