Fixed SSH/RDP order.

2025-12-06 00:13:33 +00:00 · 2021-02-03 01:28:25 -08:00
parent 5a8bf63f99
commit 17e0d17053
4 changed files with 72 additions and 72 deletions
--- a/DeviceUserControl.resx
+++ b/DeviceUserControl.resx
@@ -269,7 +269,7 @@
    <value>60, 10</value>
  </data>
  <data name="deviceNameLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 15</value>
+    <value>229, 15</value>
  </data>
  <data name="deviceNameLabel.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -296,7 +296,7 @@
    <value>60, 30</value>
  </data>
  <data name="deviceStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 15</value>
+    <value>229, 15</value>
  </data>
  <data name="deviceStatusLabel.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -322,12 +322,6 @@
  <metadata name="rdpContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>313, 17</value>
  </metadata>
-  <data name="setRDPPortToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 22</value>
-  </data>
-  <data name="setRDPPortToolStripMenuItem.Text" xml:space="preserve">
-    <value>Set RDP port...</value>
-  </data>
  <data name="rdpContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
    <value>150, 26</value>
  </data>
@@ -338,7 +332,7 @@
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="rdpButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>365, 4</value>
+    <value>359, 4</value>
  </data>
  <data name="rdpButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>58, 47</value>
@@ -361,6 +355,12 @@
  <data name="&gt;&gt;rdpButton.ZOrder" xml:space="preserve">
    <value>6</value>
  </data>
+  <data name="setRDPPortToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 22</value>
+  </data>
+  <data name="setRDPPortToolStripMenuItem.Text" xml:space="preserve">
+    <value>Set RDP port...</value>
+  </data>
  <metadata name="deviceImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>15, 17</value>
  </metadata>
@@ -369,7 +369,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy
-        mgAAAk1TRnQBSQFMAgEBCAEAAXgBAAF4AQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
+        mgAAAk1TRnQBSQFMAgEBCAEAAYABAAGAAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
        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
@@ -1037,7 +1037,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4
-        mgAAAk1TRnQBSQFMAgEBCAEAAYABAAGAAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
+        mgAAAk1TRnQBSQFMAgEBCAEAAYgBAAGIAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
        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
@@ -1706,12 +1706,6 @@
  <metadata name="altPortContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>468, 17</value>
  </metadata>
-  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>178, 22</value>
-  </data>
-  <data name="toolStripMenuItem1.Text" xml:space="preserve">
-    <value>Use Alternate Port...</value>
-  </data>
  <data name="altPortContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
    <value>179, 26</value>
  </data>
@@ -1722,7 +1716,7 @@
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="httpsButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>301, 4</value>
+    <value>295, 4</value>
  </data>
  <data name="httpsButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>58, 23</value>
@@ -1745,11 +1739,17 @@
  <data name="&gt;&gt;httpsButton.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
+  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>178, 22</value>
+  </data>
+  <data name="toolStripMenuItem1.Text" xml:space="preserve">
+    <value>Use Alternate Port...</value>
+  </data>
  <data name="httpButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Right</value>
  </data>
  <data name="httpButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>301, 28</value>
+    <value>295, 28</value>
  </data>
  <data name="httpButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>58, 23</value>
@@ -1776,7 +1776,7 @@
    <value>Top, Right</value>
  </data>
  <data name="scpButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>365, 28</value>
+    <value>359, 28</value>
  </data>
  <data name="scpButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>58, 23</value>
@@ -1803,7 +1803,7 @@
    <value>Top, Right</value>
  </data>
  <data name="sshButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>365, 4</value>
+    <value>359, 4</value>
  </data>
  <data name="sshButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>58, 23</value>
