aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-11-18 21:35:08 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-11-18 21:35:08 -0500
commit252dde1722dd66c23272d44f9940182e2cda7720 (patch)
tree040fbcbb6315cee81ee5208f48759de44172d795 /MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
parent904175ce268a809270d291811dc94f1deb83e7ff (diff)
update components
Diffstat (limited to 'MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs')
-rw-r--r--MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index 834bac67d..703fec68d 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -84,16 +84,16 @@ namespace MediaBrowser.Common.Implementations.Networking
return true;
}
- private bool IsInPrivateAddressSpaceIpv6(string endpoint)
+ private bool IsInPrivateAddressSpace(string endpoint)
{
- return
+ if (string.Equals(endpoint, "::1", StringComparison.OrdinalIgnoreCase))
+ {
+ return true;
+ }
- // If url was requested with computer name, we may see this
- string.Equals(endpoint, "::1", StringComparison.OrdinalIgnoreCase);
- }
+ // Handle ipv4 mapped to ipv6
+ endpoint = endpoint.Replace("::ffff:", string.Empty);
- private bool IsInPrivateAddressSpaceIpv4(string endpoint)
- {
// Private address space:
// http://en.wikipedia.org/wiki/Private_network
@@ -145,7 +145,7 @@ namespace MediaBrowser.Common.Implementations.Networking
if (address.AddressFamily == AddressFamily.InterNetwork)
{
lengthMatch = 4;
- if (IsInPrivateAddressSpaceIpv4(addressString))
+ if (IsInPrivateAddressSpace(addressString))
{
return true;
}
@@ -153,7 +153,7 @@ namespace MediaBrowser.Common.Implementations.Networking
else if (address.AddressFamily == AddressFamily.InterNetworkV6)
{
lengthMatch = 10;
- if (IsInPrivateAddressSpaceIpv6(endpoint))
+ if (IsInPrivateAddressSpace(endpoint))
{
return true;
}