MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Added ping/pong support.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire
2021-07-02 11:05:19 -07:00
parent 472881222a
commit 605369af87
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MeshCentralServer.cs
View File

@@ -213,6 +213,17 @@ namespace MeshCentralRouter
string action = jsonAction["action"].ToString(); string action = jsonAction["action"].ToString();
switch (action) switch (action)
{ {
case "pong":
{
// NOP
break;
}
case "ping":
{
// Send pong back
if (wc != null) { wc.WriteStringWebSocket("{\"action\":\"pong\"}"); }
break;
}
case "close": case "close":
{ {
disconnectCause = jsonAction["cause"].ToString(); disconnectCause = jsonAction["cause"].ToString();

28
MeshMapper.cs
View File

@@ -15,9 +15,11 @@ limitations under the License.
*/ */
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Web.Script.Serialization;
namespace MeshCentralRouter namespace MeshCentralRouter
{ {
@@ -36,7 +38,8 @@ namespace MeshCentralRouter
public bool exit = false; public bool exit = false;
public bool xdebug = false; public bool xdebug = false;
public bool inaddrany = false; public bool inaddrany = false;
TcpListener listener = null; private TcpListener listener = null;
private JavaScriptSerializer JSON = new JavaScriptSerializer();
// Stats // Stats
public long bytesToServer = 0; public long bytesToServer = 0;
@@ -257,7 +260,7 @@ namespace MeshCentralRouter
{ {
bytesToClient += data.Length; bytesToClient += data.Length;
bytesToClientCompressed += orglen; bytesToClientCompressed += orglen;
if ((sender.tunneling == false) &&( (data == "c") || (data == "cr"))) if ((sender.tunneling == false) && ((data == "c") || (data == "cr")))
{ {
Debug("#" + sender.id + ": Websocket got server 'c' confirmation."); Debug("#" + sender.id + ": Websocket got server 'c' confirmation.");
@@ -285,6 +288,27 @@ namespace MeshCentralRouter
else if (sender.tunneling == true) else if (sender.tunneling == true)
{ {
Debug("#" + sender.id + ": Websocket got text frame: " + data); Debug("#" + sender.id + ": Websocket got text frame: " + data);
// Parse the received JSON
Dictionary<string, object> jsonAction = new Dictionary<string, object>();
try { jsonAction = JSON.Deserialize<Dictionary<string, object>>(data); } catch (Exception) { }
if ((jsonAction == null) || (jsonAction["ctrlChannel"].GetType() != typeof(string)) || ((string)jsonAction["ctrlChannel"] != "102938")) return;
string actiontype = jsonAction["type"].ToString();
switch (actiontype)
{
case "ping":
{
// Send pong back
try { sender.SendString("{\"ctrlChannel\":\"102938\",\"type\":\"ping\"}"); } catch (Exception) { }
break;
}
case "pong":
{
// NOP
break;
}
}
} }
} }