Merge pull request #577

32a2633 no longer need to pass the size to rapidjson (Riccardo Spagni)
bd8e0fd add missing miniupnpc files, modify cmake to not build miniupnpc tests and to fix an issue with finding miniupnpcstrings (Riccardo Spagni)
7da9905 updated miniupnpc (Riccardo Spagni)

4 files changed, 234 insertions, 0 deletions

diff --git a/external/miniupnpc/testdesc/linksys_WAG200G_desc.values b/external/miniupnpc/testdesc/linksys_WAG200G_desc.values
new file mode 100644
index 000000000..cf4222187
--- /dev/null
+++ b/external/miniupnpc/testdesc/linksys_WAG200G_desc.values
@@ -0,0 +1,14 @@
+# values for linksys_WAG200G_desc.xml
+
+CIF:
+ servicetype = urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1
+ controlurl = /upnp/control/WANCommonIFC1
+ eventsuburl = /upnp/event/WANCommonIFC1
+ scpdurl = /cmnicfg.xml
+
+first:
+ servicetype = urn:schemas-upnp-org:service:WANPPPConnection:1
+ controlurl = /upnp/control/WANPPPConn1
+ eventsuburl = /upnp/event/WANPPPConn1
+ scpdurl = /pppcfg.xml
+
diff --git a/external/miniupnpc/testdesc/linksys_WAG200G_desc.xml b/external/miniupnpc/testdesc/linksys_WAG200G_desc.xml
new file mode 100644
index 000000000..d428d73b0
--- /dev/null
+++ b/external/miniupnpc/testdesc/linksys_WAG200G_desc.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<root xmlns="urn:schemas-upnp-org:device-1-0">
+<specVersion>
+<major>1</major>
+<minor>0</minor>
+</specVersion>
+<URLBase>http://192.168.1.1:49152</URLBase>
+<device>
+<deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>
+<friendlyName>LINKSYS WAG200G Gateway</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com</manufacturerURL>
+<modelDescription>LINKSYS WAG200G Gateway</modelDescription>
+<modelName>Wireless-G ADSL Home Gateway</modelName>
+<modelNumber>WAG200G</modelNumber>
+<modelURL>http://www.linksys.com</modelURL>
+<serialNumber>123456789</serialNumber>
+<UDN>uuid:8ca2eb37-1dd2-11b2-86f1-001a709b5aa8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:L3Forwarding1</serviceId>
+<controlURL>/upnp/control/L3Forwarding1</controlURL>
+<eventSubURL>/upnp/event/L3Forwarding1</eventSubURL>
+<SCPDURL>/l3frwd.xml</SCPDURL>
+</service>
+</serviceList>
+<deviceList>
+<device>
+<deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>
+<friendlyName>WANDevice</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com/</manufacturerURL>
+<modelDescription>Residential Gateway</modelDescription>
+<modelName>Internet Connection Sharing</modelName>
+<modelNumber>1</modelNumber>
+<modelURL>http://www.linksys.com/</modelURL>
+<serialNumber>0000001</serialNumber>
+<UDN>uuid:8ca2eb36-1dd2-11b2-86f1-001a709b5aa8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId>
+<controlURL>/upnp/control/WANCommonIFC1</controlURL>
+<eventSubURL>/upnp/event/WANCommonIFC1</eventSubURL>
+<SCPDURL>/cmnicfg.xml</SCPDURL>
+</service>
+</serviceList>
+<deviceList>
+<device>
+<deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>
+<friendlyName>WANConnectionDevice</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com/</manufacturerURL>
+<modelDescription>Residential Gateway</modelDescription>
+<modelName>Internet Connection Sharing</modelName>
+<modelNumber>1</modelNumber>
+<modelURL>http://www.linksys.com/</modelURL>
+<serialNumber>0000001</serialNumber>
+<UDN>uuid:8ca2eb37-1dd2-11b2-86f0-001a709b5aa8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:WANEthernetLinkConfig:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:WANEthLinkC1</serviceId>
+<controlURL>/upnp/control/WANEthLinkC1</controlURL>
+<eventSubURL>/upnp/event/WANEthLinkC1</eventSubURL>
+<SCPDURL>/wanelcfg.xml</SCPDURL>
+</service>
+<service>
+<serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:WANPPPConn1</serviceId>
+<controlURL>/upnp/control/WANPPPConn1</controlURL>
+<eventSubURL>/upnp/event/WANPPPConn1</eventSubURL>
+<SCPDURL>/pppcfg.xml</SCPDURL>
+</service>
+</serviceList>
+</device>
+</deviceList>
+</device>
+<device>
+<deviceType>urn:schemas-upnp-org:device:LANDevice:1</deviceType>
+<friendlyName>LANDevice</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com/</manufacturerURL>
+<modelDescription>Residential Gateway</modelDescription>
+<modelName>Residential Gateway</modelName>
+<modelNumber>1</modelNumber>
+<modelURL>http://www.linksys.com/</modelURL>
+<serialNumber>0000001</serialNumber>
+<UDN>uuid:8ca2eb36-1dd2-11b2-86f0-001a709b5aa
+8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:LANHostConfigManagement:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:LANHostCfg1</serviceId>
+<controlURL>/upnp/control/LANHostCfg1</controlURL>
+<eventSubURL>/upnp/event/LANHostCfg1</eventSubURL>
+<SCPDURL>/lanhostc.xml</SCPDURL>
+</service>
+</serviceList>
+</device>
+</deviceList>
+<presentationURL>http://192.168.1.1/index.htm</presentationURL>
+</device>
+</root>
+
diff --git a/external/miniupnpc/testdesc/new_LiveBox_desc.values b/external/miniupnpc/testdesc/new_LiveBox_desc.values
new file mode 100644
index 000000000..c55552e58
--- /dev/null
+++ b/external/miniupnpc/testdesc/new_LiveBox_desc.values
@@ -0,0 +1,20 @@
+# values for new_LiveBox_desc.xml
+
+CIF:
+ servicetype = urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1
+ controlurl = /87895a19/upnp/control/WANCommonIFC1
+ eventsuburl = /87895a19/upnp/control/WANCommonIFC1
+ scpdurl = /87895a19/gateicfgSCPD.xml
+
+first:
+ servicetype = urn:schemas-upnp-org:service:WANPPPConnection:2
+ controlurl = /87895a19/upnp/control/WANIPConn1
+ eventsuburl = /87895a19/upnp/control/WANIPConn1
+ scpdurl = /87895a19/gateconnSCPD_PPP.xml
+
+IPv6FC:
+ servicetype = urn:schemas-upnp-org:service:WANIPv6FirewallControl:1
+ controlurl = /87895a19/upnp/control/WANIPv6FwCtrl1
+ eventsuburl = /87895a19/upnp/control/WANIPv6FwCtrl1
+ scpdurl = /87895a19/wanipv6fwctrlSCPD.xml
+
diff --git a/external/miniupnpc/testdesc/new_LiveBox_desc.xml b/external/miniupnpc/testdesc/new_LiveBox_desc.xml
new file mode 100644
index 000000000..620eb55af
--- /dev/null
+++ b/external/miniupnpc/testdesc/new_LiveBox_desc.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>

