Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加对多网卡的支持 #409

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

增加对多网卡的支持 #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca71af1
Merge pull request #1 from fanliang11/master
ligg Nov 26, 2020
176d102
增加对多网卡的支持
ligg Nov 26, 2020
1f7c5fc
Merge branch 'fanliang11:master' into master
ligg Feb 23, 2022
dad0962
Merge branch 'fanliang11:master' into master
ligg Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@ public partial class SurgingServerOptions: ServiceCommand
public string NotRelatedAssemblyFiles { get; set; }

public string RelatedAssemblyFiles { get; set; } = "";

public string PreferredNetworks { get; set; } = "";
}
}
11 changes: 10 additions & 1 deletion src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static string GetAnyHostAddress()
UnicastIPAddressInformationCollection ipCollection = ipxx.UnicastAddresses;
foreach (UnicastIPAddressInformation ipadd in ipCollection)
{
if (ipadd.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
if (ipadd.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork&&IsPreferredAddress(ipadd.Address.ToString()))
{
result = ipadd.Address.ToString();
}
Expand All @@ -71,6 +71,15 @@ public static string GetAnyHostAddress()
return result;
}

private static bool IsPreferredAddress(string hostAddress)
{
if (string.IsNullOrEmpty(AppConfig.ServerOptions.PreferredNetworks))
{
return true;
}
return hostAddress.StartsWith(AppConfig.ServerOptions.PreferredNetworks);
}

public static string GetHostAddress(string hostAddress)
{
var result = hostAddress;
Expand Down
1 change: 1 addition & 0 deletions src/Surging.Services/Surging.Services.Server/surgingSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"Ip": "${Surging_Server_IP}|127.0.0.1",
"WatchInterval": 30,
"Port": "${Surging_Server_Port}|98",
"PreferredNetworks": "",
"MappingIp": "${Mapping_ip}",
"MappingPort": "${Mapping_Port}",
"Token": "true",
Expand Down