From beaa7bc3cbf6427c5f99c567531b2b9ad969ae29 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 1 Nov 2020 15:25:51 -0500
Subject: [PATCH] fix scpd breaking if content-length is not provided

-applies to at least actiontec
-add actiontec and dd-wrt discover + get_external_ip replay tests
---
 aioupnp/protocols/scpd.py                   |  57 ++++++---
 tests/__init__.py                           |   7 +-
 tests/replays/Actiontec GT784WN             | 120 ++++++++++++++++++
 tests/replays/NewMedia-NET GmbH Generic X86 | 129 ++++++++++++++++++++
 tests/test_gateway.py                       |  74 ++++++++++-
 5 files changed, 366 insertions(+), 21 deletions(-)
 create mode 100644 tests/replays/Actiontec GT784WN
 create mode 100644 tests/replays/NewMedia-NET GmbH Generic X86

diff --git a/aioupnp/protocols/scpd.py b/aioupnp/protocols/scpd.py
index a1bd4dc..01147c4 100644
--- a/aioupnp/protocols/scpd.py
+++ b/aioupnp/protocols/scpd.py
@@ -56,6 +56,7 @@ class SCPDHTTPClientProtocol(Protocol):
         self._response_msg = b""
         self._content_length = 0
         self._got_headers = False
+        self._has_content_length = True
         self._headers: typing.Dict[bytes, bytes] = {}
         self._body = b""
         self.transport: typing.Optional[asyncio.WriteTransport] = None
@@ -67,35 +68,57 @@ class SCPDHTTPClientProtocol(Protocol):
         return None
 
     def data_received(self, data: bytes) -> None:
+        if self.finished.done():  # possible to hit during tests
+            return
         self.response_buff += data
         for i, line in enumerate(self.response_buff.split(b'\r\n')):
             if not line:  # we hit the blank line between the headers and the body
                 if i == (len(self.response_buff.split(b'\r\n')) - 1):
                     return None  # the body is still yet to be written
                 if not self._got_headers:
-                    self._headers, self._response_code, self._response_msg = parse_headers(
-                        b'\r\n'.join(self.response_buff.split(b'\r\n')[:i])
-                    )
+                    try:
+                        self._headers, self._response_code, self._response_msg = parse_headers(
+                            b'\r\n'.join(self.response_buff.split(b'\r\n')[:i])
+                        )
+                    except ValueError as err:
+                        self.finished.set_exception(UPnPError(str(err)))
+                        return
                     content_length = get_dict_val_case_insensitive(
                         self._headers, b'Content-Length'
                     )
-                    if content_length is None:
-                        return None
-                    self._content_length = int(content_length or 0)
+                    if content_length is not None:
+                        self._content_length = int(content_length)
+                    else:
+                        self._has_content_length = False
                     self._got_headers = True