+<root xmlns="urn:schemas-upnp-org:device-1-0">

+  <specVersion>

+    <major>1</major>

+    <minor>0</minor>

+  </specVersion>

+  <device>

+    <pnpx:X_hardwareId xmlns:pnpx="http://schemas.microsoft.com/windows/pnpx/2005/11">VEN_0129&amp;DEV_0000&amp;SUBSYS_03&amp;REV_250417</pnpx:X_hardwareId>

+    <pnpx:X_compatibleId xmlns:pnpx="http://schemas.microsoft.com/windows/pnpx/2005/11">GenericUmPass</pnpx:X_compatibleId>

+    <pnpx:X_deviceCategory xmlns:pnpx="http://schemas.microsoft.com/windows/pnpx/2005/11">NetworkInfrastructure.Gateway</pnpx:X_deviceCategory>

+    <df:X_deviceCategory xmlns:df="http://schemas.microsoft.com/windows/2008/09/devicefoundation">Network.Gateway</df:X_deviceCategory>

+    <deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:2</deviceType>

+    <friendlyName>Orange Livebox</friendlyName>

+    <manufacturer>Sagemcom</manufacturer>

+    <manufacturerURL>http://www.sagemcom.com/</manufacturerURL>

+    <modelName>Residential Livebox,(DSL,WAN Ethernet)</modelName>

