MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Friendly name comments

Browse Source 
Signed-off-by: Troy Cook <cookta2012@gmail.com>
This commit is contained in:
Troy Cook
2020-08-09 21:27:25 -05:00
parent 869c4ebd78
commit 25c8b207b2
8 changed files with 220 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AddPortMapForm.Designer.cs generated
View File

@@ -44,6 +44,8 @@
this.label6 = new System.Windows.Forms.Label();
this.tcpRadioButton = new System.Windows.Forms.RadioButton();
this.udpRadioButton = new System.Windows.Forms.RadioButton();
this.ruleNameTextBox = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.localNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.remoteNumericUpDown)).BeginInit();
this.SuspendLayout();
@@ -169,12 +171,24 @@
this.udpRadioButton.UseVisualStyleBackColor = true;
this.udpRadioButton.CheckedChanged += new System.EventHandler(this.tcpRadioButton_CheckedChanged);
//
// ruleNameTextBox
//
resources.ApplyResources(this.ruleNameTextBox, "ruleNameTextBox");
this.ruleNameTextBox.Name = "ruleNameTextBox";
//
// label8
//
resources.ApplyResources(this.label8, "label8");
this.label8.Name = "label8";
//
// AddPortMapForm
//
this.AcceptButton = this.okButton;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.cancelButton;
this.Controls.Add(this.ruleNameTextBox);
this.Controls.Add(this.label8);
this.Controls.Add(this.udpRadioButton);
this.Controls.Add(this.tcpRadioButton);
this.Controls.Add(this.label6);
@@ -219,5 +233,7 @@
private System.Windows.Forms.Label label6;
private System.Windows.Forms.RadioButton tcpRadioButton;
private System.Windows.Forms.RadioButton udpRadioButton;
private System.Windows.Forms.TextBox ruleNameTextBox;
private System.Windows.Forms.Label label8;
}
}

1
AddPortMapForm.cs
View File

@@ -21,6 +21,7 @@ namespace MeshCentralRouter
InitializeComponent();
}
public string getRuleName() { return ruleNameTextBox.Text; }
public int getProtocol() { return (int)(tcpRadioButton.Checked?1:2); }
public int getLocalPort() { return (int)localNumericUpDown.Value; }
public int getRemotePort() { return (int)remoteNumericUpDown.Value; }

114
AddPortMapForm.resx
View File

@@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
<value>288, 167</value>
<value>288, 194</value>
</data>
<data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -145,13 +145,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cancelButton.ZOrder" xml:space="preserve">
<value>14</value>
<value>16</value>
</data>
<data name="okButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>207, 167</value>
<value>207, 194</value>
</data>
<data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -172,13 +172,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
<value>13</value>
<value>15</value>
</data>
<data name="localNumericUpDown.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="localNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 33</value>
<value>157, 60</value>
</data>
<data name="localNumericUpDown.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
@@ -199,13 +199,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;localNumericUpDown.ZOrder" xml:space="preserve">
<value>12</value>
<value>14</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 35</value>
<value>12, 62</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 13</value>
@@ -226,13 +226,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>11</value>
<value>13</value>
</data>
<data name="nodeComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="nodeComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 86</value>
<value>157, 113</value>
</data>
<data name="nodeComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 21</value>
@@ -250,13 +250,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;nodeComboBox.ZOrder" xml:space="preserve">
<value>10</value>
<value>12</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 89</value>
<value>12, 116</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 13</value>
@@ -277,13 +277,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>9</value>
<value>11</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 142</value>
<value>12, 169</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 13</value>
@@ -304,13 +304,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="remoteNumericUpDown.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="remoteNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 140</value>
<value>157, 167</value>
</data>
<data name="remoteNumericUpDown.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
@@ -331,13 +331,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;remoteNumericUpDown.ZOrder" xml:space="preserve">
<value>8</value>
<value>10</value>
</data>
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 116</value>
<value>12, 143</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 13</value>
@@ -358,7 +358,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="appComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -382,7 +382,7 @@
<value>WinSCP</value>
</data>
<data name="appComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 113</value>
<value>157, 140</value>
</data>
<data name="appComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 21</value>
@@ -400,13 +400,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;appComboBox.ZOrder" xml:space="preserve">
<value>6</value>
<value>8</value>
</data>
<data name="label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 62</value>
<value>12, 89</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>73, 13</value>
@@ -427,13 +427,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="groupComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="groupComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 59</value>
<value>157, 86</value>
</data>
<data name="groupComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 21</value>
@@ -451,13 +451,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupComboBox.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 9</value>
<value>12, 36</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 13</value>
@@ -478,13 +478,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="tcpRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tcpRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 9</value>
<value>157, 36</value>
</data>
<data name="tcpRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 17</value>
@@ -505,13 +505,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;tcpRadioButton.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="udpRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="udpRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>209, 9</value>
<value>209, 36</value>
</data>
<data name="udpRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 17</value>
@@ -532,8 +532,62 @@
<value>$this</value>
</data>
<data name="&gt;&gt;udpRadioButton.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="ruleNameTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="ruleNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 10</value>
</data>
<data name="ruleNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
</data>
<data name="ruleNameTextBox.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.Name" xml:space="preserve">
<value>ruleNameTextBox</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 13</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="label8.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
</data>
<data name="label8.Text" xml:space="preserve">
<value>Rule Name</value>
</data>
<data name="&gt;&gt;label8.Name" xml:space="preserve">
<value>label8</value>
</data>
<data name="&gt;&gt;label8.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label8.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -541,7 +595,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>375, 202</value>
<value>375, 229</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

