diff --git a/meshagent.js b/meshagent.js
index 7169b9ff..5ea181d9 100644
--- a/meshagent.js
+++ b/meshagent.js
@@ -807,7 +807,12 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
if (device.agent.ver != obj.agentInfo.agentVersion) { device.agent.ver = obj.agentInfo.agentVersion; change = 1; changes.push('agent version'); }
if (device.agent.id != obj.agentInfo.agentId) { device.agent.id = obj.agentInfo.agentId; change = 1; changes.push('agent type'); }
if ((device.agent.caps & 24) != (obj.agentInfo.capabilities & 24)) { device.agent.caps = obj.agentInfo.capabilities; change = 1; changes.push('agent capabilities'); } // If agent console or javascript support changes, update capabilities
- if (mesh.flags && (mesh.flags & 2) && (device.name != obj.agentInfo.computerName)) { device.name = obj.agentInfo.computerName; change = 1; } // We want the server name to be sync'ed to the hostname
+ // We want the server name to be sync'ed to the hostname or the --agentName
+ // (flag 16 allows to override the name until next connection)
+ if (mesh.flags && (mesh.flags & 2)) {
+ var preferredName = (mesh.flags & 8) && obj.agentName || obj.agentInfo.computerName;
+ if (device.name != preferredName) {device.name = preferredName; change = 1; }
+ }
if (device.ip != obj.remoteaddr) { device.ip = obj.remoteaddr; change = 1; }
if (change == 1) {
diff --git a/views/default.handlebars b/views/default.handlebars
index bdecac2a..bc0ca318 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -1,4 +1,4 @@
-
+
@@ -7497,7 +7497,7 @@
// Add node name
var nname = EscapeHtml(node.name), nnameEx;
if (nname.length == 0) { nname = '' + "None" + ''; }
- if (((meshrights & 4) != 0) && ((!mesh.flags) || ((mesh.flags & 2) == 0))) { nname = '' + nname + ' 
'; }
+ if (((meshrights & 4) != 0) && ((!mesh.flags) || ((mesh.flags & 2) == 0 || (mesh.flags & 16)))) { nname = '' + nname + ' '; }
nnameEx = nname;
if (mesh) { nname += ' - ' + EscapeHtml(mesh.name) + ''; }
QH('p10deviceName', nname);
@@ -13586,6 +13586,8 @@
if (currentMesh.flags) {
if (currentMesh.flags & 1) { meshFeatures.push("Auto-Remove"); }
if (currentMesh.flags & 2) { meshFeatures.push((currentMesh.mtype == 4)?"Port Name Sync":"Hostname Sync"); }
+ if (currentMesh.flags & 8) { meshFeatures.push("prefer --agentname"); }
+ if (currentMesh.flags & 16) { meshFeatures.push("allow override"); }
if ((serverinfo.devGroupSessionRecording == 1) && (currentMesh.flags & 4)) { meshFeatures.push("Record Sessions"); }
}
if ((typeof currentMesh.expireDevs == 'number') && (currentMesh.expireDevs > 0)) { meshFeatures.push("Remove inactive"); }
@@ -14067,6 +14069,10 @@
}
if ((currentMesh.mtype == 2) || (currentMesh.mtype == 4)) {
x += '
';
+ if (currentMesh.mtype == 2) {
+ x += '
';
+ x += '
';
+ }
x += '
';
}
x += '
';
@@ -14087,6 +14093,16 @@
function p20editmeshfeaturesValidate() {
var flags = 0, ok = true;
if (((currentMesh.mtype == 2) || (currentMesh.mtype == 4)) && (Q('d20flag1').checked)) { flags += 1; }
+ if (currentMesh.mtype == 2) {
+ if (Q('d20flag2').checked) {
+ flags += 2;
+ if (event.currentTarget.id == 'd20flag2') { Q('d20flag8').checked = true; Q('d20flag16').checked = true; }
+ }
+ for (const flag of [8, 16]) {
+ const element = Q('d20flag' + flag);
+ if ((element.checked = element.checked && !(element.disabled = !(flags & 2)))) { flags += flag; }
+ }
+ }
QE('d20expireDevice', (flags & 1) == 0);
var x = ((flags & 1) == 0) && Q('d20expireDevice').checked;
QV('d20expireDeviceDev', x);
@@ -14099,6 +14115,8 @@
if ((currentMesh.mtype == 2) || (currentMesh.mtype == 4)) {
if (Q('d20flag1').checked) { flags += 1; }
if (Q('d20flag2').checked) { flags += 2; }
+ if (Q('d20flag8').checked) { flags += 8; }
+ if (Q('d20flag16').checked) { flags += 16; }
}
if ((serverinfo.devGroupSessionRecording == 1) && (currentMesh.mtype != 4)) { if (Q('d20flag4').checked) { flags += 4; } }
var expireDevs = 0;
diff --git a/views/default3.handlebars b/views/default3.handlebars
index 3f0a0fd9..6e2d2f79 100644
--- a/views/default3.handlebars
+++ b/views/default3.handlebars
@@ -8168,7 +8168,7 @@
// Add node name
var nname = EscapeHtml(node.name), nnameEx;
if (nname.length == 0) { nname = '' + "None" + ''; }
- if (((meshrights & 4) != 0) && ((!mesh.flags) || ((mesh.flags & 2) == 0))) { nname = '' + nname + ' '; }
+ if (((meshrights & 4) != 0) && ((!mesh.flags) || ((mesh.flags & 2) == 0 || (mesh.flags & 16)))) { nname = '' + nname + ' '; }
nnameEx = nname;
if (mesh) { nname += ' - ' + EscapeHtml(mesh.name) + ''; }
QH('p10deviceName', nname);
@@ -14628,6 +14628,8 @@
if (currentMesh.flags) {
if (currentMesh.flags & 1) { meshFeatures.push("Auto-Remove"); }
if (currentMesh.flags & 2) { meshFeatures.push((currentMesh.mtype == 4) ? "Port Name Sync" : "Hostname Sync"); }
+ if (currentMesh.flags & 8) { meshFeatures.push("prefer --agentname"); }
+ if (currentMesh.flags & 16) { meshFeatures.push("allow override"); }
if ((serverinfo.devGroupSessionRecording == 1) && (currentMesh.flags & 4)) { meshFeatures.push("Record Sessions"); }
}
if ((typeof currentMesh.expireDevs == 'number') && (currentMesh.expireDevs > 0)) { meshFeatures.push("Remove inactive"); }
@@ -15144,6 +15146,10 @@
}
if ((currentMesh.mtype == 2) || (currentMesh.mtype == 4)) {
x += '
';
+ if (currentMesh.mtype == 2) {
+ x += '
';
+ x += '
';
+ }
x += '
';
}
x += '
';
@@ -15165,6 +15171,16 @@
function p20editmeshfeaturesValidate() {
var flags = 0, ok = true;
if (((currentMesh.mtype == 2) || (currentMesh.mtype == 4)) && (Q('d20flag1').checked)) { flags += 1; }
+ if (currentMesh.mtype == 2) {
+ if (Q('d20flag2').checked) {
+ flags += 2;
+ if (event.currentTarget.id == 'd20flag2') { Q('d20flag8').checked = true; Q('d20flag16').checked = true; }
+ }
+ for (const flag of [8, 16]) {
+ const element = Q('d20flag' + flag);
+ if ((element.checked = element.checked && !(element.disabled = !(flags & 2)))) { flags += flag; }
+ }
+ }
QE('d20expireDevice', (flags & 1) == 0);
var x = ((flags & 1) == 0) && Q('d20expireDevice').checked;
QV('d20expireDeviceDev', x);
@@ -15177,6 +15193,8 @@
if ((currentMesh.mtype == 2) || (currentMesh.mtype == 4)) {
if (Q('d20flag1').checked) { flags += 1; }
if (Q('d20flag2').checked) { flags += 2; }
+ if (Q('d20flag8').checked) { flags += 8; }
+ if (Q('d20flag16').checked) { flags += 16; }
}
if ((serverinfo.devGroupSessionRecording == 1) && (currentMesh.mtype != 4)) { if (Q('d20flag4').checked) { flags += 4; } }
var expireDevs = 0;