minor cleanup

pull/4/head
kay.one 11 years ago
parent c88b5ee946
commit b6d3c28fa1

@ -3,12 +3,11 @@ using NetFwTypeLib;
using NLog;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Host.Host
namespace NzbDrone.Host.AccessControl
{
public interface IFirewallAdapter
{
void MakeAccessible();
bool IsNzbDronePortOpen();
}
public class FirewallAdapter : IFirewallAdapter
@ -24,8 +23,6 @@ namespace NzbDrone.Host.Host
public void MakeAccessible()
{
int port = 0;
if (IsFirewallEnabled())
{
if (IsNzbDronePortOpen())
@ -42,7 +39,7 @@ namespace NzbDrone.Host.Host
}
public bool IsNzbDronePortOpen()
private bool IsNzbDronePortOpen()
{
try
{
@ -75,7 +72,7 @@ namespace NzbDrone.Host.Host
try
{
var type = Type.GetTypeFromProgID("HNetCfg.FWOpenPort", false);
var port = Activator.CreateInstance(type) as INetFwOpenPort;
var port = (INetFwOpenPort)Activator.CreateInstance(type);
port.Port = portNumber;
port.Name = "NzbDrone";
@ -94,7 +91,7 @@ namespace NzbDrone.Host.Host
}
}
private int CloseFirewallPort()
private void CloseFirewallPort()
{
try
{
@ -116,14 +113,12 @@ namespace NzbDrone.Host.Host
if (portNumber != _configFileProvider.Port)
{
ports.Remove(portNumber, NET_FW_IP_PROTOCOL_.NET_FW_IP_PROTOCOL_TCP);
return portNumber;
}
}
catch (Exception ex)
{
_logger.WarnException("Failed to close port in firewall for NzbDrone", ex);
}
return 0;
}
private bool IsFirewallEnabled()

@ -4,7 +4,7 @@ using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Host.Host
namespace NzbDrone.Host.AccessControl
{
public interface IUrlAclAdapter
{
@ -43,8 +43,6 @@ namespace NzbDrone.Host.Host
{
try
{
var process = _processProvider.ShellExecute("netsh.exe", arguments);
process.WaitForExit(5000);
}

@ -4,7 +4,7 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
using NzbDrone.Host.Host;
using NzbDrone.Host.AccessControl;
using NzbDrone.Host.Owin;
namespace NzbDrone.Host

@ -107,8 +107,8 @@
<Compile Include="ApplicationServer.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Host\FirewallAdapter.cs" />
<Compile Include="Host\UrlAclAdapter.cs" />
<Compile Include="AccessControl\FirewallAdapter.cs" />
<Compile Include="AccessControl\UrlAclAdapter.cs" />
<Compile Include="MainAppContainerBuilder.cs" />
<Compile Include="ApplicationModes.cs" />
<Compile Include="Bootstrap.cs" />

@ -121,9 +121,6 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\NzbDroneIcon.bmp" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Loading…
Cancel
Save