+    <UDN>uuid:87895a19-50f9-3736-a87f-115c230155f8</UDN>

+    <modelDescription>Sagemcom,fr,SG30_sip-fr-4.28.35.1</modelDescription>

+    <modelNumber>3</modelNumber>

+    <serialNumber>LK14129DP441489</serialNumber>

+    <presentationURL>http://192.168.1.1</presentationURL>

+    <UPC></UPC>

+    <iconList>

+      <icon>

+        <mimetype>image/png</mimetype>

+        <width>16</width>

+        <height>16</height>

+        <depth>8</depth>

+        <url>/87895a19/ligd.png</url>

+      </icon>

+    </iconList>

+    <deviceList>

+      <device>

+        <deviceType>urn:schemas-upnp-org:device:WANDevice:2</deviceType>

+        <friendlyName>WANDevice</friendlyName>

+        <manufacturer>Sagemcom</manufacturer>

+        <manufacturerURL>http://www.sagemcom.com/</manufacturerURL>

+        <modelDescription>WAN Device on Sagemcom,fr,SG30_sip-fr-4.28.35.1</modelDescription>

+        <modelName>Residential Livebox,(DSL,WAN Ethernet)</modelName>

+        <modelNumber>3</modelNumber>

+        <modelURL>http://www.sagemcom.com/</modelURL>

+        <serialNumber>LK14129DP441489</serialNumber>

+        <presentationURL>http://192.168.1.1</presentationURL>

+        <UDN>uuid:e2397374-53d8-3fc6-8306-593ba1a34625</UDN>

+        <UPC></UPC>

+        <serviceList>

+          <service>

+            <serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>

+            <serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId>

+            <controlURL>/87895a19/upnp/control/WANCommonIFC1</controlURL>

+            <eventSubURL>/87895a19/upnp/control/WANCommonIFC1</eventSubURL>

+            <SCPDURL>/87895a19/gateicfgSCPD.xml</SCPDURL>

+          </service>

+        </serviceList>

+        <deviceList>

+          <device>

+            <deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:2</deviceType>

+            <friendlyName>WANConnectionDevice</friendlyName>

+            <manufacturer>Sagemcom</manufacturer>

+            <manufacturerURL>http://www.sagemcom.com/</manufacturerURL>

+            <modelDescription>WanConnectionDevice on Sagemcom,fr,SG30_sip-fr-4.28.35.1</modelDescription>

+            <modelName>Residential Livebox,(DSL,WAN Ethernet)</modelName>

+            <modelNumber>3</modelNumber>

+            <modelURL>http://www.sagemcom.com/</modelURL>

+            <serialNumber>LK14129DP441489</serialNumber>

+            <presentationURL>http://192.168.1.1</presentationURL>

+            <UDN>uuid:44598a08-288e-32c9-8a4d-d3c008ede331</UDN>

+            <UPC></UPC>

+            <serviceList>

+              <service>

+                <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:2</serviceType>

+                <serviceId>urn:upnp-org:serviceId:WANIPConn1</serviceId>

+                <controlURL>/87895a19/upnp/control/WANIPConn1</controlURL>

+                <eventSubURL>/87895a19/upnp/control/WANIPConn1</eventSubURL>

+                <SCPDURL>/87895a19/gateconnSCPD_PPP.xml</SCPDURL>

+              </service>

+             <service>

+                <serviceType>urn:schemas-upnp-org:service:WANIPv6FirewallControl:1</serviceType>

+                <serviceId>urn:upnp-org:serviceId:WANIPv6FwCtrl1</serviceId>

+                <controlURL>/87895a19/upnp/control/WANIPv6FwCtrl1</controlURL>

+                <eventSubURL>/87895a19/upnp/control/WANIPv6FwCtrl1</eventSubURL>

+                <SCPDURL>/87895a19/wanipv6fwctrlSCPD.xml</SCPDURL>

+              </service>

+            </serviceList>

+          </device>

+        </deviceList>

+      </device>

+    </deviceList>

+  </device>

+</root>
\ No newline at end of file