github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Added port in used check at speedtest

pull/2077/head
2dust 2022-01-12 21:06:22 +08:00
parent 0a1d4d5193
commit f3a86a2173
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
View File

@ -2,6 +2,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
using v2rayN.Mode; using v2rayN.Mode;
namespace v2rayN.Handler namespace v2rayN.Handler
@ -529,7 +531,7 @@ namespace v2rayN.Handler
serversItem.ota = false; serversItem.ota = false;
serversItem.level = 1; serversItem.level = 1;
//if xtls //if xtls
if (config.streamSecurity() == Global.StreamSecurityX) if (config.streamSecurity() == Global.StreamSecurityX)
{ {
@ -1418,6 +1420,12 @@ namespace v2rayN.Handler
msg = UIRes.I18N("FailedGenDefaultConfiguration"); msg = UIRes.I18N("FailedGenDefaultConfiguration");
return ""; return "";
} }
List<IPEndPoint> lstIpEndPoints = null;
try
{
lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
}
catch { }
log(configCopy, ref v2rayConfig, false); log(configCopy, ref v2rayConfig, false);
//routing(config, ref v2rayConfig); //routing(config, ref v2rayConfig);
@ -1426,6 +1434,7 @@ namespace v2rayN.Handler
v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts. v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
int httpPort = configCopy.GetLocalPort("speedtest"); int httpPort = configCopy.GetLocalPort("speedtest");
foreach (int index in selecteds) foreach (int index in selecteds)
{ {
if (configCopy.vmess[index].configType == (int)EConfigType.Custom) if (configCopy.vmess[index].configType == (int)EConfigType.Custom)
@ -1434,11 +1443,18 @@ namespace v2rayN.Handler
} }
configCopy.index = index; configCopy.index = index;
var port = httpPort + index;
//Port In Used
if (lstIpEndPoints != null && lstIpEndPoints.FindIndex(_it => _it.Port == port) >= 0)
{
continue;
}
Inbounds inbound = new Inbounds Inbounds inbound = new Inbounds
{ {
listen = Global.Loopback, listen = Global.Loopback,
port = httpPort + index, port = port,
protocol = Global.InboundHttp protocol = Global.InboundHttp
}; };
inbound.tag = Global.InboundHttp + inbound.port.ToString(); inbound.tag = Global.InboundHttp + inbound.port.ToString();