fix relaylog ip order again
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Feb 23, 2025 at 01:13 UTC
c55065505be95ba6f49df67c4e222d11e6953d0e
1 file changed
+3
-3
meshrelay.js
+3
-3
@@ -452,8 +452,8 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
452
userid: sessionUser._id,
453
username: sessionUser.name,
454
sessionid: obj.id,
455
- ipaddr1: ((obj.peer == null) || (obj.peer.req == null)) ? null : obj.peer.req.clientIp,
456
- ipaddr2: (obj.req == null) ? null : obj.req.clientIp,
455
+ ipaddr1: (obj.req == null) ? null : obj.req.clientIp,
456
+ ipaddr2: ((obj.peer == null) || (obj.peer.req == null)) ? null : obj.peer.req.clientIp,
457
time: new Date().toLocaleString(),
458
protocol: (((obj.req == null) || (obj.req.query == null)) ? null : obj.req.query.p),
459
nodeid: (((obj.req == null) || (obj.req.query == null)) ? null : obj.req.query.nodeid)
@@ -512,7 +512,7 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
512
if (obj.req.query.p == 1) { msg = 'Started terminal session'; msgid = 14; }
513
else if (obj.req.query.p == 2) { msg = 'Started desktop session'; msgid = 15; }
514
else if (obj.req.query.p == 5) { msg = 'Started file management session'; msgid = 16; }
515
- var event = { etype: 'relay', action: 'relaylog', domain: domain.id, userid: sessionUser._id, username: sessionUser.name, msgid: msgid, msgArgs: [obj.id, obj.peer.req.clientIp, req.clientIp], msg: msg + ' \"' + obj.id + '\" from ' + obj.peer.req.clientIp + ' to ' + req.clientIp, protocol: req.query.p, nodeid: req.query.nodeid };
515
+ var event = { etype: 'relay', action: 'relaylog', domain: domain.id, userid: sessionUser._id, username: sessionUser.name, msgid: msgid, msgArgs: [obj.id, req.clientIp, obj.peer.req.clientIp], msg: msg + ' \"' + obj.id + '\" from ' + req.clientIp + ' to ' + obj.peer.req.clientIp, protocol: req.query.p, nodeid: req.query.nodeid };
516
if (obj.guestname) { event.guestname = obj.guestname; } else if (relayinfo.peer1.guestname) { event.guestname = relayinfo.peer1.guestname; } // If this is a sharing session, set the guest name here.
517
parent.parent.DispatchEvent(['*', sessionUser._id], obj, event);
518