Add WANPPPConnection.xml definition

git-svn-id: https://svn.o-hand.com/repos/gupnp/trunk/gupnp-igd@1289 d8cb91d7-bff9-0310-92b9-80b65e4482b2

3 files changed, 564 insertions, 1 deletions

diff --git a/tests/gtest/InternetGatewayDevice.xml b/tests/gtest/InternetGatewayDevice.xml
index 7fb34c9..6bc42df 100644
--- a/tests/gtest/InternetGatewayDevice.xml
+++ b/tests/gtest/InternetGatewayDevice.xml
@@ -43,13 +43,27 @@
        <UDN>uuid:UUID3</UDN>
        <UPC>Universal Product Code</UPC>
        <serviceList>
-           <service>
+          <service>
             <serviceType>urn:schemas-upnp-org:service:WANIPConnection:1</serviceType>
             <serviceId>urn:upnp-org:serviceId:WANIPConn1</serviceId>
             <SCPDURL>/WANIPConnection.xml</SCPDURL>
             <controlURL>/WANIPConnection/Control</controlURL>
             <eventSubURL>/WANIPConnection/Event</eventSubURL>
           </service>
+          <service>
+            <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>
+            <serviceId>urn:upnp-org:serviceId:WANPPPConn1</serviceId>
+            <SCPDURL>/WANPPPConnection.xml</SCPDURL>
+            <controlURL>/WANPPPConnection/Control</controlURL>
+            <eventSubURL>/WANPPPConnection/Event</eventSubURL>
+          </service>
+           <service>
+            <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>
+            <serviceId>urn:upnp-org:serviceId:WANPPPConn1</serviceId>
+            <SCPDURL>/WANPPPConnection.xml</SCPDURL>
+            <controlURL>/WANPPPConnection/Control</controlURL>
+            <eventSubURL>/WANPPPConnection/Event</eventSubURL>
+          </service>
        </serviceList>
       </device>
     </deviceList>
