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

Switched back to using built-in sockets with compression.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire
2021-11-16 10:09:35 -08:00
parent 4f2401a796
commit 83d64597fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MeshCentralServer.cs
View File

@@ -677,7 +677,7 @@ namespace MeshCentralRouter
// Get login key // Get login key
string url = jsonAction["url"] + "&auth=" + authCookie; string url = jsonAction["url"] + "&auth=" + authCookie;
if (url.StartsWith("*/")) { url = "wss://" + wsurl.Authority + url.Substring(1); } if (url.StartsWith("*/")) { url = "https://" + wsurl.Authority + url.Substring(1); }
string loginkey = getValueFromQueryString(wsurl.Query, "key"); string loginkey = getValueFromQueryString(wsurl.Query, "key");
if (loginkey != null) { url += ("&key=" + loginkey); } if (loginkey != null) { url += ("&key=" + loginkey); }

2
WebSocketClient.cs
View File

@@ -187,7 +187,7 @@ namespace MeshCentralRouter
if (tlsCertFingerprint != null) { this.tlsCertFingerprint = tlsCertFingerprint.ToUpper(); } if (tlsCertFingerprint != null) { this.tlsCertFingerprint = tlsCertFingerprint.ToUpper(); }
if (tlsCertFingerprint2 != null) { this.tlsCertFingerprint2 = tlsCertFingerprint2.ToUpper(); } if (tlsCertFingerprint2 != null) { this.tlsCertFingerprint2 = tlsCertFingerprint2.ToUpper(); }
if (nativeWebSocketFirst) { try { ws = new ClientWebSocket(); } catch (Exception) { } } //if (nativeWebSocketFirst) { try { ws = new ClientWebSocket(); } catch (Exception) { } }
if (ws != null) if (ws != null)
{ {
// Use Windows native websockets // Use Windows native websockets