Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix network methods not shutting down

Browse Source
This commit is contained in:
Luke Pulverenti 2017-06-24 14:30:15 -04:00
parent bcaf9bd19c
commit 5759ba8656
1 changed files with 104 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
Mono.Nat/NatUtility.cs
View File

@ -41,25 +41,24 @@ using MediaBrowser.Model.Logging;
namespace Mono.Nat namespace Mono.Nat
{ {
public static class NatUtility public static class NatUtility
{ {
private static ManualResetEvent searching; public static event EventHandler<DeviceEventArgs> DeviceFound;
public static event EventHandler<DeviceEventArgs> DeviceFound; public static event EventHandler<DeviceEventArgs> DeviceLost;
public static event EventHandler<DeviceEventArgs> DeviceLost;
private static List<ISearcher> controllers; private static List<ISearcher> controllers;
private static bool verbose; private static bool verbose;
public static List<NatProtocol> EnabledProtocols { get; set; } public static List<NatProtocol> EnabledProtocols { get; set; }
public static ILogger Logger { get; set; } public static ILogger Logger { get; set; }
public static IHttpClient HttpClient { get; set; } public static IHttpClient HttpClient { get; set; }
public static bool Verbose public static bool Verbose
{ {
get { return verbose; } get { return verbose; }
set { verbose = value; } set { verbose = value; }
} }
static NatUtility() static NatUtility()
{ {
@ -68,8 +67,6 @@ namespace Mono.Nat
NatProtocol.Pmp NatProtocol.Pmp
}; };
searching = new ManualResetEvent(false);
controllers = new List<ISearcher>(); controllers = new List<ISearcher>();
controllers.Add(PmpSearcher.Instance); controllers.Add(PmpSearcher.Instance);
@ -86,23 +83,19 @@ namespace Mono.Nat
DeviceLost(sender, args); DeviceLost(sender, args);
}; };
}); });
Task.Factory.StartNew(SearchAndListen, TaskCreationOptions.LongRunning);
} }
internal static void Log(string format, params object[] args) internal static void Log(string format, params object[] args)
{
var logger = Logger;
if (logger != null)
logger.Debug(format, args);
}
private static async Task SearchAndListen()
{ {
while (true) var logger = Logger;
{ if (logger != null)
searching.WaitOne(); logger.Debug(format, args);
}
private static async Task SearchAndListen(CancellationToken cancellationToken)
{
while (!cancellationToken.IsCancellationRequested)
{
try try
{ {
var enabledProtocols = EnabledProtocols.ToList(); var enabledProtocols = EnabledProtocols.ToList();
@ -127,63 +120,95 @@ namespace Mono.Nat
} }
await Task.Delay(100).ConfigureAwait(false); await Task.Delay(100).ConfigureAwait(false);
} }
} }
static async Task Receive (ISearcher searcher, List<UdpClient> clients) static async Task Receive(ISearcher searcher, List<UdpClient> clients)
{ {
foreach (UdpClient client in clients) foreach (UdpClient client in clients)
{ {
if (client.Available > 0) if (client.Available > 0)
{ {
IPAddress localAddress = ((IPEndPoint)client.Client.LocalEndPoint).Address; IPAddress localAddress = ((IPEndPoint)client.Client.LocalEndPoint).Address;
var result = await client.ReceiveAsync().ConfigureAwait(false); var result = await client.ReceiveAsync().ConfigureAwait(false);
var data = result.Buffer; var data = result.Buffer;
var received = result.RemoteEndPoint; var received = result.RemoteEndPoint;
searcher.Handle(localAddress, data, received); searcher.Handle(localAddress, data, received);
} }
} }
} }
public static void StartDiscovery () private static CancellationTokenSource _currentCancellationTokenSource;
{ private static object _runSyncLock = new object();
searching.Set(); public static void StartDiscovery()
} {
lock (_runSyncLock)
{
if (_currentCancellationTokenSource == null)
{
return;
}
public static void StopDiscovery () var tokenSource = new CancellationTokenSource();
{
searching.Reset();
}
//checks if an IP address is a private address space as defined by RFC 1918 _currentCancellationTokenSource = tokenSource;
public static bool IsPrivateAddressSpace (IPAddress address) //Task.Factory.StartNew(() => SearchAndListen(tokenSource.Token), tokenSource.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
{ }
byte[] ba = address.GetAddressBytes (); }
switch ((int)ba[0]) { public static void StopDiscovery()
case 10: {
return true; //10.x.x.x lock (_runSyncLock)
case 172: {
return ((int)ba[1] & 16) != 0; //172.16-31.x.x var tokenSource = _currentCancellationTokenSource;
case 192:
return (int)ba[1] == 168; //192.168.x.x
default:
return false;
}
}
public static void Handle(IPAddress localAddress, byte[] response, IPEndPoint endpoint, NatProtocol protocol) if (tokenSource != null)
{ {
switch (protocol) try
{ {
tokenSource.Cancel();
tokenSource.Dispose();
}
catch
{
}
_currentCancellationTokenSource = null;
}
}
}
//checks if an IP address is a private address space as defined by RFC 1918
public static bool IsPrivateAddressSpace(IPAddress address)
{
byte[] ba = address.GetAddressBytes();
switch ((int)ba[0])
{
case 10:
return true; //10.x.x.x
case 172:
return ((int)ba[1] & 16) != 0; //172.16-31.x.x
case 192:
return (int)ba[1] == 168; //192.168.x.x
default:
return false;
}
}
public static void Handle(IPAddress localAddress, byte[] response, IPEndPoint endpoint, NatProtocol protocol)
{
switch (protocol)
{
case NatProtocol.Upnp: case NatProtocol.Upnp:
//UpnpSearcher.Instance.Handle(localAddress, response, endpoint); //UpnpSearcher.Instance.Handle(localAddress, response, endpoint);
break; break;
case NatProtocol.Pmp: case NatProtocol.Pmp:
PmpSearcher.Instance.Handle(localAddress, response, endpoint); PmpSearcher.Instance.Handle(localAddress, response, endpoint);
break; break;
default: default:
throw new ArgumentException("Unexpected protocol: " + protocol); throw new ArgumentException("Unexpected protocol: " + protocol);
} }
} }
public static void Handle(IPAddress localAddress, UpnpDeviceInfo deviceInfo, IPEndPoint endpoint, NatProtocol protocol) public static void Handle(IPAddress localAddress, UpnpDeviceInfo deviceInfo, IPEndPoint endpoint, NatProtocol protocol)