diff --git a/MainForm.cs b/MainForm.cs
index 1b838a0..c6b5e1e 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -940,7 +940,7 @@ namespace MeshCentralRouter
map.appId = appId;
map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
- map.authCookie = meshcentral.authCookie;
+ //map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash;
map.parent = this;
map.Dock = DockStyle.Top;
@@ -1002,7 +1002,7 @@ namespace MeshCentralRouter
map.appId = appId;
map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
- map.authCookie = meshcentral.authCookie;
+ //map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash;
map.parent = this;
map.Dock = DockStyle.Top;
@@ -1043,7 +1043,7 @@ namespace MeshCentralRouter
map.appId = form.getAppId();
map.node = form.getNode();
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
- map.authCookie = meshcentral.authCookie;
+ //map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash;
map.parent = this;
map.Dock = DockStyle.Top;
@@ -1202,7 +1202,7 @@ namespace MeshCentralRouter
map.appId = form.getAppId();
map.node = form.getNode();
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
- map.authCookie = meshcentral.authCookie;
+ //map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash;
map.parent = this;
map.Dock = DockStyle.Top;
@@ -1357,7 +1357,7 @@ namespace MeshCentralRouter
map.appId = appId; // 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP
map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
- map.authCookie = meshcentral.authCookie;
+ //map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash;
map.parent = this;
map.Dock = DockStyle.Top;
@@ -1511,7 +1511,7 @@ namespace MeshCentralRouter
if (x.ContainsKey("autoExit")) { map.autoexit = (bool)x["autoExit"]; }
map.node = node;
if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; }
- map.authCookie = meshcentral.authCookie;
+ //map.authCookie = meshcentral.authCookie;
map.certhash = meshcentral.wshash;
map.parent = this;
map.Dock = DockStyle.Top;
diff --git a/MainForm.resx b/MainForm.resx
index 1aa1060..755f9a3 100644
--- a/MainForm.resx
+++ b/MainForm.resx
@@ -117,24 +117,480 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ mainPanel
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel5
+
+
+ 0
+
+
+ pictureBox1
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel5
+
+
+ 1
+
+
+ Fill
+
+
+
+ 0, 0
+
+
+ 492, 416
+
+
+
+ 8
+
+
+ panel5
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 4
+
+
+ mainTabControl
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mainPanel
+
+
+ 0
+
+
+ Fill
+
+
+ 0, 65
+
+
+ 492, 351
+
+
+ 9
+
+
+ mainPanel
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel5
+
+
+ 0
+
FlatButtons
+
+ panel1
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage1
+
+
+ 0
+
+
+ 4, 25
+
+
+ 3, 3, 3, 3
+
+
+ 484, 322
+
+
+ 0
+
+
+ Login
+
+
+ tabPage1
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mainTabControl
+
+
+ 0
+
+
+ panel2
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 0
+
+
+ 4, 25
+
+
+ 3, 3, 3, 3
+
+
+ 484, 322
+
+
+ 1
+
+
+ Token
+
+
+ tabPage2
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mainTabControl
+
+
+ 1
+
+
+ panel3
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage3
+
+
+ 0
+
+
+ 4, 25
+
+
+ 484, 322
+
+
+ 2
+
+
+ Certificate
+
+
+ tabPage3
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mainTabControl
+
+
+ 2
+
+
+ panel4
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage5
+
+
+ 0
+
+
+ 4, 25
+
+
+ 484, 322
+
+
+ 4
+
+
+ Mappings
+
+
+ tabPage5
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mainTabControl
+
+
+ 3
+
+
+ Fill
+
+
+ 0, 0
+
+
+ 0, 0, 0, 0
+
+
+ 492, 351
+
+
+ 8
+
+
+ False
+
+
+ mainTabControl
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mainPanel
+
+
+ 0
+
+
+ installButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 0
+
+
+ stateLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 1
+
+
+ label28
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 2
+
+
+ label27
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 3
+
+
+ label26
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 4
+
+
+ passwordTextBox
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 5
+
+
+ serverNameComboBox
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 6
+
+
+ userNameTextBox
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 7
+
+
+ licenseLinkLabel
+
+
+ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 8
+
+
+ versionLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 9
+
+
+ nextButton1
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 10
+
+
+ pictureBox3
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 11
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 12
+
+
+ pictureBox2
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 13
+
+
+ Fill
+
+
+ 3, 3
+
+
+ 478, 316
+
+
+ 6
+
+
+ panel1
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage1
+
+
+ 0
+
Bottom, Left
NoControl
-
11, 285
95, 23
-
104
@@ -549,55 +1005,160 @@
13
-
- Fill
+
+ tokenRememberCheckBox
-
- 3, 3
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 478, 316
+
+ panel2
-
+
+ 0
+
+
+ emailTokenButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 1
+
+
+ smsTokenButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 2
+
+
+ tokenEmailSentLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 3
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 4
+
+
+ tokenTextBox
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 5
+
+
+ pictureBox6
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
6
-
- panel1
+
+ backButton2
-
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 7
+
+
+ nextButton2
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 8
+
+
+ pictureBox4
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 9
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 10
+
+
+ Fill
+
+
+ 3, 3
+
+
+ 478, 316
+
+
+ 7
+
+
+ panel2
+
+
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tabPage1
+
+ tabPage2
-
- 0
-
-
- 4, 25
-
-
- 3, 3, 3, 3
-
-
- 484, 322
-
-
- 0
-
-
- Login
-
-
- tabPage1
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- mainTabControl
-
-
+
0
@@ -930,56 +1491,125 @@
10
-
- Fill
+
+ rememberCertCheckBox
-
- 3, 3
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 478, 316
+
+ panel3
-
- 7
-
-
- panel2
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage2
-
-
+
0
-
- 4, 25
+
+ certDetailsTextBox
-
- 3, 3, 3, 3
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
+ panel3
+
+
+ 1
+
+
+ certDetailsButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 2
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 3
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 4
+
+
+ backButton3
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 5
+
+
+ nextButton3
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 6
+
+
+ pictureBox5
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 7
+
+
+ Fill
+
+
+ 0, 0
+
+
484, 322
-
- 1
+
+ 8
-
- Token
+
+ panel3
-
- tabPage2
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tabPage3
-
- mainTabControl
-
-
- 1
+
+ 0
Bottom, Left
@@ -1227,53 +1857,113 @@
7
-
- Fill
+
+ menuLabel
-
- 0, 0
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 484, 322
+
+ panel4
-
- 8
-
-
- panel3
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage3
-
-
+
0
-
- 4, 25
+
+ searchTextBox
-
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 1
+
+
+ devicesTabControl
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 2
+
+
+ openWebSiteButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 3
+
+
+ backButton5
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 4
+
+
+ nextButton5
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 5
+
+
+ pictureBox7
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 6
+
+
+ Fill
+
+
+ 0, 0
+
+
484, 322
-
- 2
+
+ 8
-
- Certificate
+
+ panel4
-
- tabPage3
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tabPage5
-
- mainTabControl
-
-
- 2
+
+ 0
Top, Right
@@ -1284,42 +1974,6 @@
613, 17
-
- 185, 22
-
-
- Show &Group Names
-
-
- 185, 22
-
-
- Show &Offline Devices
-
-
- 182, 6
-
-
- 185, 22
-
-
- Sort by &Name
-
-
- 185, 22
-
-
- Sort by G&roup
-
-
- 182, 6
-
-
- 185, 22
-
-
- S&ettings...
-
186, 126
@@ -1359,6 +2013,42 @@
0
+
+ 185, 22
+
+
+ Show &Group Names
+
+
+ 185, 22
+
+
+ Show &Offline Devices
+
+
+ 182, 6
+
+
+ 185, 22
+
+
+ Sort by &Name
+
+
+ 185, 22
+
+
+ Sort by G&roup
+
+
+ 182, 6
+
+
+ 185, 22
+
+
+ S&ettings...
+
Top, Right
@@ -1389,17 +2079,170 @@
FlatButtons
+
+ devicesTabPage
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesTabControl
+
+
+ 0
+
+
+ portMapTabPage
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesTabControl
+
+
+ 1
+
+
+ 3, 3
+
+
+ 478, 279
+
+
+ 401
+
+
+ devicesTabControl
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 2
+
+
+ devicesPanel
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesTabPage
+
+
+ 0
+
+
+ 4, 25
+
+
+ 3, 3, 3, 3
+
+
+ 470, 250
+
+
+ 0
+
+
+ Devices
+
+
+ devicesTabPage
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesTabControl
+
+
+ 0
+
Top, Bottom, Left, Right
True
+
+ cancelAutoCloseButton1
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesPanel
+
+
+ 0
+
+
+ devicesListView
+
+
+ System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesPanel
+
+
+ 1
+
+
+ noSearchResultsLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesPanel
+
+
+ 2
+
+
+ noDevicesLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesPanel
+
+
+ 3
+
+
+ 0, 0
+
+
+ 470, 250
+
+
+ 50
+
+
+ devicesPanel
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ devicesTabPage
+
+
+ 0
+
Bottom, Left
- 4, 191
+ 4, 187
168, 35
@@ -1440,84 +2283,6 @@
161, 56
-
- Segoe UI, 9pt, style=Bold
-
-
- 170, 22
-
-
- Add &Map...
-
-
- 170, 22
-
-
- Add &Relay Map...
-
-
- 167, 6
-
-
- 171, 22
-
-
- Ask Consent + Bar
-
-
- 171, 22
-
-
- Ask Consent
-
-
- 171, 22
-
-
- Privacy Bar
-
-
- 170, 22
-
-
- Remote Desktop...
-
-
- 170, 22
-
-
- Remote Files...
-
-
- 170, 22
-
-
- HTTP
-
-
- 170, 22
-
-
- HTTPS
-
-
- 170, 22
-
-
- RDP
-
-
- 170, 22
-
-
- SSH
-
-
- 170, 22
-
-
- SCP
-
171, 208
@@ -1535,7 +2300,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg
- HQAAAk1TRnQBSQFMAgEBEAEAAVgBAAFYAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ HQAAAk1TRnQBSQFMAgEBEAEAAWABAAFgAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABUAMAAQEBAAEYBgABPP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AJYAA/0D+AP3A/sD/yEAA/0D+gP5
A/wD/xgAAfoB+wH6A/4qAAP9A/8tAAP7A88D1QPbA88D1AO+A9QYAAP8A90D4APjA90D4APUA+MSAAP8
AZEBjwF9AU4BaAEhAfQB9QH0JAAD/gPRA8YD+ioAAcYCxwHPAtAB2ALZA90DywPBA68DmgP3FQAD2APd
@@ -1689,6 +2454,84 @@
1
+
+ Segoe UI, 9pt, style=Bold
+
+
+ 170, 22
+
+
+ Add &Map...
+
+
+ 170, 22
+
+
+ Add &Relay Map...
+
+
+ 167, 6
+
+
+ 170, 22
+
+
+ Remote Desktop...
+
+
+ 171, 22
+
+
+ Ask Consent + Bar
+
+
+ 171, 22
+
+
+ Ask Consent
+
+
+ 171, 22
+
+
+ Privacy Bar
+
+
+ 170, 22
+
+
+ Remote Files...
+
+
+ 170, 22
+
+
+ HTTP
+
+
+ 170, 22
+
+
+ HTTPS
+
+
+ 170, 22
+
+
+ RDP
+
+
+ 170, 22
+
+
+ SSH
+
+
+ 170, 22
+
+
+ SCP
+
Top, Left, Right
@@ -1702,7 +2545,7 @@
2, 88
- 414, 52
+ 410, 52
5
@@ -1741,7 +2584,7 @@
2, 88
- 414, 52
+ 410, 52
4
@@ -1764,53 +2607,104 @@
3
-
- 0, 0
+
+ cancelAutoCloseButton2
-
- 470, 250
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 50
+
+ portMapTabPage
-
- devicesPanel
+
+ 0
-
+
+ mapPanel
+
+
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- devicesTabPage
+
+ portMapTabPage
-
- 0
+
+ 1
-
+
+ settingsPictureBox
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ portMapTabPage
+
+
+ 2
+
+
+ helpPictureBox
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ portMapTabPage
+
+
+ 3
+
+
+ addButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ portMapTabPage
+
+
+ 4
+
+
+ addRelayButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ portMapTabPage
+
+
+ 5
+
+
4, 25
-
+
3, 3, 3, 3
-
+
470, 250
-
- 0
+
+ 1
-
- Devices
+
+ Mappings
-
- devicesTabPage
+
+ portMapTabPage
-
+
System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
devicesTabControl
-
- 0
+
+ 1
Bottom, Left
@@ -1851,32 +2745,6 @@
True
-
- Top, Left, Right
-
-
- Arial, 8.25pt, style=Bold
-
-
- NoControl
-
-
- 2, 79
-
-
- 443, 52
-
-
- 4
-
-
- No Port Mappings
-
-Click "Add" to get started.
-
-
- MiddleCenter
-
noMapLabel
@@ -1910,6 +2778,44 @@ Click "Add" to get started.
1
+
+ Top, Left, Right
+
+
+ Arial, 8.25pt, style=Bold
+
+
+ NoControl
+
+
+ 2, 79
+
+
+ 439, 52
+
+
+ 4
+
+
+ No Port Mappings
+
+Click "Add" to get started.
+
+
+ MiddleCenter
+
+
+ noMapLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ mapPanel
+
+
+ 0
+
Bottom, Left
@@ -2030,54 +2936,6 @@ Click "Add" to get started.
5
-
- 4, 25
-
-
- 3, 3, 3, 3
-
-
- 470, 250
-
-
- 1
-
-
- Mappings
-
-
- portMapTabPage
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- devicesTabControl
-
-
- 1
-
-
- 3, 3
-
-
- 478, 279
-
-
- 401
-
-
- devicesTabControl
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel4
-
-
- 2
-
Bottom, Left
@@ -2201,108 +3059,6 @@ Click "Add" to get started.
6
-
- Fill
-
-
- 0, 0
-
-
- 484, 322
-
-
- 8
-
-
- panel4
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage5
-
-
- 0
-
-
- 4, 25
-
-
- 484, 322
-
-
- 4
-
-
- Mappings
-
-
- tabPage5
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- mainTabControl
-
-
- 3
-
-
- Fill
-
-
- 0, 0
-
-
- 0, 0, 0, 0
-
-
- 492, 351
-
-
- 8
-
-
- False
-
-
- mainTabControl
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- mainPanel
-
-
- 0
-
-
- Fill
-
-
- 0, 65
-
-
- 492, 351
-
-
- 9
-
-
- mainPanel
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel5
-
-
- 0
-
Top
@@ -2330,30 +3086,6 @@ Click "Add" to get started.
1
-
- Fill
-
-
- 0, 0
-
-
- 492, 416
-
-
- 8
-
-
- panel5
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 4
-
17, 17
@@ -2366,21 +3098,6 @@ Click "Add" to get started.
418, 17
-
- 112, 22
-
-
- &Open...
-
-
- 109, 6
-
-
- 112, 22
-
-
- E&xit
-
113, 54
@@ -4087,12 +4804,36 @@ Click "Add" to get started.
MeshCentral Router
+
+ 112, 22
+
+
+ &Open...
+
+
+ 109, 6
+
+
+ 112, 22
+
+
+ E&xit
+
791, 17
905, 17
+
+ 169, 76
+
+
+ mappingsContextMenuStrip
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
168, 22
@@ -4114,15 +4855,6 @@ Click "Add" to get started.
S&ettings...
-
- 169, 76
-
-
- mappingsContextMenuStrip
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
1110, 17
diff --git a/MapUserControl.cs b/MapUserControl.cs
index fd725c9..32ddce9 100644
--- a/MapUserControl.cs
+++ b/MapUserControl.cs
@@ -24,7 +24,7 @@ namespace MeshCentralRouter
public MainForm parent;
public MeshMapper mapper;
public string host;
- public string authCookie;
+ //public string authCookie;
public string certhash;
public bool xdebug = false;
public bool inaddrany = false;
@@ -67,7 +67,7 @@ namespace MeshCentralRouter
mapper.inaddrany = inaddrany;
mapper.certhash = certhash;
mapper.onStateMsgChanged += Mapper_onStateMsgChanged;
- string serverurl = "wss://" + host + "/meshrelay.ashx?auth=" + Uri.EscapeDataString(authCookie) + "&nodeid=" + node.nodeid;
+ string serverurl = "wss://" + host + "/meshrelay.ashx?nodeid=" + node.nodeid;
if (protocol == 1) {
serverurl += ("&tcpport=" + remotePort);
if (remoteIP != null) { serverurl += "&tcpaddr=" + remoteIP; }
@@ -75,7 +75,7 @@ namespace MeshCentralRouter
serverurl += ("&udpport=" + remotePort);
if (remoteIP != null) { serverurl += "&udpaddr=" + remoteIP; }
}
- mapper.start(protocol, localPort, serverurl, remotePort, remoteIP);
+ mapper.start(parent.meshcentral, protocol, localPort, serverurl, remotePort, remoteIP);
UpdateInfo();
}
diff --git a/MeshMapper.cs b/MeshMapper.cs
index 7231f2f..1c4ee1a 100644
--- a/MeshMapper.cs
+++ b/MeshMapper.cs
@@ -17,8 +17,9 @@ namespace MeshCentralRouter
{
public class MeshMapper
{
+ public MeshCentralServer parent = null;
public int state = 0;
- Uri wsurl = null;
+ public string url = null;
public int protocol = 1; // 1 = TCP, 2 = UDP
public int localport = 0;
public int remoteport = 0;
@@ -67,12 +68,13 @@ namespace MeshCentralRouter
}
// Starts the routing server, called when the start button is pressed
- public void start(int protocol, int localPort, string url, int remotePort, string remoteIP)
+ public void start(MeshCentralServer parent, int protocol, int localPort, string url, int remotePort, string remoteIP)
{
+ this.parent = parent;
this.protocol = protocol;
this.remoteport = remotePort;
this.remoteip = remoteIP;
- wsurl = new Uri(url);
+ this.url = url;
//wshash = serverHashTextBox.Text;
Debug(string.Format("MeshMapper-Start: Protcol={0}, LocalPort={1}, Url={2}, RemotePort={3}, RemoteIP={4}", protocol, localPort, url, remotePort, remoteIP));
@@ -202,6 +204,7 @@ namespace MeshCentralRouter
private void ConnectWS(TcpClient client, int counter)
{
webSocketClient wc = new webSocketClient();
+ Uri wsurl = new Uri(url + "&auth=" + Uri.EscapeDataString(parent.authCookie));
Debug("#" + counter + ": Connecting web socket to: " + wsurl.ToString());
wc.xdebug = xdebug;
wc.Start(wsurl, certhash);
@@ -215,6 +218,7 @@ namespace MeshCentralRouter
private void ConnectWS(UdpClient client, int counter)
{
webSocketClient wc = new webSocketClient();
+ Uri wsurl = new Uri(url + "&auth=" + Uri.EscapeDataString(parent.authCookie));
Debug("#" + counter + ": Connecting web socket to: " + wsurl.ToString());
wc.xdebug = xdebug;
wc.Start(wsurl, certhash);