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

Update firewall authorization

Browse Source
This commit is contained in:
Luke Pulverenti 2016-03-26 13:51:27 -04:00
parent 661acc256a
commit ac07c2072a
8 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Dlna/Server/UpnpDevice.cs
View File

@ -19,13 +19,18 @@ namespace MediaBrowser.Dlna.Server
Address = address;
if (Type.StartsWith("uuid:", StringComparison.OrdinalIgnoreCase))
USN = CreateUSN(aUuid, aType);
}
private static string CreateUSN(string aUuid, string aType)
{
USN = Type;
if (aType.StartsWith("uuid:", StringComparison.OrdinalIgnoreCase))
{
return aType;
}
else
{
USN = String.Format("uuid:{0}::{1}", Uuid, Type);
return String.Format("uuid:{0}::{1}", aUuid, aType);
}
}
}

4
MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
View File

@ -172,9 +172,9 @@ namespace MediaBrowser.Dlna.Ssdp
{
get
{
var devices = _devices.Values.ToList();
var devices = _devices.ToList();
return devices.SelectMany(i => i).ToList();
return devices.SelectMany(i => i.Value).ToList();
}
}

2
MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
View File

@ -90,7 +90,7 @@ namespace MediaBrowser.Server.Mono.Native
return list;
}
public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory)
{
}

1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -1299,6 +1299,7 @@ namespace MediaBrowser.Server.Startup.Common
UdpServerEntryPoint.PortNumber,
ServerConfigurationManager.Configuration.HttpServerPortNumber,
ServerConfigurationManager.Configuration.HttpsPortNumber,
ConfigurationManager.CommonApplicationPaths.ApplicationPath,
ConfigurationManager.CommonApplicationPaths.TempDirectory);
}
catch (Exception ex)

2
MediaBrowser.Server.Startup.Common/INativeApp.cs
View File

@ -21,7 +21,7 @@ namespace MediaBrowser.Server.Startup.Common
/// <param name="httpServerPort">The HTTP server port.</param>
/// <param name="httpsServerPort">The HTTPS server port.</param>
/// <param name="tempDirectory">The temporary directory.</param>
void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory);
void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory);
/// <summary>
/// Gets the environment.

7
MediaBrowser.ServerApplication/Native/RegisterServer.bat
View File

@ -1,6 +1,7 @@
rem %1 = udp server port
rem %2 = http server port
rem %3 = https server port
rem %4 = exe path
if [%1]==[] GOTO DONE
@ -17,6 +18,12 @@ if [%3]==[] GOTO DONE
netsh advfirewall firewall delete rule name="Port %3" protocol=TCP localport=%3
netsh advfirewall firewall add rule name="Port %3" dir=in action=allow protocol=TCP localport=%3
if [%4]==[] GOTO DONE
netsh advfirewall firewall delete rule name="Emby Server"
netsh advfirewall firewall add rule name="Emby Server" dir=in action=allow protocol=TCP program=%4 enable=yes
netsh advfirewall firewall add rule name="Emby Server" dir=in action=allow protocol=UDP program=%4 enable=yes
:DONE
Exit

4
MediaBrowser.ServerApplication/Native/ServerAuthorization.cs
View File

@ -17,7 +17,7 @@ namespace MediaBrowser.ServerApplication.Native
/// <param name="httpServerPort">The HTTP server port.</param>
/// <param name="httpsServerPort">The HTTPS server port.</param>
/// <param name="tempDirectory">The temp directory.</param>
public static void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory)
public static void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory)
{
Directory.CreateDirectory(tempDirectory);
@ -37,7 +37,7 @@ namespace MediaBrowser.ServerApplication.Native
{
FileName = tmpFile,
Arguments = string.Format("{0} {1} {2}", udpPort, httpServerPort, httpsServerPort),
Arguments = string.Format("{0} {1} {2} \"{3}\"", udpPort, httpServerPort, httpsServerPort, applicationPath),
CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden,

4
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@ -35,9 +35,9 @@ namespace MediaBrowser.ServerApplication.Native
return list;
}
public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory)
{
ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, tempDirectory);
ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, applicationPath, tempDirectory);
}
public NativeEnvironment Environment