1
0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00

Version 1.4

This commit is contained in:
Ylian Saint-Hilaire
2021-02-23 13:02:17 -08:00
parent 813b70559c
commit ca762f5edc
4 changed files with 502 additions and 1240 deletions

View File

@@ -940,7 +940,6 @@ namespace MeshCentralRouter
map.appId = appId; map.appId = appId;
map.node = node; map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
//map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash; map.certhash = meshcentral.wshash;
map.parent = this; map.parent = this;
map.Dock = DockStyle.Top; map.Dock = DockStyle.Top;
@@ -1002,7 +1001,6 @@ namespace MeshCentralRouter
map.appId = appId; map.appId = appId;
map.node = node; map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
//map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash; map.certhash = meshcentral.wshash;
map.parent = this; map.parent = this;
map.Dock = DockStyle.Top; map.Dock = DockStyle.Top;
@@ -1043,7 +1041,6 @@ namespace MeshCentralRouter
map.appId = form.getAppId(); map.appId = form.getAppId();
map.node = form.getNode(); map.node = form.getNode();
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
//map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash; map.certhash = meshcentral.wshash;
map.parent = this; map.parent = this;
map.Dock = DockStyle.Top; map.Dock = DockStyle.Top;
@@ -1202,7 +1199,6 @@ namespace MeshCentralRouter
map.appId = form.getAppId(); map.appId = form.getAppId();
map.node = form.getNode(); map.node = form.getNode();
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
//map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash; map.certhash = meshcentral.wshash;
map.parent = this; map.parent = this;
map.Dock = DockStyle.Top; map.Dock = DockStyle.Top;
@@ -1357,7 +1353,6 @@ namespace MeshCentralRouter
map.appId = appId; // 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP map.appId = appId; // 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP
map.node = node; map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
//map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash; map.certhash = meshcentral.wshash;
map.parent = this; map.parent = this;
map.Dock = DockStyle.Top; map.Dock = DockStyle.Top;
@@ -1511,7 +1506,6 @@ namespace MeshCentralRouter
if (x.ContainsKey("autoExit")) { map.autoexit = (bool)x["autoExit"]; } if (x.ContainsKey("autoExit")) { map.autoexit = (bool)x["autoExit"]; }
map.node = node; map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
//map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash; map.certhash = meshcentral.wshash;
map.parent = this; map.parent = this;
map.Dock = DockStyle.Top; map.Dock = DockStyle.Top;

File diff suppressed because it is too large Load Diff

View File

@@ -151,10 +151,10 @@
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="deviceNameLabel.Location" type="System.Drawing.Point, System.Drawing"> <data name="deviceNameLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>60, 8</value> <value>60, 10</value>
</data> </data>
<data name="deviceNameLabel.Size" type="System.Drawing.Size, System.Drawing"> <data name="deviceNameLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>273, 15</value> <value>275, 15</value>
</data> </data>
<data name="deviceNameLabel.TabIndex" type="System.Int32, mscorlib"> <data name="deviceNameLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@@ -181,10 +181,10 @@
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="routingStatusLabel.Location" type="System.Drawing.Point, System.Drawing"> <data name="routingStatusLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>60, 28</value> <value>60, 30</value>
</data> </data>
<data name="routingStatusLabel.Size" type="System.Drawing.Size, System.Drawing"> <data name="routingStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>273, 15</value> <value>275, 15</value>
</data> </data>
<data name="routingStatusLabel.TabIndex" type="System.Int32, mscorlib"> <data name="routingStatusLabel.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@@ -208,7 +208,7 @@
<value>Top, Right</value> <value>Top, Right</value>
</data> </data>
<data name="appButton.Location" type="System.Drawing.Point, System.Drawing"> <data name="appButton.Location" type="System.Drawing.Point, System.Drawing">
<value>339, 1</value> <value>341, 3</value>
</data> </data>
<data name="appButton.Size" type="System.Drawing.Size, System.Drawing"> <data name="appButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value> <value>75, 23</value>
@@ -235,7 +235,7 @@
<value>Top, Right</value> <value>Top, Right</value>
</data> </data>
<data name="closeButton.Location" type="System.Drawing.Point, System.Drawing"> <data name="closeButton.Location" type="System.Drawing.Point, System.Drawing">
<value>339, 25</value> <value>341, 27</value>
</data> </data>
<data name="closeButton.Size" type="System.Drawing.Size, System.Drawing"> <data name="closeButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value> <value>75, 23</value>
@@ -266,7 +266,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy
mgAAAk1TRnQBSQFMAgEBCAEAAWgBAAFoAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI mgAAAk1TRnQBSQFMAgEBCAEAAXABAAFwAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
AwABlgMAAQEBAAEQBQABYAHq/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A AwABlgMAAQEBAAEQBQABYAHq/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
@@ -954,7 +954,7 @@
<value>6, 13</value> <value>6, 13</value>
</data> </data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing"> <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>413, 49</value> <value>419, 55</value>
</data> </data>
<data name="&gt;&gt;deviceImageList.Name" xml:space="preserve"> <data name="&gt;&gt;deviceImageList.Name" xml:space="preserve">
<value>deviceImageList</value> <value>deviceImageList</value>

View File

@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.3.*")] [assembly: AssemblyVersion("1.4.*")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]