This commit is contained in:
zmjack 2020-05-29 02:52:38 +08:00
parent ddcad22510
commit ac523c468d
2 changed files with 41 additions and 25 deletions

View File

@ -53,12 +53,11 @@
//
// textBox_listenOn
//
this.textBox_listenOn.Enabled = false;
this.textBox_listenOn.Location = new System.Drawing.Point(92, 12);
this.textBox_listenOn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.textBox_listenOn.Name = "textBox_listenOn";
this.textBox_listenOn.Size = new System.Drawing.Size(120, 23);
this.textBox_listenOn.TabIndex = 1;
this.textBox_listenOn.TabIndex = 0;
this.textBox_listenOn.Text = "*";
this.textBox_listenOn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//

View File

@ -22,15 +22,16 @@ namespace PortProxyGUI
InitializeComponent();
}
private void AddPortProxy(string type, string listenPort, string connectTo, string connectPort)
private void AddPortProxy(string type, string listenOn, string listenPort, string connectTo, string connectPort)
{
var output = CmdRunner.Execute($"netsh interface portproxy add {type} listenport={listenPort} connectaddress={connectTo} connectport={connectPort}");
var output = CmdRunner.Execute($"netsh interface portproxy add {type} listenaddress={listenOn} listenport={listenPort} connectaddress={connectTo} connectport={connectPort}");
Invoke((Action)(() => PortProxyGUI.RefreshProxyList()));
}
private void button1_Click(object sender, EventArgs e)
{
var type = comboBox_type.Text;
var listenOn = textBox_listenOn.Text;
var connectTo = textBox_connectTo.Text;
var listenPort = textBox_listenPort.Text;
var connectPort = textBox_connectPort.Text;
@ -41,26 +42,6 @@ namespace PortProxyGUI
return;
}
var ipv4 = connectTo.IsMatch(new Regex(@"^(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])(?:\.(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])){3}$"));
var ipv6 = connectTo.IsMatch(new Regex(@"^[\dABCDEF]{2}(?::(?:[\dABCDEF]{2})){5}$"));
if (!ipv4 && !ipv6)
{
MessageBox.Show($"The address which is connect to is neither IPv4 nor IPv6.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (ipv4 && !type.EndsWith("v4"))
{
MessageBox.Show($"The type must be v4tov4 or v6tov4.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
else if (ipv6 && !type.EndsWith("v6"))
{
MessageBox.Show($"The type must be v4tov6 or v6tov6.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (!int.TryParse(listenPort, out var _listenPort) || _listenPort < 0 || _listenPort > 65535)
{
MessageBox.Show($"The listen port is invalid.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
@ -73,7 +54,43 @@ namespace PortProxyGUI
return;
}
AddPortProxy(type, listenPort, connectTo, connectPort);
var listenOn_any = listenOn == "*";
var listenOn_ipv4 = listenOn.IsMatch(new Regex(@"^(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])(?:\.(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])){3}$"));
var listenOn_ipv6 = listenOn.IsMatch(new Regex(@"^[\dABCDEF]{2}(?::(?:[\dABCDEF]{2})){5}$"));
var connectTo_ipv4 = connectTo.IsMatch(new Regex(@"^(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])(?:\.(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])){3}$"));
var connectTo_ipv6 = connectTo.IsMatch(new Regex(@"^[\dABCDEF]{2}(?::(?:[\dABCDEF]{2})){5}$"));
if (!listenOn_any && !listenOn_ipv4 && !listenOn_ipv6)
{
MessageBox.Show($"The address which is connect to is neither IPv4 nor IPv6.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (!connectTo_ipv4 && !connectTo_ipv6)
{
MessageBox.Show($"The address which is connect to is neither IPv4 nor IPv6.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (listenOn_any && connectTo_ipv4 && !type.EndsWith("v4"))
{
MessageBox.Show($"The type must be v4tov4 or v6tov4.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
else if (listenOn_any && connectTo_ipv6 && !type.EndsWith("v6"))
{
MessageBox.Show($"The type must be v4tov6 or v6tov6.", "Fail", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
else
{
if (listenOn_ipv4 && connectTo_ipv4) type = comboBox_type.Text = "v4tov4";
else if (listenOn_ipv4 && connectTo_ipv6) type = comboBox_type.Text = "v4tov6";
else if (listenOn_ipv6 && connectTo_ipv4) type = comboBox_type.Text = "v6tov4";
else if (listenOn_ipv6 && connectTo_ipv6) type = comboBox_type.Text = "v6tov6";
}
AddPortProxy(type, listenOn, listenPort, connectTo, connectPort);
}
private void NewProxy_Load(object sender, EventArgs e)