aboutsummaryrefslogtreecommitdiff
path: root/Mono.Nat
diff options
context:
space:
mode:
Diffstat (limited to 'Mono.Nat')
-rw-r--r--Mono.Nat/Mapping.cs2
-rw-r--r--Mono.Nat/Mono.Nat.csproj2
-rw-r--r--Mono.Nat/NatProtocol.cs1
-rw-r--r--Mono.Nat/Pmp/PmpNatDevice.cs2
-rw-r--r--Mono.Nat/Pmp/PmpSearcher.cs14
-rw-r--r--Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs4
-rw-r--r--Mono.Nat/Upnp/Messages/UpnpMessage.cs2
-rw-r--r--Mono.Nat/Upnp/Searchers/UpnpSearcher.cs2
-rw-r--r--Mono.Nat/Upnp/UpnpNatDevice.cs12
9 files changed, 20 insertions, 21 deletions
diff --git a/Mono.Nat/Mapping.cs b/Mono.Nat/Mapping.cs
index 438068934..5b15d4e14 100644
--- a/Mono.Nat/Mapping.cs
+++ b/Mono.Nat/Mapping.cs
@@ -102,7 +102,7 @@ namespace Mono.Nat
public override bool Equals(object obj)
{
- Mapping other = obj as Mapping;
+ var other = obj as Mapping;
return other == null ? false : this.protocol == other.protocol &&
this.privatePort == other.privatePort && this.publicPort == other.publicPort;
}
diff --git a/Mono.Nat/Mono.Nat.csproj b/Mono.Nat/Mono.Nat.csproj
index 26028eca9..edfd5c9bb 100644
--- a/Mono.Nat/Mono.Nat.csproj
+++ b/Mono.Nat/Mono.Nat.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
diff --git a/Mono.Nat/NatProtocol.cs b/Mono.Nat/NatProtocol.cs
index ade8d921c..2768f133c 100644
--- a/Mono.Nat/NatProtocol.cs
+++ b/Mono.Nat/NatProtocol.cs
@@ -1,4 +1,3 @@
-
namespace Mono.Nat
{
public enum NatProtocol
diff --git a/Mono.Nat/Pmp/PmpNatDevice.cs b/Mono.Nat/Pmp/PmpNatDevice.cs
index 9398e2bf9..95bd72a6c 100644
--- a/Mono.Nat/Pmp/PmpNatDevice.cs
+++ b/Mono.Nat/Pmp/PmpNatDevice.cs
@@ -66,7 +66,7 @@ namespace Mono.Nat.Pmp
public override bool Equals(object obj)
{
- PmpNatDevice device = obj as PmpNatDevice;
+ var device = obj as PmpNatDevice;
return (device == null) ? false : this.Equals(device);
}
diff --git a/Mono.Nat/Pmp/PmpSearcher.cs b/Mono.Nat/Pmp/PmpSearcher.cs
index 5e4155841..46c2e9d80 100644
--- a/Mono.Nat/Pmp/PmpSearcher.cs
+++ b/Mono.Nat/Pmp/PmpSearcher.cs
@@ -81,12 +81,12 @@ namespace Mono.Nat
try
{
- foreach (NetworkInterface n in NetworkInterface.GetAllNetworkInterfaces())
+ foreach (var n in NetworkInterface.GetAllNetworkInterfaces())
{
if (n.OperationalStatus != OperationalStatus.Up && n.OperationalStatus != OperationalStatus.Unknown)
continue;
IPInterfaceProperties properties = n.GetIPProperties();
- List<IPEndPoint> gatewayList = new List<IPEndPoint>();
+ var gatewayList = new List<IPEndPoint>();
foreach (GatewayIPAddressInformation gateway in properties.GatewayAddresses)
{
@@ -105,7 +105,7 @@ namespace Mono.Nat
gatewayList.Add(new IPEndPoint(gw2, PmpConstants.ServerPort));
}
}
- foreach (var unicast in properties.UnicastAddresses)
+ foreach (UnicastIPAddressInformation unicast in properties.UnicastAddresses)
{
if (/*unicast.DuplicateAddressDetectionState == DuplicateAddressDetectionState.Preferred
&& unicast.AddressPreferredLifetime != UInt32.MaxValue
@@ -120,7 +120,7 @@ namespace Mono.Nat
if (gatewayList.Count > 0)
{
- foreach (UnicastIPAddressInformation address in properties.UnicastAddresses)
+ foreach (var address in properties.UnicastAddresses)
{
if (address.Address.AddressFamily == AddressFamily.InterNetwork)
{
@@ -189,8 +189,8 @@ namespace Mono.Nat
bool IsSearchAddress(IPAddress address)
{
- foreach (List<IPEndPoint> gatewayList in gatewayLists.Values)
- foreach (IPEndPoint gatewayEndpoint in gatewayList)
+ foreach (var gatewayList in gatewayLists.Values)
+ foreach (var gatewayEndpoint in gatewayList)
if (gatewayEndpoint.Address.Equals(address))
return true;
return false;
@@ -210,7 +210,7 @@ namespace Mono.Nat
if (errorcode != 0)
_logger.LogDebug("Non zero error: {0}", errorcode);
- IPAddress publicIp = new IPAddress(new byte[] { response[8], response[9], response[10], response[11] });
+ var publicIp = new IPAddress(new byte[] { response[8], response[9], response[10], response[11] });
nextSearch = DateTime.Now.AddMinutes(5);
timeout = 250;
diff --git a/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs b/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs
index 5a2ab009a..7d6844e32 100644
--- a/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs
+++ b/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs
@@ -54,9 +54,9 @@ namespace Mono.Nat.Upnp
public override HttpRequestOptions Encode()
{
- CultureInfo culture = CultureInfo.InvariantCulture;
+ var culture = CultureInfo.InvariantCulture;
- StringBuilder builder = new StringBuilder(256);
+ var builder = new StringBuilder(256);
XmlWriter writer = CreateWriter(builder);
WriteFullElement(writer, "NewRemoteHost", string.Empty);
diff --git a/Mono.Nat/Upnp/Messages/UpnpMessage.cs b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
index e734db8f4..1151dd997 100644
--- a/Mono.Nat/Upnp/Messages/UpnpMessage.cs
+++ b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
@@ -91,7 +91,7 @@ namespace Mono.Nat.Upnp
protected XmlWriter CreateWriter(StringBuilder sb)
{
- XmlWriterSettings settings = new XmlWriterSettings();
+ var settings = new XmlWriterSettings();
settings.ConformanceLevel = ConformanceLevel.Fragment;
return XmlWriter.Create(sb, settings);
}
diff --git a/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs b/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs
index 57ecdeca9..b70768b6f 100644
--- a/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs
+++ b/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs
@@ -82,7 +82,7 @@ namespace Mono.Nat
* prefix. */
// We have an internet gateway device now
- UpnpNatDevice d = new UpnpNatDevice(localAddress, deviceInfo, endpoint, string.Empty, _logger, _httpClient);
+ var d = new UpnpNatDevice(localAddress, deviceInfo, endpoint, string.Empty, _logger, _httpClient);
await d.GetServicesList().ConfigureAwait(false);
diff --git a/Mono.Nat/Upnp/UpnpNatDevice.cs b/Mono.Nat/Upnp/UpnpNatDevice.cs
index f37d6dd0c..fd408ee63 100644
--- a/Mono.Nat/Upnp/UpnpNatDevice.cs
+++ b/Mono.Nat/Upnp/UpnpNatDevice.cs
@@ -109,8 +109,8 @@ namespace Mono.Nat.Upnp
int abortCount = 0;
int bytesRead = 0;
byte[] buffer = new byte[10240];
- StringBuilder servicesXml = new StringBuilder();
- XmlDocument xmldoc = new XmlDocument();
+ var servicesXml = new StringBuilder();
+ var xmldoc = new XmlDocument();
using (var s = response.Content)
{
@@ -144,7 +144,7 @@ namespace Mono.Nat.Upnp
}
}
- XmlNamespaceManager ns = new XmlNamespaceManager(xmldoc.NameTable);
+ var ns = new XmlNamespaceManager(xmldoc.NameTable);
ns.AddNamespace("ns", "urn:schemas-upnp-org:device-1-0");
XmlNodeList nodes = xmldoc.SelectNodes("//*/ns:serviceList", ns);
@@ -169,7 +169,7 @@ namespace Mono.Nat.Upnp
{
if (u.IsAbsoluteUri)
{
- EndPoint old = hostEndPoint;
+ var old = hostEndPoint;
IPAddress parsedHostIpAddress;
if (IPAddress.TryParse(u.Host, out parsedHostIpAddress))
{
@@ -228,7 +228,7 @@ namespace Mono.Nat.Upnp
public override async Task CreatePortMap(Mapping mapping)
{
- CreatePortMappingMessage message = new CreatePortMappingMessage(mapping, localAddress, this);
+ var message = new CreatePortMappingMessage(mapping, localAddress, this);
using (await _httpClient.SendAsync(message.Encode(), message.Method).ConfigureAwait(false))
{
@@ -237,7 +237,7 @@ namespace Mono.Nat.Upnp
public override bool Equals(object obj)
{
- UpnpNatDevice device = obj as UpnpNatDevice;
+ var device = obj as UpnpNatDevice;
return (device == null) ? false : this.Equals((device));
}