-                body = b'\r\n'.join(self.response_buff.split(b'\r\n')[i+1:])
-                if self._content_length == len(body):
-                    self.finished.set_result((self.response_buff, body, self._response_code, self._response_msg))
-                elif self._content_length > len(body):
-                    pass
-                else:
-                    self.finished.set_exception(
-                        UPnPError(
-                            "too many bytes written to response (%i vs %i expected)" % (
-                                len(body), self._content_length
+                if self._got_headers and self._has_content_length:
+                    body = b'\r\n'.join(self.response_buff.split(b'\r\n')[i+1:])
+                    if self._content_length == len(body):
+                        self.finished.set_result((self.response_buff, body, self._response_code, self._response_msg))
+                    elif self._content_length > len(body):
+                        pass
+                    else:
+                        self.finished.set_exception(
+                            UPnPError(
+                                "too many bytes written to response (%i vs %i expected)" % (
+                                    len(body), self._content_length
+                                )
                             )
                         )
-                    )
+                elif any(map(self.response_buff.endswith, (b"</root>\r\n", b"</scpd>\r\n"))):
+                    # Actiontec has a router that doesn't give a Content-Length for the gateway xml
+                    body = b'\r\n'.join(self.response_buff.split(b'\r\n')[i+1:])
+                    self.finished.set_result((self.response_buff, body, self._response_code, self._response_msg))
+                elif len(self.response_buff) >= 65535:
+                    self.finished.set_exception(
+                        UPnPError(
+                            "too many bytes written to response (%i) with unspecified content length" % len(self.response_buff)
+                            )
+                        )
+                    return
+                else:
+                    # needed for the actiontec case
+                    pass
                 return None
         return None
 
diff --git a/tests/__init__.py b/tests/__init__.py
index 45c9d29..4cf83d1 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -18,7 +18,7 @@ except ImportError:
 @contextlib.contextmanager
 def mock_tcp_and_udp(loop, udp_expected_addr=None, udp_replies=None, udp_delay_reply=0.0, sent_udp_packets=None,
                      tcp_replies=None, tcp_delay_reply=0.0, sent_tcp_packets=None, add_potato_datagrams=False,
-                     raise_oserror_on_bind=False, raise_connectionerror=False):
+                     raise_oserror_on_bind=False, raise_connectionerror=False, tcp_chunk_size=100):
     sent_udp_packets = sent_udp_packets if sent_udp_packets is not None else []
     udp_replies = udp_replies or {}
 
@@ -36,8 +36,8 @@ def mock_tcp_and_udp(loop, udp_expected_addr=None, udp_replies=None, udp_delay_r
                     reply = tcp_replies[data]
                     i = 0
                     while i < len(reply):
-                        loop.call_later(tcp_delay_reply, p.data_received, reply[i:i+100])
-                        i += 100
+                        loop.call_later(tcp_delay_reply, p.data_received, reply[i:i+tcp_chunk_size])
+                        i += tcp_chunk_size
                     return
                 else:
                     pass
@@ -71,6 +71,7 @@ def mock_tcp_and_udp(loop, udp_expected_addr=None, udp_replies=None, udp_delay_r
                     loop.call_later(udp_delay_reply, p.datagram_received, udp_replies[(data, addr)],
                                     (udp_expected_addr, 1900))
 
+
             return _sendto
 
         protocol = proto_lam()
diff --git a/tests/replays/Actiontec GT784WN b/tests/replays/Actiontec GT784WN
new file mode 100644
index 0000000..7eb2e79
--- /dev/null
+++ b/tests/replays/Actiontec GT784WN	
@@ -0,0 +1,120 @@
+{
+  "gateway": {
+    "gateway_address": "192.168.0.1",
+    "soap_port": 5431,
+    "m_search_args": {
+      "HOST": "239.255.255.250:1900",
+      "MAN": "\"ssdp:discover\"",
+      "MX": 1,
+      "ST": "upnp:rootdevice"
+    },
+    "reply": {
+      "Server": "Custom/1.0 UPnP/1.0 Proc/Ver",
+      "Location": "http://192.168.0.1:5431/dyndev/uuid:deadbeef-dead-beef-dead-beefdeadbeef00",
+      "CACHE_CONTROL": "max-age=1800",
+      "ST": "upnp:rootdevice",
+      "USN": "uuid:deadbeef-dead-beef-dead-beefdeadbeef00::upnp:rootdevice"
+    },
+    "registered_soap_commands": {
+      "GetDefaultConnectionService": "urn:schemas-upnp-org:service:Layer3Forwarding:1",
+      "SetDefaultConnectionService": "urn:schemas-upnp-org:service:Layer3Forwarding:1",
+      "GetCommonLinkProperties": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalBytesSent": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalBytesReceived": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalPacketsReceived": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalPacketsSent": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "SetConnectionType": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "GetConnectionTypeInfo": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "RequestConnection": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "ForceTermination": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "GetStatusInfo": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "GetNATRSIPStatus": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "GetGenericPortMappingEntry": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "GetSpecificPortMappingEntry": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "AddPortMapping": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "DeletePortMapping": "urn:schemas-upnp-org:service:WANPPPConnection:1",
+      "GetExternalIPAddress": "urn:schemas-upnp-org:service:WANPPPConnection:1"
+    },
+    "unsupported_soap_commands": {},
+    "gateway_xml": "HTTP/1.0 200 OK\r\nSERVER: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nCONTENT-TYPE: application/octet-stream\r\nCache-Control: max-age=1\r\nPRAGMA: no-cache\r\nConnection: Close\r\n\r\n<?xml version=\"1.0\"?>\r\n<root xmlns=\"urn:schemas-upnp-org:device-1-0\">\r\n<specVersion>\r\n<major>1</major>\r\n<minor>0</minor>\r\n</specVersion>\r\n<URLBase>http://192.168.0.1:5431/</URLBase>\r\n<device>\r\n<deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>\r\n<presentationURL>http://192.168.0.1:80/</presentationURL>\r\n<friendlyName>Actiontec GT784WN</friendlyName>\r\n<manufacturer>Actiontec</manufacturer>\r\n<manufacturerURL>http://www.broadcom.com/</manufacturerURL>\r\n<modelDescription>(null)</modelDescription>\r\n<modelName>GT784WN</modelName>\r\n<modelNumber>1.0</modelNumber>\r\n<modelURL>http://www.broadcom.com/</modelURL>\r\n<UDN>uuid:deadbeef-dead-beef-dead-beefdeadbeef00</UDN>\r\n<serviceList>\r\n<service>\r\n<serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType>\r\n<serviceId>urn:upnp-org:serviceId:Layer3Forwarding.1</serviceId>\r\n<controlURL>/uuid:deadbeef-dead-beef-dead-beefdeadbeef00/Layer3Forwarding:1</controlURL>\r\n<eventSubURL>/uuid:deadbeef-dead-beef-dead-beefdeadbeef00/Layer3Forwarding:1</eventSubURL>\r\n<SCPDURL>/dynsvc/Layer3Forwarding:1.xml</SCPDURL>\r\n</service>\r\n</serviceList>\r\n<deviceList>\r\n<device>\r\n<deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>\r\n<friendlyName>WANDevice.1</friendlyName>\r\n<manufacturer>Actiontec</manufacturer>\r\n<manufacturerURL>http://www.broadcom.com/</manufacturerURL>\r\n<modelDescription>(null)</modelDescription>\r\n<modelName>GT784WN</modelName>\r\n<modelNumber>1.0</modelNumber>\r\n<modelURL>http://www.broadcom.com/</modelURL>\r\n<UDN>uuid:70f196f9-33f5-f533-f996-f170f1f9f50001</UDN>\r\n<serviceList>\r\n<service>\r\n<serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>\r\n<serviceId>urn:upnp-org:serviceId:WANCommonInterfaceConfig.1</serviceId>\r\n<controlURL>/uuid:70f196f9-33f5-f533-f996-f170f1f9f50001/WANCommonInterfaceConfig:1</controlURL>\r\n<eventSubURL>/uuid:70f196f9-33f5-f533-f996-f170f1f9f50001/WANCommonInterfaceConfig:1</eventSubURL>\r\n<SCPDURL>/dynsvc/WANCommonInterfaceConfig:1.xml</SCPDURL>\r\n</service>\r\n</serviceList>\r\n<deviceList>\r\n<device>\r\n<deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>\r\n<friendlyName>WanConnectionDevice.2</friendlyName>\r\n<manufacturer>Actiontec</manufacturer>\r\n<manufacturerURL>http://www.broadcom.com/</manufacturerURL>\r\n<modelDescription>(null)</modelDescription>\r\n<modelName>GT784WN</modelName>\r\n<modelNumber>1.0</modelNumber>\r\n<modelURL>http://www.broadcom.com/</modelURL>\r\n<UDN>uuid:70f196f9-33f5-f533-f996-f170f1f9f50002</UDN>\r\n<serviceList>\r\n<service>\r\n<serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>\r\n<serviceId>urn:upnp-org:serviceId:WANPPPConnection.2</serviceId>\r\n<controlURL>/uuid:70f196f9-33f5-f533-f996-f170f1f9f50002/WANPPPConnection:1</controlURL>\r\n<eventSubURL>/uuid:70f196f9-33f5-f533-f996-f170f1f9f50002/WANPPPConnection:1</eventSubURL>\r\n<SCPDURL>/dynsvc/WANPPPConnection:1.xml</SCPDURL>\r\n</service>\r\n</serviceList>\r\n</device>\r\n</deviceList>\r\n</device>\r\n</deviceList>\r\n</device>\r\n</root>\r\n",
+    "service_descriptors": {
+      "/dynsvc/Layer3Forwarding:1.xml": "HTTP/1.0 200 OK\r\nSERVER: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nCONTENT-TYPE: application/octet-stream\r\nCache-Control: max-age=1\r\nPRAGMA: no-cache\r\nConnection: Close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>GetDefaultConnectionService</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewDefaultConnectionService</name>\r\n<relatedStateVariable>DefaultConnectionService</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>SetDefaultConnectionService</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewDefaultConnectionService</name>\r\n<relatedStateVariable>DefaultConnectionService</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>DefaultConnectionService</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n",
+      "/dynsvc/WANCommonInterfaceConfig:1.xml": "HTTP/1.0 200 OK\r\nSERVER: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nCONTENT-TYPE: application/octet-stream\r\nCache-Control: max-age=1\r\nPRAGMA: no-cache\r\nConnection: Close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>GetCommonLinkProperties</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewWANAccessType</name>\r\n<relatedStateVariable>WANAccessType</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLayer1UpstreamMaxBitRate</name>\r\n<relatedStateVariable>Layer1UpstreamMaxBitRate</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLayer1DownstreamMaxBitRate</name>\r\n<relatedStateVariable>Layer1DownstreamMaxBitRate</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPhysicalLinkStatus</name>\r\n<relatedStateVariable>PhysicalLinkStatus</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalBytesSent</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalBytesSent</name>\r\n<relatedStateVariable>TotalBytesSent</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalBytesReceived</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalBytesReceived</name>\r\n<relatedStateVariable>TotalBytesReceived</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalPacketsReceived</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalPacketsReceived</name>\r\n<relatedStateVariable>TotalPacketsReceived</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalPacketsSent</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalPacketsSent</name>\r\n<relatedStateVariable>TotalPacketsSent</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>WANAccessType</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>DSL</allowedValue>\r\n      <allowedValue>POTS</allowedValue>\r\n      <allowedValue>Cable</allowedValue>\r\n      <allowedValue>Ethernet</allowedValue>\r\n      <allowedValue>Other</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Layer1UpstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Layer1DownstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PhysicalLinkStatus</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Up</allowedValue>\r\n      <allowedValue>Down</allowedValue>\r\n      <allowedValue>Initializing</allowedValue>\r\n      <allowedValue>Unavailable</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>EnabledForInternet</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalBytesSent</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalBytesReceived</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalPacketsSent</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalPacketsReceived</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n",
+      "/dynsvc/WANPPPConnection:1.xml": "HTTP/1.0 200 OK\r\nSERVER: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nCONTENT-TYPE: application/octet-stream\r\nCache-Control: max-age=1\r\nPRAGMA: no-cache\r\nConnection: Close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>SetConnectionType</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionType</name>\r\n<relatedStateVariable>ConnectionType</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetConnectionTypeInfo</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionType</name>\r\n<relatedStateVariable>ConnectionType</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPossibleConnectionTypes</name>\r\n<relatedStateVariable>PossibleConnectionTypes</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>RequestConnection</name>\r\n</action>\r\n<action>\r\n<name>ForceTermination</name>\r\n</action>\r\n<action>\r\n<name>GetStatusInfo</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionStatus</name>\r\n<relatedStateVariable>ConnectionStatus</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLastConnectionError</name>\r\n<relatedStateVariable>LastConnectionError</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewUptime</name>\r\n<relatedStateVariable>Uptime</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetNATRSIPStatus</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRSIPAvailable</name>\r\n<relatedStateVariable>RSIPAvailable</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewNATEnabled</name>\r\n<relatedStateVariable>NATEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetGenericPortMappingEntry</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewPortMappingIndex</name>\r\n<relatedStateVariable>PortMappingNumberOfEntries</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetSpecificPortMappingEntry</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>AddPortMapping</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>DeletePortMapping</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetExternalIPAddress</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewExternalIPAddress</name>\r\n<relatedStateVariable>ExternalIPAddress</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>ConnectionType</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>IP_Routed</allowedValue>\r\n      <allowedValue>DHCP_Spoofed</allowedValue>\r\n      <allowedValue>PPPoE_Bridged</allowedValue>\r\n      <allowedValue>PPTP_Relay</allowedValue>\r\n      <allowedValue>L2TP_Relay</allowedValue>\r\n      <allowedValue>PPPoE_Relay</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PossibleConnectionTypes</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>IP_Routed</allowedValue>\r\n      <allowedValue>DHCP_Spoofed</allowedValue>\r\n      <allowedValue>PPPoE_Bridged</allowedValue>\r\n      <allowedValue>PPTP_Relay</allowedValue>\r\n      <allowedValue>L2TP_Relay</allowedValue>\r\n      <allowedValue>PPPoE_Relay</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>ConnectionStatus</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>Connecting</allowedValue>\r\n      <allowedValue>Authenticating</allowedValue>\r\n      <allowedValue>Connected</allowedValue>\r\n      <allowedValue>PendingDisconnect</allowedValue>\r\n      <allowedValue>Disconnecting</allowedValue>\r\n      <allowedValue>Disconnected</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Uptime</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>UpstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>DownstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>LastConnectionError</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>ERROR_NONE</allowedValue>\r\n      <allowedValue>ERROR_UNKNOWN</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>RSIPAvailable</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>NATEnabled</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>ExternalIPAddress</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PortMappingNumberOfEntries</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingEnabled</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingLeaseDuration</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>RemoteHost</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>ExternalPort</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>InternalPort</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingProtocol</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>TCP</allowedValue>\r\n      <allowedValue>UDP</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>InternalClient</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingDescription</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n"
+    },
+    "soap_requests": {
+      "GetDefaultConnectionService": [],
+      "SetDefaultConnectionService": [],
+      "GetCommonLinkProperties": [],
+      "GetTotalBytesSent": [],
+      "GetTotalBytesReceived": [],
+      "GetTotalPacketsReceived": [],
+      "GetTotalPacketsSent": [],
+      "SetConnectionType": [],
+      "GetConnectionTypeInfo": [],
+      "RequestConnection": [],
+      "ForceTermination": [],
+      "GetStatusInfo": [],
+      "GetNATRSIPStatus": [],
+      "GetGenericPortMappingEntry": [
+        [
+          {
+            "NewPortMappingIndex": 0
+          },
+          "HTTP/1.1 200 OK\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 654\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<?xml version=\"1.0\"?>\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"><s:Body><m:GetGenericPortMappingEntryResponse xmlns:m=\"urn:schemas-upnp-org:service:WANPPPConnection:1\"><NewRemoteHost></NewRemoteHost><NewExternalPort>3658</NewExternalPort><NewProtocol>UDP</NewProtocol><NewInternalPort>3658</NewInternalPort><NewInternalClient>192.168.0.10</NewInternalClient><NewEnabled>1</NewEnabled><NewPortMappingDescription>192.168.0.10:3658 to 3658 (UDP)</NewPortMappingDescription><NewLeaseDuration>0</NewLeaseDuration></m:GetGenericPortMappingEntryResponse></s:Body></s:Envelope>\r\n"
+        ],
+        [
+          {
+            "NewPortMappingIndex": 1
+          },
+          "HTTP/1.1 500 Internal Server Error\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 474\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n <s:Body>\r\n  <s:Fault>\r\n   <faultcode>s:Client</faultcode>\r\n   <faultstring>UPnPError</faultstring>\r\n   <detail>\r\n    <UPnPError xmlns=\"urn:schemas-upnp-org:control-1-0\">\r\n     <errorCode>713</errorCode>\r\n     <errorDescription>SpecifiedArrayIndexInvalid</errorDescription>\r\n    </UPnPError>\r\n   </detail>\r\n  </s:Fault>\r\n </s:Body>\r\n</s:Envelope>\r\n"
+        ],
+        [
+          {
+            "NewPortMappingIndex": 0
+          },
+          "HTTP/1.1 200 OK\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 654\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<?xml version=\"1.0\"?>\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"><s:Body><m:GetGenericPortMappingEntryResponse xmlns:m=\"urn:schemas-upnp-org:service:WANPPPConnection:1\"><NewRemoteHost></NewRemoteHost><NewExternalPort>3658</NewExternalPort><NewProtocol>UDP</NewProtocol><NewInternalPort>3658</NewInternalPort><NewInternalClient>192.168.0.10</NewInternalClient><NewEnabled>1</NewEnabled><NewPortMappingDescription>192.168.0.10:3658 to 3658 (UDP)</NewPortMappingDescription><NewLeaseDuration>0</NewLeaseDuration></m:GetGenericPortMappingEntryResponse></s:Body></s:Envelope>\r\n"
+        ],
+        [
+          {
+            "NewPortMappingIndex": 1
+          },
+          "HTTP/1.1 500 Internal Server Error\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 474\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n <s:Body>\r\n  <s:Fault>\r\n   <faultcode>s:Client</faultcode>\r\n   <faultstring>UPnPError</faultstring>\r\n   <detail>\r\n    <UPnPError xmlns=\"urn:schemas-upnp-org:control-1-0\">\r\n     <errorCode>713</errorCode>\r\n     <errorDescription>SpecifiedArrayIndexInvalid</errorDescription>\r\n    </UPnPError>\r\n   </detail>\r\n  </s:Fault>\r\n </s:Body>\r\n</s:Envelope>\r\n"
+        ]
+      ],
+      "GetSpecificPortMappingEntry": [],
+      "AddPortMapping": [
+        [
+          {
+            "NewRemoteHost": "",
+            "NewExternalPort": 4567,
+            "NewProtocol": "UDP",
+            "NewInternalPort": 4567,
+            "NewInternalClient": "192.168.0.9",
+            "NewEnabled": true,
+            "NewPortMappingDescription": "aioupnp test mapping",
+            "NewLeaseDuration": ""
+          },
+          ""
+        ]
+      ],
+      "DeletePortMapping": [
+        [
+          {
+            "NewRemoteHost": "",
+            "NewExternalPort": 4567,
+            "NewProtocol": "UDP"
+          },
+          ""
+        ]
+      ],
+      "GetExternalIPAddress": [
+        [
+          {},
+          "HTTP/1.1 200 OK\r\nDATE: Thu, 11 Oct 2018 15:42:26 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 360\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<?xml version=\"1.0\"?>\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"><s:Body><m:GetExternalIPAddressResponse xmlns:m=\"urn:schemas-upnp-org:service:WANPPPConnection:1\"><NewExternalIPAddress>11.222.33.111</NewExternalIPAddress></m:GetExternalIPAddressResponse></s:Body></s:Envelope>\r\n"
+        ]
+      ]
+    }
+  },
+  "client_address": "192.168.0.9"
+}
\ No newline at end of file
diff --git a/tests/replays/NewMedia-NET GmbH Generic X86 b/tests/replays/NewMedia-NET GmbH Generic X86
new file mode 100644
index 0000000..c34840b
--- /dev/null
+++ b/tests/replays/NewMedia-NET GmbH Generic X86	
@@ -0,0 +1,129 @@
+{
+  "gateway": {
+    "gateway_address": "192.168.1.1",
+    "soap_port": 5431,
+    "m_search_args": {
+      "HOST": "239.255.255.250:1900",
+      "MAN": "\"ssdp:discover\"",
+      "MX": 1,
+      "ST": "upnp:rootdevice"
+    },
+    "reply": {
+      "ST": "upnp:rootdevice",
+      "USN": "uuid:dead-beef-deadbeef2222::upnp:rootdevice",
+      "Location": "http://192.168.1.1:5431/dyndev/uuid:dead-beef-deadbeef2222",
+      "Server": "Custom/1.0 UPnP/1.0 Proc/Ver",
+      "CACHE_CONTROL": "max-age=180"
+    },
+    "registered_soap_commands": {
+      "GetDefaultConnectionService": "urn:schemas-upnp-org:service:Layer3Forwarding:1",
+      "SetDefaultConnectionService": "urn:schemas-upnp-org:service:Layer3Forwarding:1",
+      "GetCommonLinkProperties": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalBytesSent": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalBytesReceived": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalPacketsReceived": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "GetTotalPacketsSent": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1",
+      "SetConnectionType": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "GetConnectionTypeInfo": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "RequestConnection": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "ForceTermination": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "GetStatusInfo": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "GetNATRSIPStatus": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "GetGenericPortMappingEntry": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "GetSpecificPortMappingEntry": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "AddPortMapping": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "DeletePortMapping": "urn:schemas-upnp-org:service:WANIPConnection:1",
+      "GetExternalIPAddress": "urn:schemas-upnp-org:service:WANIPConnection:1"
+    },
+    "unsupported_soap_commands": {
+      "urn:schemas-upnp-org:service:WANPPPConnection:1": [
+        "SetConnectionType",
+        "GetConnectionTypeInfo",
+        "ConfigureConnection",
+        "RequestConnection",
+        "ForceTermination",
+        "SetIdleDisconnectTime",
+        "GetStatusInfo",
+        "GetLinkLayerMaxBitRates",
+        "GetUserName",
+        "GetPassword",
+        "GetIdleDisconnectTime",
+        "GetNATRSIPStatus",
+        "GetGenericPortMappingEntry",
+        "GetSpecificPortMappingEntry",
+        "AddPortMapping",
+        "DeletePortMapping",
+        "GetExternalIPAddress"
+      ]
+    },
+    "gateway_xml": "HTTP/1.0 200 OK\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDate: Thu, 01 Jan 1970 00:23:13 GMT\r\nContent-Type: text/xml\r\nCache-Control: max-age=1\r\nPragma: no-cache\r\nConnection: close\r\n\r\n<?xml version=\"1.0\"?>\r\n<root xmlns=\"urn:schemas-upnp-org:device-1-0\">\r\n <specVersion>\r\n  <major>1</major>\r\n  <minor>0</minor>\r\n </specVersion>\r\n <device>\r\n  <deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>\r\n  <friendlyName>DD-WRT Router (192.168.1.1)</friendlyName>\r\n  <manufacturer>NewMedia-NET GmbH</manufacturer>\r\n  <manufacturerURL>http://www.dd-wrt.com/</manufacturerURL>\r\n  <modelDescription>Internet Gateway Device</modelDescription>\r\n  <modelName>Generic X86</modelName>\r\n  <modelNumber>DD-WRT v24 (05/20/08)</modelNumber>\r\n  <modelURL>http://www.dd-wrt.com/</modelURL>\r\n  <serialNumber>Not Available</serialNumber>\r\n  <UDN>uuid:dead-beef-deadbeef2222</UDN>\r\n  <serviceList>\r\n  <service>\r\n   <serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType>\r\n   <serviceId>urn:upnp-org:serviceId:L3Forwarding1</serviceId>\r\n   <SCPDURL>/dynsvc/Layer3Forwarding:1.xml</SCPDURL>\r\n   <controlURL>/uuid:dead-beef-deadbeef2222/Layer3Forwarding:1</controlURL>\r\n   <eventSubURL>/uuid:dead-beef-deadbeef2222/Layer3Forwarding:1</eventSubURL>\r\n   </service>\r\n  </serviceList>\r\n  <deviceList>\r\n <device>\r\n  <deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>\r\n  <friendlyName>urn:schemas-upnp-org:device:WANDevice:1</friendlyName>\r\n  <manufacturer>NewMedia-NET GmbH</manufacturer>\r\n  <manufacturerURL>http://www.dd-wrt.com/</manufacturerURL>\r\n  <modelDescription>Internet Gateway Device</modelDescription>\r\n  <modelName>Generic X86</modelName>\r\n  <modelNumber>DD-WRT v24 (05/20/08)</modelNumber>\r\n  <modelURL>http://www.dd-wrt.com/</modelURL>\r\n  <serialNumber>Not Available</serialNumber>\r\n  <UDN>uuid:000c-29ea-247501c00098</UDN>\r\n  <serviceList>\r\n  <service>\r\n   <serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>\r\n   <serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId>\r\n   <SCPDURL>/dynsvc/WANCommonInterfaceConfig:1.xml</SCPDURL>\r\n   <controlURL>/uuid:000c-29ea-247501c00098/WANCommonInterfaceConfig:1</controlURL>\r\n   <eventSubURL>/uuid:000c-29ea-247501c00098/WANCommonInterfaceConfig:1</eventSubURL>\r\n   </service>\r\n  </serviceList>\r\n  <deviceList>\r\n <device>\r\n  <deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>\r\n  <friendlyName>urn:schemas-upnp-org:device:WANConnectionDevice:1</friendlyName>\r\n  <manufacturer>NewMedia-NET GmbH</manufacturer>\r\n  <manufacturerURL>http://www.dd-wrt.com/</manufacturerURL>\r\n  <modelDescription>Internet Gateway Device</modelDescription>\r\n  <modelName>Generic X86</modelName>\r\n  <modelNumber>DD-WRT v24 (05/20/08)</modelNumber>\r\n  <modelURL>http://www.dd-wrt.com/</modelURL>\r\n  <serialNumber>Not Available</serialNumber>\r\n  <UDN>uuid:dead-beef-deadbeef0000</UDN>\r\n  <serviceList>\r\n  <service>\r\n   <serviceType>urn:schemas-upnp-org:service:WANIPConnection:1</serviceType>\r\n   <serviceId>urn:upnp-org:serviceId:WANIPConn1</serviceId>\r\n   <SCPDURL>/dynsvc/WANIPConnection:1.xml</SCPDURL>\r\n   <controlURL>/uuid:dead-beef-deadbeef0000/WANIPConnection:1</controlURL>\r\n   <eventSubURL>/uuid:dead-beef-deadbeef0000/WANIPConnection:1</eventSubURL>\r\n   </service>\r\n  <service>\r\n   <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>\r\n   <serviceId>urn:upnp-org:serviceId:WANPPPConn1</serviceId>\r\n   <SCPDURL>/dynsvc/WANPPPConnection:1.xml</SCPDURL>\r\n   <controlURL>/uuid:dead-beef-deadbeef0000/WANPPPConnection:1</controlURL>\r\n   <eventSubURL>/uuid:dead-beef-deadbeef0000/WANPPPConnection:1</eventSubURL>\r\n   </service>\r\n  </serviceList>\r\n</device>\r\n  </deviceList>\r\n</device>\r\n  </deviceList>\r\n</device>\r\n</root>\r\n",
+    "service_descriptors": {
+      "/dynsvc/Layer3Forwarding:1.xml": "HTTP/1.0 200 OK\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDate: Thu, 01 Jan 1970 00:23:13 GMT\r\nContent-Type: text/xml\r\nCache-Control: max-age=1\r\nPragma: no-cache\r\nConnection: close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>GetDefaultConnectionService</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewDefaultConnectionService</name>\r\n<relatedStateVariable>DefaultConnectionService</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>SetDefaultConnectionService</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewDefaultConnectionService</name>\r\n<relatedStateVariable>DefaultConnectionService</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>DefaultConnectionService</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n",
+      "/dynsvc/WANCommonInterfaceConfig:1.xml": "HTTP/1.0 200 OK\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDate: Thu, 01 Jan 1970 00:23:13 GMT\r\nContent-Type: text/xml\r\nCache-Control: max-age=1\r\nPragma: no-cache\r\nConnection: close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>GetCommonLinkProperties</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewWANAccessType</name>\r\n<relatedStateVariable>WANAccessType</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLayer1UpstreamMaxBitRate</name>\r\n<relatedStateVariable>Layer1UpstreamMaxBitRate</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLayer1DownstreamMaxBitRate</name>\r\n<relatedStateVariable>Layer1DownstreamMaxBitRate</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPhysicalLinkStatus</name>\r\n<relatedStateVariable>PhysicalLinkStatus</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalBytesSent</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalBytesSent</name>\r\n<relatedStateVariable>TotalBytesSent</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalBytesReceived</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalBytesReceived</name>\r\n<relatedStateVariable>TotalBytesReceived</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalPacketsReceived</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalPacketsReceived</name>\r\n<relatedStateVariable>TotalPacketsReceived</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetTotalPacketsSent</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewTotalPacketsSent</name>\r\n<relatedStateVariable>TotalPacketsSent</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>WANAccessType</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>DSL</allowedValue>\r\n      <allowedValue>POTS</allowedValue>\r\n      <allowedValue>Cable</allowedValue>\r\n      <allowedValue>Ethernet</allowedValue>\r\n      <allowedValue>Other</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Layer1UpstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Layer1DownstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PhysicalLinkStatus</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Up</allowedValue>\r\n      <allowedValue>Down</allowedValue>\r\n      <allowedValue>Initializing</allowedValue>\r\n      <allowedValue>Unavailable</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>EnabledForInternet</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalBytesSent</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalBytesReceived</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalPacketsSent</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>TotalPacketsReceived</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n",
+      "/dynsvc/WANIPConnection:1.xml": "HTTP/1.0 200 OK\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDate: Thu, 01 Jan 1970 00:23:13 GMT\r\nContent-Type: text/xml\r\nCache-Control: max-age=1\r\nPragma: no-cache\r\nConnection: close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>SetConnectionType</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionType</name>\r\n<relatedStateVariable>ConnectionType</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetConnectionTypeInfo</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionType</name>\r\n<relatedStateVariable>ConnectionType</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPossibleConnectionTypes</name>\r\n<relatedStateVariable>PossibleConnectionTypes</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>RequestConnection</name>\r\n</action>\r\n<action>\r\n<name>ForceTermination</name>\r\n</action>\r\n<action>\r\n<name>GetStatusInfo</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionStatus</name>\r\n<relatedStateVariable>ConnectionStatus</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLastConnectionError</name>\r\n<relatedStateVariable>LastConnectionError</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewUptime</name>\r\n<relatedStateVariable>Uptime</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetNATRSIPStatus</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRSIPAvailable</name>\r\n<relatedStateVariable>RSIPAvailable</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewNATEnabled</name>\r\n<relatedStateVariable>NATEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetGenericPortMappingEntry</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewPortMappingIndex</name>\r\n<relatedStateVariable>PortMappingNumberOfEntries</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetSpecificPortMappingEntry</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>AddPortMapping</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>DeletePortMapping</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetExternalIPAddress</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewExternalIPAddress</name>\r\n<relatedStateVariable>ExternalIPAddress</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>ConnectionType</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PossibleConnectionTypes</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>IP_Routed</allowedValue>\r\n      <allowedValue>IP_Bridged</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>ConnectionStatus</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>Connecting</allowedValue>\r\n      <allowedValue>Authenticating</allowedValue>\r\n      <allowedValue>Connected</allowedValue>\r\n      <allowedValue>PendingDisconnect</allowedValue>\r\n      <allowedValue>Disconnecting</allowedValue>\r\n      <allowedValue>Disconnected</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Uptime</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>LastConnectionError</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>ERROR_NONE</allowedValue>\r\n      <allowedValue>ERROR_UNKNOWN</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>RSIPAvailable</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>NATEnabled</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>ExternalIPAddress</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PortMappingNumberOfEntries</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingEnabled</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingLeaseDuration</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>RemoteHost</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>ExternalPort</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>InternalPort</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingProtocol</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>TCP</allowedValue>\r\n      <allowedValue>UDP</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>InternalClient</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingDescription</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n",
+      "/dynsvc/WANPPPConnection:1.xml": "HTTP/1.0 200 OK\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nDate: Thu, 01 Jan 1970 00:23:13 GMT\r\nContent-Type: text/xml\r\nCache-Control: max-age=1\r\nPragma: no-cache\r\nConnection: close\r\n\r\n<?xml version=\"1.0\"?>\r\n<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\r\n  <specVersion>\r\n    <major>1</major>\r\n    <minor>0</minor>\r\n  </specVersion>\r\n<actionList>\r\n<action>\r\n<name>SetConnectionType</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionType</name>\r\n<relatedStateVariable>ConnectionType</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetConnectionTypeInfo</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionType</name>\r\n<relatedStateVariable>ConnectionType</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPossibleConnectionTypes</name>\r\n<relatedStateVariable>PossibleConnectionTypes</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>ConfigureConnection</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewUserName</name>\r\n<relatedStateVariable>UserName</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPassword</name>\r\n<relatedStateVariable>Password</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>RequestConnection</name>\r\n</action>\r\n<action>\r\n<name>ForceTermination</name>\r\n</action>\r\n<action>\r\n<name>SetIdleDisconnectTime</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewIdleDisconnectTime</name>\r\n<relatedStateVariable>IdleDisconnectTime</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetStatusInfo</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewConnectionStatus</name>\r\n<relatedStateVariable>ConnectionStatus</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLastConnectionError</name>\r\n<relatedStateVariable>LastConnectionError</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewUptime</name>\r\n<relatedStateVariable>Uptime</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetLinkLayerMaxBitRates</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewUpstreamMaxBitRate</name>\r\n<relatedStateVariable>UpstreamMaxBitRate</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewDownstreamMaxBitRate</name>\r\n<relatedStateVariable>DownstreamMaxBitRate</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetUserName</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewUserName</name>\r\n<relatedStateVariable>UserName</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetPassword</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewPassword</name>\r\n<relatedStateVariable>Password</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetIdleDisconnectTime</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewIdleDisconnectTime</name>\r\n<relatedStateVariable>IdleDisconnectTime</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetNATRSIPStatus</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRSIPAvailable</name>\r\n<relatedStateVariable>RSIPAvailable</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewNATEnabled</name>\r\n<relatedStateVariable>NATEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetGenericPortMappingEntry</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewPortMappingIndex</name>\r\n<relatedStateVariable>PortMappingNumberOfEntries</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetSpecificPortMappingEntry</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>AddPortMapping</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalPort</name>\r\n<relatedStateVariable>InternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewInternalClient</name>\r\n<relatedStateVariable>InternalClient</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewEnabled</name>\r\n<relatedStateVariable>PortMappingEnabled</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewPortMappingDescription</name>\r\n<relatedStateVariable>PortMappingDescription</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewLeaseDuration</name>\r\n<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>DeletePortMapping</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewRemoteHost</name>\r\n<relatedStateVariable>RemoteHost</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewExternalPort</name>\r\n<relatedStateVariable>ExternalPort</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n<argument>\r\n<name>NewProtocol</name>\r\n<relatedStateVariable>PortMappingProtocol</relatedStateVariable>\r\n<direction>in</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n<action>\r\n<name>GetExternalIPAddress</name>\r\n<argumentList>\r\n<argument>\r\n<name>NewExternalIPAddress</name>\r\n<relatedStateVariable>ExternalIPAddress</relatedStateVariable>\r\n<direction>out</direction>\r\n</argument>\r\n</argumentList>\r\n</action>\r\n</actionList>\r\n<serviceStateTable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>ConnectionType</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PossibleConnectionTypes</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>IP_Routed</allowedValue>\r\n      <allowedValue>DHCP_Spoofed</allowedValue>\r\n      <allowedValue>PPPoE_Bridged</allowedValue>\r\n      <allowedValue>PPTP_Relay</allowedValue>\r\n      <allowedValue>L2TP_Relay</allowedValue>\r\n      <allowedValue>PPPoE_Relay</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>ConnectionStatus</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>Unconfigured</allowedValue>\r\n      <allowedValue>Connecting</allowedValue>\r\n      <allowedValue>Authenticating</allowedValue>\r\n      <allowedValue>Connected</allowedValue>\r\n      <allowedValue>PendingDisconnect</allowedValue>\r\n      <allowedValue>Disconnecting</allowedValue>\r\n      <allowedValue>Disconnected</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Uptime</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>UpstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>DownstreamMaxBitRate</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>LastConnectionError</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>ERROR_NONE</allowedValue>\r\n      <allowedValue>ERROR_UNKNOWN</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>IdleDisconnectTime</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>RSIPAvailable</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>NATEnabled</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>UserName</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>Password</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>ExternalIPAddress</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"yes\">\r\n  <name>PortMappingNumberOfEntries</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingEnabled</name>\r\n  <dataType>boolean</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingLeaseDuration</name>\r\n  <dataType>ui4</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>RemoteHost</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>ExternalPort</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>InternalPort</name>\r\n  <dataType>ui2</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingProtocol</name>\r\n  <dataType>string</dataType>\r\n    <allowedValueList>\r\n      <allowedValue>TCP</allowedValue>\r\n      <allowedValue>UDP</allowedValue>\r\n    </allowedValueList>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>InternalClient</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n<stateVariable sendEvents=\"no\">\r\n  <name>PortMappingDescription</name>\r\n  <dataType>string</dataType>\r\n</stateVariable>\r\n</serviceStateTable>\r\n</scpd>\r\n"
+    },
+    "soap_requests": {
+      "GetDefaultConnectionService": [],
+      "SetDefaultConnectionService": [],
+      "GetCommonLinkProperties": [],
+      "GetTotalBytesSent": [],
+      "GetTotalBytesReceived": [],
+      "GetTotalPacketsReceived": [],
+      "GetTotalPacketsSent": [],
+      "SetConnectionType": [],
+      "GetConnectionTypeInfo": [],
+      "RequestConnection": [],
+      "ForceTermination": [],
+      "GetStatusInfo": [],
+      "GetNATRSIPStatus": [],
+      "GetGenericPortMappingEntry": [
+        [
+          {
+            "NewPortMappingIndex": 0
+          },
+          "HTTP/1.1 500 Internal Server Error\r\nDATE: Thu, 01 Jan 1970 00:23:13 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 474\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n <s:Body>\r\n  <s:Fault>\r\n   <faultcode>s:Client</faultcode>\r\n   <faultstring>UPnPError</faultstring>\r\n   <detail>\r\n    <UPnPError xmlns=\"urn:schemas-upnp-org:control-1-0\">\r\n     <errorCode>713</errorCode>\r\n     <errorDescription>SpecifiedArrayIndexInvalid</errorDescription>\r\n    </UPnPError>\r\n   </detail>\r\n  </s:Fault>\r\n </s:Body>\r\n</s:Envelope>\r\n"
+        ],
+        [
+          {
+            "NewPortMappingIndex": 0
+          },
+          "HTTP/1.1 500 Internal Server Error\r\nDATE: Thu, 01 Jan 1970 00:23:13 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 474\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n <s:Body>\r\n  <s:Fault>\r\n   <faultcode>s:Client</faultcode>\r\n   <faultstring>UPnPError</faultstring>\r\n   <detail>\r\n    <UPnPError xmlns=\"urn:schemas-upnp-org:control-1-0\">\r\n     <errorCode>713</errorCode>\r\n     <errorDescription>SpecifiedArrayIndexInvalid</errorDescription>\r\n    </UPnPError>\r\n   </detail>\r\n  </s:Fault>\r\n </s:Body>\r\n</s:Envelope>\r\n"
+        ]
+      ],
+      "GetSpecificPortMappingEntry": [],
+      "AddPortMapping": [
+        [
+          {
+            "NewRemoteHost": "",
+            "NewExternalPort": 4567,
+            "NewProtocol": "UDP",
+            "NewInternalPort": 4567,
+            "NewInternalClient": "192.168.1.137",
+            "NewEnabled": true,
+            "NewPortMappingDescription": "aioupnp test mapping",
+            "NewLeaseDuration": ""
+          },
+          ""
+        ]
+      ],
+      "DeletePortMapping": [
+        [
+          {
+            "NewRemoteHost": "",
+            "NewExternalPort": 4567,
+            "NewProtocol": "UDP"
+          },
+          ""
+        ]
+      ],
+      "GetExternalIPAddress": [
+        [
+          {},
+          "HTTP/1.1 200 OK\r\nDATE: Thu, 01 Jan 1970 00:23:13 GMT\r\nConnection: Keep-Alive\r\nServer: LINUX/2.4 UPnP/1.0 BRCM400/1.0\r\nContent-Length: 359\r\nContent-Type: text/xml; charset=\"utf-8\"\r\nEXT:\r\n\r\n<?xml version=\"1.0\"?>\r\n<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"><s:Body><m:GetExternalIPAddressResponse xmlns:m=\"urn:schemas-upnp-org:service:WANIPConnection:1\"><NewExternalIPAddress>11.222.33.111</NewExternalIPAddress></m:GetExternalIPAddressResponse></s:Body></s:Envelope>\r\n"
+        ]
+      ]
+    }
+  },
+  "client_address": "192.168.1.137"
+}
\ No newline at end of file
diff --git a/tests/test_gateway.py b/tests/test_gateway.py
index 6b0a50b..e0965ae 100644
--- a/tests/test_gateway.py
+++ b/tests/test_gateway.py
@@ -1,8 +1,12 @@
+import os
+import json
+from collections import OrderedDict
 from aioupnp.fault import UPnPError
 from tests import AsyncioTestCase, mock_tcp_and_udp
-from collections import OrderedDict
 from aioupnp.gateway import Gateway, get_action_list
 from aioupnp.serialization.ssdp import SSDPDatagram
+from aioupnp.serialization.soap import serialize_soap_post
+from aioupnp.upnp import UPnP
 
 
 def gen_get_bytes(location: str, host: str) -> bytes:
@@ -296,3 +300,71 @@ class TestDiscoverNetgearNighthawkAC2350(TestDiscoverDLinkDIR890L):
                                                                            'RequestConnection', 'ForceTermination',
                                                                            'GetStatusInfo', 'GetNATRSIPStatus']},
                     'soap_requests': []}
