MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-26 23:25:53 -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

2
apprelays.js
View File

@ -642,6 +642,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
}
} else {
// Tunnel is now in web socket pass-thru mode
if (header != null) {
if ((typeof header.connection == 'string') && (header.connection.toLowerCase() == 'upgrade')) {
// Websocket upgrade succesful
obj.socketParseState = 2;
@ -651,6 +652,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
}
}
}
}
// Send data thru the relay tunnel. Written to use TLS if needed.
function send(data) { try { if (obj.tls) { obj.tls.write(data); } else { obj.wsClient.send(data); } } catch (ex) { } }

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

@ -36,10 +36,10 @@ Chat
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)
* **_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

9
translate/translate.json
View File

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