16
AddRelayMapForm.Designer.cs generated
View File

@@ -46,6 +46,8 @@
this.udpRadioButton = new System.Windows.Forms.RadioButton();
this.tcpRadioButton = new System.Windows.Forms.RadioButton();
this.label7 = new System.Windows.Forms.Label();
this.ruleNameTextBox = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.localNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.remoteNumericUpDown)).BeginInit();
this.SuspendLayout();
@@ -181,12 +183,24 @@
resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7";
//
// ruleNameTextBox
//
resources.ApplyResources(this.ruleNameTextBox, "ruleNameTextBox");
this.ruleNameTextBox.Name = "ruleNameTextBox";
//
// label8
//
resources.ApplyResources(this.label8, "label8");
this.label8.Name = "label8";
//
// AddRelayMapForm
//
this.AcceptButton = this.okButton;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.cancelButton;
this.Controls.Add(this.ruleNameTextBox);
this.Controls.Add(this.label8);
this.Controls.Add(this.udpRadioButton);
this.Controls.Add(this.tcpRadioButton);
this.Controls.Add(this.label7);
@@ -235,5 +249,7 @@
private System.Windows.Forms.RadioButton udpRadioButton;
private System.Windows.Forms.RadioButton tcpRadioButton;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox ruleNameTextBox;
private System.Windows.Forms.Label label8;
}
}

1
AddRelayMapForm.cs
View File

@@ -23,6 +23,7 @@ namespace MeshCentralRouter
updateInfo();
}
public string getRuleName() { return ruleNameTextBox.Text; }
public int getProtocol() { return (int)(tcpRadioButton.Checked ? 1 : 2); }
public int getLocalPort() { return (int)localNumericUpDown.Value; }
public int getRemotePort() { return (int)remoteNumericUpDown.Value; }

124
AddRelayMapForm.resx
View File