@@ -1833,7 +1833,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>425, 52</value>
+    <value>421, 53</value>
  </data>
  <data name="&gt;&gt;setRDPPortToolStripMenuItem.Name" xml:space="preserve">
    <value>setRDPPortToolStripMenuItem</value>
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -1337,7 +1337,7 @@ namespace MeshCentralRouter
            map.protocol = protocol; // 1 = TCP, 2 = UDP
            map.localPort = 0; // Any
            map.remotePort = port; // HTTP
-            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 = PuTTY, 4 = RDP, 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;
@@ -1609,6 +1609,15 @@ namespace MeshCentralRouter
            QuickMap(1, 443, 2, node); // HTTPS
        }

+        private void sshToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (devicesListView.SelectedItems.Count != 1) { return; }
+            ListViewItem selecteditem = devicesListView.SelectedItems[0];
+            NodeClass node = (NodeClass)selecteditem.Tag;
+            if ((node.conn & 1) == 0) { return; } // Agent not connected on this device
+            QuickMap(1, 22, 3, node); // Putty
+        }
+
        private void rdpToolStripMenuItem_Click(object sender, EventArgs e)
        {
            if (devicesListView.SelectedItems.Count != 1) { return; }
@@ -1617,16 +1626,7 @@ namespace MeshCentralRouter
            if ((node.conn & 1) == 0) { return; } // Agent not connected on this device
            int rdpport = 3389;
            if (node.rdpport != 0) { rdpport = node.rdpport; }
-            QuickMap(1, rdpport, 3, node); // RDP
-        }
-
-        private void sshToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (devicesListView.SelectedItems.Count != 1) { return; }
-            ListViewItem selecteditem = devicesListView.SelectedItems[0];
-            NodeClass node = (NodeClass)selecteditem.Tag;
-            if ((node.conn & 1) == 0) { return; } // Agent not connected on this device
-            QuickMap(1, 22, 4, node); // Putty
+            QuickMap(1, rdpport, 4, node); // RDP
        }

        private void scpToolStripMenuItem_Click(object sender, EventArgs e)
--- a/MapUserControl.cs
+++ b/MapUserControl.cs
@@ -95,8 +95,8 @@ namespace MeshCentralRouter
            } else {
                if (appId == 1) { statemsg = "HTTP: " + statemsg; }
                else if (appId == 2) { statemsg = "HTTPS: " + statemsg; }
-                else if (appId == 3) { statemsg = "RDP: " + statemsg; }
-                else if (appId == 4) { statemsg = "PuTTY: " + statemsg; }
+                else if (appId == 3) { statemsg = "PuTTY: " + statemsg; }
+                else if (appId == 4) { statemsg = "RDP: " + statemsg; }
                else if (appId == 5) { statemsg = "WinSCP: " + statemsg; }
                else { statemsg = "TCP: " + statemsg; }
            }
@@ -111,33 +111,6 @@ namespace MeshCentralRouter
            if (appId == 1) { System.Diagnostics.Process.Start("http://localhost:" + mapper.localport); }
            if (appId == 2) { System.Diagnostics.Process.Start("https://localhost:" + mapper.localport); }
            if (appId == 3)
-            {
-                System.Diagnostics.Process proc = null;
-                string cmd = System.Environment.GetFolderPath(System.Environment.SpecialFolder.System) + "\\mstsc.exe";
-                string tfile = Path.Combine(Path.GetTempPath(), "MeshRdpFile.rdp");
-                string[] f = null;
-                try { if (File.Exists(tfile)) f = File.ReadAllLines(tfile); } catch (Exception) { }
-                if (f != null)
-                {
-                    List<string> f2 = new List<string>();
-                    foreach (string fx in f) { if (!fx.StartsWith("full address")) f2.Add(fx); }
-                    f2.Add(string.Format("full address:s:127.0.0.1:{0}", mapper.localport));
-                    File.WriteAllLines(tfile, f2.ToArray());
-                }
-                else
-                {
-                    File.WriteAllText(tfile, string.Format("full address:s:127.0.0.1:{0}", mapper.localport));
-                }
-                string args = "/edit:\"" + tfile + "\"";
-
-                // Launch the process
-                try { proc = System.Diagnostics.Process.Start(cmd, args); }
-                catch (System.ComponentModel.Win32Exception) { }
-
-                // Setup auto-exit
-                if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
-            }
-            if (appId == 4)
            {
                string puttyPath = loadFromRegistry("PuttyPath");
                if ((shift == false) && (File.Exists(puttyPath)))
@@ -163,7 +136,7 @@ namespace MeshCentralRouter
                        {
                            saveToRegistry("PuttyPath", f.GetAppPath());
                            string args = "-ssh 127.0.0.1 -P " + mapper.localport;
-                            
+
                            // Launch the process
                            try { proc = System.Diagnostics.Process.Start(f.GetAppPath(), args); }
                            catch (System.ComponentModel.Win32Exception) { }
@@ -174,6 +147,33 @@ namespace MeshCentralRouter
                    }
                }
            }
