aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Net
diff options
context:
space:
mode:
authorClaus Vium <clausvium@gmail.com>2019-03-07 20:16:51 +0100
committerClaus Vium <clausvium@gmail.com>2019-03-07 20:16:51 +0100
commit0abe57e930e44eab9566991f33b089d1e61cfb83 (patch)
tree602be322daedca127ba66de07837ac8e792730a7 /MediaBrowser.Common/Net
parentdfff68b2f4ca8d3da59508eb4cbe2e751ed76f49 (diff)
parentae0ecc1b10982d9240ecdcc82cb7299fc708aafb (diff)
Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc
Diffstat (limited to 'MediaBrowser.Common/Net')
-rw-r--r--MediaBrowser.Common/Net/INetworkManager.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 72fb6e2b8..34c6f5866 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.Common.Net
/// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
bool IsInLocalNetwork(string endpoint);
- IpAddressInfo[] GetLocalIpAddresses();
+ IpAddressInfo[] GetLocalIpAddresses(bool ignoreVirtualInterface);
IpAddressInfo ParseIpAddress(string ipAddress);
@@ -62,5 +62,8 @@ namespace MediaBrowser.Common.Net
Task<IpAddressInfo[]> GetHostAddressesAsync(string host);
bool IsAddressInSubnets(string addressString, string[] subnets);
+
+ bool IsInSameSubnet(IpAddressInfo address1, IpAddressInfo address2, IpAddressInfo subnetMask);
+ IpAddressInfo GetLocalIpSubnetMask(IpAddressInfo address);
}
}