@@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
<value>288, 193</value>
<value>288, 220</value>
</data>
<data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -145,13 +145,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cancelButton.ZOrder" xml:space="preserve">
<value>16</value>
<value>18</value>
</data>
<data name="okButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>207, 193</value>
<value>207, 220</value>
</data>
<data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -172,13 +172,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
<value>15</value>
<value>17</value>
</data>
<data name="localNumericUpDown.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="localNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 32</value>
<value>157, 59</value>
</data>
<data name="localNumericUpDown.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
@@ -199,13 +199,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;localNumericUpDown.ZOrder" xml:space="preserve">
<value>14</value>
<value>16</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 34</value>
<value>12, 61</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 13</value>
@@ -226,13 +226,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>13</value>
<value>15</value>
</data>
<data name="nodeComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="nodeComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 85</value>
<value>157, 112</value>
</data>
<data name="nodeComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 21</value>
@@ -250,13 +250,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;nodeComboBox.ZOrder" xml:space="preserve">
<value>12</value>
<value>14</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 88</value>
<value>12, 115</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 13</value>
@@ -277,13 +277,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>11</value>
<value>13</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 167</value>
<value>12, 194</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 13</value>
@@ -304,13 +304,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>9</value>
<value>11</value>
</data>
<data name="remoteNumericUpDown.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="remoteNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 165</value>
<value>157, 192</value>
</data>
<data name="remoteNumericUpDown.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
@@ -331,13 +331,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;remoteNumericUpDown.ZOrder" xml:space="preserve">
<value>10</value>
<value>12</value>
</data>
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 115</value>
<value>12, 142</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 13</value>
@@ -358,7 +358,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="appComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -382,7 +382,7 @@
<value>WinSCP</value>
</data>
<data name="appComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 112</value>
<value>157, 139</value>
</data>
<data name="appComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 21</value>
@@ -400,13 +400,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;appComboBox.ZOrder" xml:space="preserve">
<value>8</value>
<value>10</value>
</data>
<data name="label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 142</value>
<value>12, 169</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>57, 13</value>
@@ -427,13 +427,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
<value>6</value>
<value>8</value>
</data>
<data name="remoteIpTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="remoteIpTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 139</value>
<value>157, 166</value>
</data>
<data name="remoteIpTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
@@ -457,13 +457,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;remoteIpTextBox.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 61</value>
<value>12, 88</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>73, 13</value>
@@ -484,13 +484,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="groupComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="groupComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 58</value>
<value>157, 85</value>
</data>
<data name="groupComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 21</value>
@@ -508,13 +508,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupComboBox.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="udpRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="udpRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>209, 9</value>
<value>209, 36</value>
</data>
<data name="udpRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 17</value>
@@ -535,13 +535,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;udpRadioButton.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<data name="tcpRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tcpRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 9</value>
<value>157, 36</value>
</data>
<data name="tcpRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 17</value>
@@ -562,13 +562,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;tcpRadioButton.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 9</value>
<value>12, 36</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 13</value>
@@ -589,7 +589,61 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="ruleNameTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="ruleNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>157, 10</value>
</data>
<data name="ruleNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 20</value>
</data>
<data name="ruleNameTextBox.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.Name" xml:space="preserve">
<value>ruleNameTextBox</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;ruleNameTextBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 13</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="label8.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="label8.Text" xml:space="preserve">
<value>Rule Name</value>
</data>
<data name="&gt;&gt;label8.Name" xml:space="preserve">
<value>label8</value>
</data>
<data name="&gt;&gt;label8.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label8.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@@ -598,7 +652,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>375, 228</value>
<value>375, 255</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

4
MainForm.cs
View File

@@ -814,6 +814,7 @@ namespace MeshCentralRouter
MapUserControl map = new MapUserControl();
map.xdebug = debug;
map.inaddrany = inaddrany;
map.ruleName = form.getRuleName();
map.protocol = form.getProtocol();
map.localPort = form.getLocalPort();
map.remotePort = form.getRemotePort();
@@ -941,6 +942,7 @@ namespace MeshCentralRouter
MapUserControl map = new MapUserControl();
map.xdebug = debug;
map.inaddrany = inaddrany;
map.ruleName = form.getRuleName();
map.protocol = form.getProtocol();
map.localPort = form.getLocalPort();
map.remotePort = form.getRemotePort();
@@ -1241,6 +1243,7 @@ namespace MeshCentralRouter
MapUserControl map = new MapUserControl();
map.xdebug = debug;
map.inaddrany = inaddrany;
map.ruleName = x["ruleName"].ToString();
map.protocol = (int)x["protocol"];
map.localPort = (int)x["localPort"];
if (x.ContainsKey("remoteIP")) { map.remoteIP = (string)x["remoteIP"]; }
@@ -1282,6 +1285,7 @@ namespace MeshCentralRouter
MeshMapper map = ((MapUserControl)c).mapper;
if (mapCounter == 0) { text += " {\r\n"; } else { text += ",\r\n {\r\n"; }
text += " \"nodeName\": \"" + mapCtrl.node.name + "\",\r\n";
text += " \"ruleName\": \"" + mapCtrl.ruleName + "\",\r\n";
text += " \"meshId\": \"" + mapCtrl.node.meshid + "\",\r\n";
text += " \"nodeId\": \"" + mapCtrl.node.nodeid + "\",\r\n";
text += " \"appId\": " + mapCtrl.appId + ",\r\n";

10
MapUserControl.cs
View File

@@ -14,6 +14,7 @@ namespace MeshCentralRouter
{
public partial class MapUserControl : UserControl
{
public string ruleName;
public int protocol;
public int localPort;
public string remoteIP = null;
@@ -44,7 +45,14 @@ namespace MeshCentralRouter
public void UpdateInfo()
{
deviceNameLabel.Text = node.name;
if(this.ruleName != null)
{
deviceNameLabel.Text = node.name + ": " + this.ruleName;
}
else
{
deviceNameLabel.Text = node.name;
}
devicePictureBox.Image = deviceImageList.Images[node.icon - 1];
}