MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-13 16:03:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-07-03 20:58:14 -07:00
commit a0ae340e6e
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apprelays.js
View File

@ -642,12 +642,14 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
} }
} else { } else {
// Tunnel is now in web socket pass-thru mode // Tunnel is now in web socket pass-thru mode
if ((typeof header.connection == 'string') && (header.connection.toLowerCase() == 'upgrade')) { if (header != null) {
// Websocket upgrade succesful if ((typeof header.connection == 'string') && (header.connection.toLowerCase() == 'upgrade')) {
obj.socketParseState = 2; // Websocket upgrade succesful
} else { obj.socketParseState = 2;
// Unable to upgrade to web socket } else {
obj.close(); // Unable to upgrade to web socket
obj.close();
}
} }
} }
} }

20
docs/docs/meshcentral/devicetabs.md
View File

@ -36,10 +36,10 @@ Chat
Legend Legend
* **_Black color_**: Device is powered on * **_Black color_**: Device is powered on (Intel AMT & agents)
* **_Purple color_**: Device is in sleep state (Intel AMT agents only) * **_Purple color_**: Device is in sleep state (Intel AMT agents only)
* **_Teal color_**: Device is connected through AMT/CIRA, but not powered on (Intel AMT agents only) * **_Teal color_**: Device is connected through AMT/CIRA, but not powered on (Intel AMT agents only)
* **_Grey color_**: Device is powered off (Intel AMT agents only) * **_Grey color_**: Device is powered off (Intel AMT & agents)
### Text Links ### Text Links
@ -47,12 +47,12 @@ You can set alternate port in the link if it's not default by right-clicking.
![](images/general_alternateports.png) ![](images/general_alternateports.png)
* Interfaces * Interfaces
* Location * Location
* MeshCmd * MeshCmd
* RDP * RDP
* Web-VNC * Web-VNC
* Web-RDP * Web-RDP
* Web-SSH * Web-SSH
* XTerm * XTerm
* HTTP * HTTP
@ -103,7 +103,7 @@ Right-clicking on Connect button allows you to:
![](images/terminal_connectbutton.png) ![](images/terminal_connectbutton.png)
## Files ## Files
For transferring files to and from the agent. For transferring files to and from the agent.
## Events ## Events
@ -131,6 +131,6 @@ Note you can show CPU and Memory usage info by clicking the icon in the top righ
## Console ## Console
For debugging and communicating with the mesh agent. For debugging and communicating with the mesh agent.
It allows JS commands to be issued to the device but also run extra commands from the meshcore. Type `help` for all available options It allows JS commands to be issued to the device but also run extra commands from the meshcore. Type `help` for all available options

11
translate/translate.json
View File

@ -28179,6 +28179,7 @@
}, },
{ {
"en": "Gateway: {0}", "en": "Gateway: {0}",
"nl": "Gateway: {0}",
"xloc": [ "xloc": [
"default-mobile.handlebars->11->556", "default-mobile.handlebars->11->556",
"default.handlebars->45->1453" "default.handlebars->45->1453"
@ -29324,12 +29325,14 @@
{ {
"de": "HTTP Verbindung", "de": "HTTP Verbindung",
"en": "HTTP Connection", "en": "HTTP Connection",
"nl": "HTTP verbinding",
"xloc": [ "xloc": [
"default.handlebars->45->750" "default.handlebars->45->750"
] ]
}, },
{ {
"en": "HTTP remote connection port:", "en": "HTTP remote connection port:",
"nl": "HTTP poort voor externe verbinding:",
"xloc": [ "xloc": [
"default.handlebars->45->749" "default.handlebars->45->749"
] ]
@ -29362,12 +29365,14 @@
{ {
"de": "HTTPS Verbindung", "de": "HTTPS Verbindung",
"en": "HTTPS Connection", "en": "HTTPS Connection",
"nl": "HTTPS verbinding",
"xloc": [ "xloc": [
"default.handlebars->45->752" "default.handlebars->45->752"
] ]
}, },
{ {
"en": "HTTPS remote connection port:", "en": "HTTPS remote connection port:",
"nl": "HTTPS poort voor externe verbinding:",
"xloc": [ "xloc": [
"default.handlebars->45->751" "default.handlebars->45->751"
] ]
@ -39180,6 +39185,7 @@
}, },
{ {
"en": "Mask: {0}", "en": "Mask: {0}",
"nl": "Mask: {0}",
"xloc": [ "xloc": [
"default-mobile.handlebars->11->555", "default-mobile.handlebars->11->555",
"default.handlebars->45->1452" "default.handlebars->45->1452"
@ -75613,9 +75619,6 @@
"default-mobile.handlebars->11->144" "default-mobile.handlebars->11->144"
] ]
}, },
{
"en": "Á/span>"
},
{ {
"cs": "↺", "cs": "↺",
"da": "↺", "da": "↺",
@ -75875,4 +75878,4 @@
] ]
} }
] ]
} }