michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2556 from MediaBrowser/dev

Browse Source 
3.2.9.2
This commit is contained in:
Luke 2017-03-29 02:53:48 -04:00 committed by GitHub
commit 5340d53010
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Emby.Common.Implementations/Net/SocketFactory.cs
View File

@ -70,11 +70,23 @@ namespace Emby.Common.Implementations.Net
{ {
if (remotePort < 0) throw new ArgumentException("remotePort cannot be less than zero.", "remotePort"); if (remotePort < 0) throw new ArgumentException("remotePort cannot be less than zero.", "remotePort");
var retVal = new Socket(AddressFamily.InterNetwork, System.Net.Sockets.SocketType.Stream, System.Net.Sockets.ProtocolType.Tcp); var addressFamily = remoteAddress.AddressFamily == IpAddressFamily.InterNetwork
? AddressFamily.InterNetwork
: AddressFamily.InterNetworkV6;
var retVal = new Socket(addressFamily, System.Net.Sockets.SocketType.Stream, System.Net.Sockets.ProtocolType.Tcp);
try try
{ {
retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true); retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
}
catch (SocketException)
{
// This is not supported on all operating systems (qnap)
}
try
{
return new UdpSocket(retVal, new IpEndPointInfo(remoteAddress, remotePort)); return new UdpSocket(retVal, new IpEndPointInfo(remoteAddress, remotePort));
} }
catch catch

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.8.16")] [assembly: AssemblyVersion("3.2.9.2")]