diff --git a/agents/meshagent_freebsd_x86-64 b/agents/meshagent_freebsd_x86-64 index 07830db1..387d5aa0 100644 Binary files a/agents/meshagent_freebsd_x86-64 and b/agents/meshagent_freebsd_x86-64 differ diff --git a/agents/meshcore.js b/agents/meshcore.js index b109bd74..b802d424 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -1912,8 +1912,8 @@ function createMeshCore(agent) { if (sdp != null) { ws.write({ type: 'answer', ctrlChannel: '102938', sdp: sdp }); } break; } - case 'latency': { - ws.write({ type: 'latency', ctrlChannel: '102938', time: obj.time }); + case 'rtt': { + ws.write({ type: 'rtt', ctrlChannel: '102938', time: obj.time }); break; } } diff --git a/public/scripts/agent-redir-ws-0.1.1.js b/public/scripts/agent-redir-ws-0.1.1.js index 87a16733..60717e32 100644 --- a/public/scripts/agent-redir-ws-0.1.1.js +++ b/public/scripts/agent-redir-ws-0.1.1.js @@ -74,7 +74,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort, au if (controlMsg.type == 'console') { obj.consoleMessage = controlMsg.msg; if (obj.onConsoleMessageChange) { obj.onConsoleMessageChange(obj, obj.consoleMessage); } - } else if ((controlMsg.type = 'latency') && (typeof controlMsg.time == 'number')) { + } else if ((controlMsg.type = 'rtt') && (typeof controlMsg.time == 'number')) { obj.latency.current = (new Date().getTime()) - controlMsg.time; if (obj.latency.callbacks != null) { obj.latency.callback(obj.latency.current); } } else if (obj.webrtc != null) { @@ -95,7 +95,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort, au function performWebRtcSwitch() { if ((obj.webSwitchOk == true) && (obj.webRtcActive == true)) { - obj.latency.current = -1; + obj.latency.current = -1; // RTT will no longer be calculated when WebRTC is enabled obj.sendCtrlMsg('{"ctrlChannel":"102938","type":"webrtc0"}'); // Indicate to the meshagent that it can start traffic switchover obj.sendCtrlMsg('{"ctrlChannel":"102938","type":"webrtc1"}'); // Indicate to the meshagent that data traffic will no longer be sent over websocket. // TODO: Hold/Stop sending data over websocket @@ -178,7 +178,7 @@ var CreateAgentRedirect = function (meshserver, module, serverPublicNamePort, au // Request RTT mesure, don't use this if WebRTC is active if (obj.webRtcActive != true) { var ticks = new Date().getTime(); - if ((obj.latency.lastSend == null) || ((ticks - obj.latency.lastSend) > 5000)) { obj.latency.lastSend = ticks; obj.sendCtrlMsg('{"ctrlChannel":"102938","type":"latency","time":' + ticks + '}'); } + if ((obj.latency.lastSend == null) || ((ticks - obj.latency.lastSend) > 5000)) { obj.latency.lastSend = ticks; obj.sendCtrlMsg('{"ctrlChannel":"102938","type":"rtt","time":' + ticks + '}'); } } }; diff --git a/translate/translate.json b/translate/translate.json index 6880e6e7..9472c4bb 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -7555,6 +7555,12 @@ "default.handlebars->27->487" ] }, + { + "en": "Desktop Session Latency", + "xloc": [ + "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1" + ] + }, { "cs": "Panel nástrojů na ploše", "de": "Desktop-Werkzeugleiste",