+            if (appId == 4)
+            {
+                System.Diagnostics.Process proc = null;
+                string cmd = System.Environment.GetFolderPath(System.Environment.SpecialFolder.System) + "\\mstsc.exe";
+                string tfile = Path.Combine(Path.GetTempPath(), "MeshRdpFile.rdp");
+                string[] f = null;
+                try { if (File.Exists(tfile)) f = File.ReadAllLines(tfile); } catch (Exception) { }
+                if (f != null)
+                {
+                    List<string> f2 = new List<string>();
+                    foreach (string fx in f) { if (!fx.StartsWith("full address")) f2.Add(fx); }
+                    f2.Add(string.Format("full address:s:127.0.0.1:{0}", mapper.localport));
+                    File.WriteAllLines(tfile, f2.ToArray());
+                }
+                else
+                {
+                    File.WriteAllText(tfile, string.Format("full address:s:127.0.0.1:{0}", mapper.localport));
+                }
+                string args = "/edit:\"" + tfile + "\"";
+
+                // Launch the process
+                try { proc = System.Diagnostics.Process.Start(cmd, args); }
+                catch (System.ComponentModel.Win32Exception) { }
+
+                // Setup auto-exit
+                if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
+            }
            if (appId == 5)
            {
                string winScpPath = loadFromRegistry("WinSCPPath");
--- a/MapUserControl.resx
+++ b/MapUserControl.resx
@@ -119,7 +119,7 @@
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="devicePictureBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 3</value>
+    <value>5, 0</value>
  </data>
  <data name="devicePictureBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>50, 50</value>
@@ -151,10 +151,10 @@
    <value>NoControl</value>
  </data>
  <data name="deviceNameLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>60, 11</value>
+    <value>60, 8</value>
  </data>
  <data name="deviceNameLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>280, 15</value>
+    <value>273, 15</value>
  </data>
  <data name="deviceNameLabel.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -181,10 +181,10 @@
    <value>NoControl</value>
  </data>
  <data name="routingStatusLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>60, 31</value>
+    <value>60, 28</value>
  </data>
  <data name="routingStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>280, 15</value>
+    <value>273, 15</value>
  </data>
  <data name="routingStatusLabel.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -208,7 +208,7 @@
    <value>Top, Right</value>
  </data>
  <data name="appButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>346, 4</value>
+    <value>339, 1</value>
  </data>
  <data name="appButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 23</value>
@@ -235,7 +235,7 @@
    <value>Top, Right</value>
  </data>
  <data name="closeButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>346, 28</value>
+    <value>339, 25</value>
  </data>
  <data name="closeButton.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 23</value>
@@ -266,7 +266,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy
-        mgAAAk1TRnQBSQFMAgEBCAEAAVgBAAFYAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
+        mgAAAk1TRnQBSQFMAgEBCAEAAWABAAFgAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI
        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
@@ -954,7 +954,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>421, 54</value>
+    <value>417, 53</value>
  </data>
  <data name="&gt;&gt;deviceImageList.Name" xml:space="preserve">
    <value>deviceImageList</value>