diff --git a/tests/gtest/WANPPPConnection.xml b/tests/gtest/WANPPPConnection.xml
new file mode 100644
index 0000000..0da021a
--- /dev/null
+++ b/tests/gtest/WANPPPConnection.xml
@@ -0,0 +1,548 @@
+<?xml version="1.0"?>
+<scpd xmlns="urn:schemas-upnp-org:service-1-0">
+  <specVersion>
+    <major>1</major>
+    <minor>0</minor>
+  </specVersion>
+  <actionList>
+   <action>
+    <name>SetConnectionType</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionType</name>
+          <direction>in</direction>
+          <relatedStateVariable>ConnectionType</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetConnectionTypeInfo</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionType</name>
+          <direction>out</direction>
+          <relatedStateVariable>ConnectionType</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPossibleConnectionTypes</name>
+          <direction>out</direction>
+          <relatedStateVariable>PossibleConnectionTypes
+                                    </relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>ConfigureConnection</name>
+      <argumentList>
+        <argument>
+          <name>NewUserName</name>
+          <direction>in</direction>
+          <relatedStateVariable>UserName</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPassword</name>
+          <direction>in</direction>
+          <relatedStateVariable>Password</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>RequestConnection</name>
+    </action>
+    <action>
+    <name>RequestTermination</name>
+</action>
+<action>
+<name>ForceTermination</name>
+</action>
+<action>
+<name>SetAutoDisconnectTime</name>
+  <argumentList>
+    <argument>
+      <name>NewAutoDisconnectTime</name>
+      <direction>in</direction>
+     <relatedStateVariable>AutoDisconnectTime</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>SetIdleDisconnectTime</name>
+  <argumentList>
+    <argument>
+      <name>NewIdleDisconnectTime</name>
+      <direction>in</direction>
+     <relatedStateVariable>IdleDisconnectTime</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>SetWarnDisconnectDelay</name>
+  <argumentList>
+    <argument>
+      <name>NewWarnDisconnectDelay</name>
+      <direction>in</direction>
+    <relatedStateVariable>WarnDisconnectDelay</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetStatusInfo</name>
+  <argumentList>
+    <argument>
+      <name>NewConnectionStatus</name>
+      <direction>out</direction>
+      <relatedStateVariable>ConnectionStatus</relatedStateVariable>
+    </argument>
+    <argument>
+      <name>NewLastConnectionError</name>
+      <direction>out</direction>
+    <relatedStateVariable>LastConnectionError</relatedStateVariable>
+    </argument>
+    <argument>
+      <name>NewUptime</name>
+      <direction>out</direction>
+      <relatedStateVariable>Uptime</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetLinkLayerMaxBitRates</name>
+      <argumentList>
+        <argument>
+          <name>NewUpstreamMaxBitRate</name>
+          <direction>out</direction>
+<relatedStateVariable>UpstreamMaxBitRate</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewDownstreamMaxBitRate</name>
+          <direction>out</direction>
+<relatedStateVariable>DownstreamMaxBitRate</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetPPPEncryptionProtocol</name>
+      <argumentList>
+        <argument>
+          <name>NewPPPEncryptionProtocol</name>
+          <direction>out</direction>
+<relatedStateVariable>PPPEncryptionProtocol</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetPPPCompressionProtocol</name>
+      <argumentList>
+        <argument>
+          <name>NewPPPCompressionProtocol</name>
+          <direction>out</direction>
+<relatedStateVariable>PPPCompressionProtocol</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetPPPAuthenticationProtocol</name>
+      <argumentList>
+        <argument>
+          <name>NewPPPAuthenticationProtocol</name>
+          <direction>out</direction>
+<relatedStateVariable>PPPAuthenticationProtocol</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetUserName</name>
+      <argumentList>
+        <argument>
+          <name>NewUserName</name>
+          <direction>out</direction>
+          <relatedStateVariable>UserName</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetPassword</name>
+  <argumentList>
+    <argument>
+      <name>NewPassword</name>
+      <direction>out</direction>
+      <relatedStateVariable>Password</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetAutoDisconnectTime</name>
+  <argumentList>
+    <argument>
+      <name>NewAutoDisconnectTime</name>
+      <direction>out</direction>
+     <relatedStateVariable>AutoDisconnectTime</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetIdleDisconnectTime</name>
+  <argumentList>
+    <argument>
+      <name>NewIdleDisconnectTime</name>
+      <direction>out</direction>
+     <relatedStateVariable>IdleDisconnectTime</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetWarnDisconnectDelay</name>
+  <argumentList>
+    <argument>
+      <name>NewWarnDisconnectDelay</name>
+      <direction>out</direction>
+    <relatedStateVariable>WarnDisconnectDelay</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetNATRSIPStatus</name>
+  <argumentList>
+    <argument>
+      <name>NewRSIPAvailable</name>
+      <direction>out</direction>
+      <relatedStateVariable>RSIPAvailable</relatedStateVariable>
+    </argument>
+    <argument>
+      <name>NewNATEnabled</name>
+      <direction>out</direction>
+      <relatedStateVariable>NATEnabled</relatedStateVariable>
+    </argument>
+  </argumentList>
+</action>
+<action>
+<name>GetGenericPortMappingEntry</name>
+  <argumentList>
+        <argument>
+          <name>NewPortMappingIndex</name>
+          <direction>in</direction>
+<relatedStateVariable>PortMappingNumberOfEntries</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>out</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>out</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>out</direction>
+         <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>out</direction>
+     <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>out</direction>
+<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetSpecificPortMappingEntry </name>
+      <argumentList>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>out</direction>
+         <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>out</direction>
+<relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>out</direction>
+<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>AddPortMapping </name>
+      <argumentList>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>in</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>in</direction>
+<relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>in</direction>
+     <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>in</direction>
+<relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>DeletePortMapping</name>
+      <argumentList>
+         <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+     </argumentList>
+    </action>
+    <action>
+    <name>GetExternalIPAddress</name>
+      <argumentList>
+        <argument>
+          <name>NewExternalIPAddress</name>
+          <direction>out</direction>
+        <relatedStateVariable>ExternalIPAddress</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <!-- Declarations for other actions added by UPnP vendor (if any) go here -->
+  </actionList>
+  <serviceStateTable>
+    <stateVariable sendEvents="no">
+      <name>ConnectionType</name>
+      <dataType>string</dataType>
+ </stateVariable>
+    <stateVariable sendEvents="yes">
+      <name>PossibleConnectionTypes</name>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>Unconfigured</allowedValue>
+        <allowedValue>IP_Routed</allowedValue>
+        <allowedValue>DHCP_Spoofed</allowedValue>
+        <allowedValue>PPPOE_Bridged</allowedValue>
+        <allowedValue>PPTP_Relay</allowedValue>
+        <allowedValue>L2TP_Relay</allowedValue>
+        <allowedValue>PPOE_Relay</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+    <stateVariable sendEvents="yes">
+      <name>ConnectionStatus</name>
+      <dataType>string</dataType>
+<allowedValueList>
+        <allowedValue>Unconfigured</allowedValue>
+        <allowedValue>Connecting</allowedValue>
+        <allowedValue>Authenticating</allowedValue>
+        <allowedValue>Connected</allowedValue>
+        <allowedValue>PendingDisconnect</allowedValue>
+        <allowedValue>Disconnecting</allowedValue>
+        <allowedValue>Disconnected</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>Uptime</name>
+      <dataType>ui4</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>UpstreamMaxBitRate</name>
+      <dataType>ui4</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>DownstreamMaxBitRate</name>
+      <dataType>ui4</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>LastConnectionError</name>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>ERROR_NONE</allowedValue>
+        <allowedValue>ERROR_ISP_TIME_OUT</allowedValue>
+        <allowedValue>ERROR_COMMAND_ABORTED</allowedValue>
+        <allowedValue>ERROR_NOT_ENABLED_FOR_INTERNET</allowedValue>
+        <allowedValue>ERROR_BAD_PHONE_NUMBER</allowedValue>
+        <allowedValue>ERROR_USER_DISCONNECT</allowedValue>
+    <allowedValue>ERROR_ISP_DISCONNECT</allowedValue>
+    <allowedValue>ERROR_IDLE_DISCONNECT</allowedValue>
+    <allowedValue>ERROR_FORCED_DISCONNECT</allowedValue>
+    <allowedValue>ERROR_SERVER_OUT_OF_RESOURCES</allowedValue>
+    <allowedValue>ERROR_RESTRICTED_LOGON_HOURS</allowedValue>
+    <allowedValue>ERROR_ACCOUNT_DISABLED</allowedValue>
+    <allowedValue>ERROR_ACCOUNT_EXPIRED</allowedValue>
+    <allowedValue>ERROR_PASSWORD_EXPIRED</allowedValue>
+    <allowedValue>ERROR_AUTHENTICATION_FAILURE</allowedValue>
+    <allowedValue>ERROR_NO_DIALTONE</allowedValue>
+    <allowedValue>ERROR_NO_CARRIER</allowedValue>
+    <allowedValue>ERROR_NO_ANSWER</allowedValue>
+    <allowedValue>ERROR_LINE_BUSY</allowedValue>
+    <allowedValue>ERROR_UNSUPPORTED_BITSPERSECOND</allowedValue>
+    <allowedValue>ERROR_TOO_MANY_LINE_ERRORS</allowedValue>
+    <allowedValue>ERROR_IP_CONFIGURATION</allowedValue>
+    <allowedValue>ERROR_UNKNOWN</allowedValue>
+  </allowedValueList>
+</stateVariable>
+ <stateVariable sendEvents="no">
+  <name>AutoDisconnectTime</name>
+  <dataType>ui4</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>IdleDisconnectTime</name>
+  <dataType>ui4</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>WarnDisconnectDelay</name>
+  <dataType>ui4</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>RSIPAvailable</name>
+  <dataType>boolean</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>NATEnabled</name>
+  <dataType>boolean</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>UserName</name>
+  <dataType>string</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>Password</name>
+  <dataType>string</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>PPPEncryptionProtocol</name>
+  <dataType>string</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+  <name>PPPCompressionProtocol</name>
+  <dataType>string</dataType>
+</stateVariable>
+<stateVariable sendEvents="no">
+      <name>PPPAuthenticationProtocol</name>
+      <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="yes">
+      <name>ExternalIPAddress</name>
+      <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="yes">
+      <name>PortMappingNumberOfEntries</name>
+      <dataType>ui2</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>PortMappingEnabled</name>
+      <dataType>boolean</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>PortMappingLeaseDuration</name>
+      <dataType>ui4</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>RemoteHost</name>
+      <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>ExternalPort</name>
+      <dataType>ui2</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>InternalPort</name>
+      <dataType>ui2</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>PortMappingProtocol</name>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>TCP</allowedValue>
+        <allowedValue>UDP</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>InternalClient</name>
+      <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>PortMappingDescription</name>
+      <dataType>string</dataType>
+    </stateVariable>
+    <!-- Declarations for other state variables added by UPnP vendor (if any) go here -->
+  </serviceStateTable>
+</scpd>
diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
index 739b819..2139ddc 100644
--- a/tests/gtest/gupnp-simple-igd.c
+++ b/tests/gtest/gupnp-simple-igd.c
@@ -178,6 +178,7 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd)
 
   gupnp_context_host_path (context, "InternetGatewayDevice.xml", "/InternetGatewayDevice.xml");
   gupnp_context_host_path (context, "WANIPConnection.xml", "/WANIPConnection.xml");
+  gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml");
 
   dev = gupnp_root_device_new (context, "/InternetGatewayDevice.xml");
   g_assert (dev);