aboutsummaryrefslogtreecommitdiff
path: root/Mono.Nat/Upnp/Messages
diff options
context:
space:
mode:
Diffstat (limited to 'Mono.Nat/Upnp/Messages')
-rw-r--r--Mono.Nat/Upnp/Messages/DiscoverDeviceMessage.cs60
-rw-r--r--Mono.Nat/Upnp/Messages/ErrorMessage.cs63
-rw-r--r--Mono.Nat/Upnp/Messages/Responses/CreatePortMappingResponseMessage.cs48
-rw-r--r--Mono.Nat/Upnp/Messages/UpnpMessage.cs6
4 files changed, 2 insertions, 175 deletions
diff --git a/Mono.Nat/Upnp/Messages/DiscoverDeviceMessage.cs b/Mono.Nat/Upnp/Messages/DiscoverDeviceMessage.cs
deleted file mode 100644
index 87f5835a6..000000000
--- a/Mono.Nat/Upnp/Messages/DiscoverDeviceMessage.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Authors:
-// Alan McGovern alan.mcgovern@gmail.com
-//
-// Copyright (C) 2006 Alan McGovern
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Net;
-using System.Text;
-
-namespace Mono.Nat.Upnp
-{
- internal static class DiscoverDeviceMessage
- {
- /// <summary>
- /// The message sent to discover all uPnP devices on the network
- /// </summary>
- /// <returns></returns>
- public static byte[] EncodeSSDP()
- {
- string s = "M-SEARCH * HTTP/1.1\r\n"
- + "HOST: 239.255.255.250:1900\r\n"
- + "MAN: \"ssdp:discover\"\r\n"
- + "MX: 3\r\n"
- + "ST: ssdp:all\r\n\r\n";
- return UTF8Encoding.ASCII.GetBytes(s);
- }
-
- public static byte[] EncodeUnicast(IPAddress gatewayAddress)
- {
- //Format obtained from http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1.pdf pg 31
- //This method only works with upnp 1.1 routers... unfortunately
- string s = "M-SEARCH * HTTP/1.1\r\n"
- + "HOST: " + gatewayAddress + ":1900\r\n"
- + "MAN: \"ssdp:discover\"\r\n"
- + "ST: ssdp:all\r\n\r\n";
- //+ "USER-AGENT: unix/5.1 UPnP/1.1 MyProduct/1.0\r\n\r\n";
- return UTF8Encoding.ASCII.GetBytes(s);
- }
- }
-}
diff --git a/Mono.Nat/Upnp/Messages/ErrorMessage.cs b/Mono.Nat/Upnp/Messages/ErrorMessage.cs
deleted file mode 100644
index 7c0c44d8e..000000000
--- a/Mono.Nat/Upnp/Messages/ErrorMessage.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Authors:
-// Alan McGovern alan.mcgovern@gmail.com
-//
-// Copyright (C) 2006 Alan McGovern
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MediaBrowser.Common.Net;
-
-namespace Mono.Nat.Upnp
-{
- internal class ErrorMessage : MessageBase
- {
- #region Member Variables
- public string Description
- {
- get { return this.description; }
- }
- private string description;
-
- public int ErrorCode
- {
- get { return this.errorCode; }
- }
- private int errorCode;
- #endregion
-
-
- #region Constructors
- public ErrorMessage(int errorCode, string description)
- :base(null)
- {
- this.description = description;
- this.errorCode = errorCode;
- }
- #endregion
-
- public override HttpRequestOptions Encode()
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/Mono.Nat/Upnp/Messages/Responses/CreatePortMappingResponseMessage.cs b/Mono.Nat/Upnp/Messages/Responses/CreatePortMappingResponseMessage.cs
deleted file mode 100644
index 48776dd6f..000000000
--- a/Mono.Nat/Upnp/Messages/Responses/CreatePortMappingResponseMessage.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Authors:
-// Alan McGovern alan.mcgovern@gmail.com
-//
-// Copyright (C) 2006 Alan McGovern
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using MediaBrowser.Common.Net;
-
-namespace Mono.Nat.Upnp
-{
- internal class CreatePortMappingResponseMessage : MessageBase
- {
- #region Constructors
- public CreatePortMappingResponseMessage()
- :base(null)
- {
- }
- #endregion
-
- public override HttpRequestOptions Encode()
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/Mono.Nat/Upnp/Messages/UpnpMessage.cs b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
index b0264fc4a..37a46e47d 100644
--- a/Mono.Nat/Upnp/Messages/UpnpMessage.cs
+++ b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
@@ -37,7 +37,6 @@ namespace Mono.Nat.Upnp
{
internal abstract class MessageBase
{
- internal static readonly CultureInfo Culture = CultureInfo.InvariantCulture;
protected UpnpNatDevice device;
protected MessageBase(UpnpNatDevice device)
@@ -48,7 +47,6 @@ namespace Mono.Nat.Upnp
protected HttpRequestOptions CreateRequest(string upnpMethod, string methodParameters)
{
string ss = "http://" + this.device.HostEndPoint.ToString() + this.device.ControlUrl;
- NatUtility.Log("Initiating request to: {0}", ss);
var req = new HttpRequestOptions();
req.LogErrors = false;
@@ -84,14 +82,14 @@ namespace Mono.Nat.Upnp
get { return "POST"; }
}
- internal static void WriteFullElement(XmlWriter writer, string element, string value)
+ protected void WriteFullElement(XmlWriter writer, string element, string value)
{
writer.WriteStartElement(element);
writer.WriteString(value);
writer.WriteEndElement();
}
- internal static XmlWriter CreateWriter(StringBuilder sb)
+ protected XmlWriter CreateWriter(StringBuilder sb)
{
XmlWriterSettings settings = new XmlWriterSettings();
settings.ConformanceLevel = ConformanceLevel.Fragment;