+
+
+class TestActiontec(AsyncioTestCase):
+    name = "Actiontec GT784WN"
+    _location_key = 'Location'
+
+    @property
+    def data_path(self):
+        return os.path.join(os.path.dirname(os.path.abspath(__file__)), "replays", self.name)
+
+    def _get_location(self):
+        # return self.gateway_info['reply']['Location'].split(self.gateway_address)[-1]
+        return self.gateway_info['reply'][self._location_key].split(f"{self.gateway_address}:{self.gateway_info['soap_port']}")[-1]
+
+    def setUp(self) -> None:
+        with open(self.data_path, 'r') as f:
+            data = json.loads(f.read())
+            self.gateway_info = data['gateway']
+            self.client_address = data['client_address']
+        self.gateway_address = self.gateway_info['gateway_address']
+        self.udp_replies = {
+            (SSDPDatagram('M-SEARCH', self.gateway_info['m_search_args']).encode().encode(), ("239.255.255.250", 1900)): SSDPDatagram("OK", self.gateway_info['reply']).encode().encode()
+        }
+        self.tcp_replies = {
+            (
+                f"GET {path} HTTP/1.1\r\n"
+                f"Accept-Encoding: gzip\r\n"
+                f"Host: {self.gateway_info['gateway_address']}\r\n"
+                f"Connection: Close\r\n"
+                f"\r\n"
+            ).encode(): xml_bytes.encode()
+            for path, xml_bytes in self.gateway_info['service_descriptors'].items()
+        }
+        self.tcp_replies.update({
+            (
+                f"GET {self._get_location()} HTTP/1.1\r\n"
+                f"Accept-Encoding: gzip\r\n"
+                f"Host: {self.gateway_info['gateway_address']}\r\n"
+                f"Connection: Close\r\n"
+                f"\r\n"
+            ).encode(): self.gateway_info['gateway_xml'].encode()
+        })
+        self.registered_soap_commands = self.gateway_info['registered_soap_commands']
+        super().setUp()
+
+    async def setup_request_replay(self, u: UPnP):
+        for method, reqs in self.gateway_info['soap_requests'].items():
+            if not reqs:
+                continue
+            self.tcp_replies.update({
+                serialize_soap_post(
+                    method, list(args.keys()), self.registered_soap_commands[method].encode(),
+                    self.gateway_address.encode(), u.gateway.services[self.registered_soap_commands[method]].controlURL.encode()
+                ): response.encode() for args, response in reqs
+            })
+
+    async def replay(self, u: UPnP):
+        self.assertEqual('11.222.33.111', await u.get_external_ip())
+
+    async def test_replay(self):
+        with mock_tcp_and_udp(self.loop, udp_replies=self.udp_replies, tcp_replies=self.tcp_replies, udp_expected_addr=self.gateway_address, tcp_chunk_size=1450):
+            u = await UPnP.discover(lan_address=self.client_address, gateway_address=self.gateway_address, loop=self.loop)
+            await self.setup_request_replay(u)
+            await self.replay(u)
+
+
+class TestNewMediaNet(TestActiontec):
+    name = "NewMedia-NET GmbH Generic X86"