[Telepathy-commits] [telepathy-spec/master] MediaStreamHandler: Change STUNServer/STUNPort to STUNServers

[Simon McVittie]

In XMPP we can be given more than one STUN server.
---
 spec/Channel_Interface_Media_Signalling.xml |    4 ++--
 spec/Media_Stream_Handler.xml               |   24 +++++++-----------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/spec/Channel_Interface_Media_Signalling.xml b/spec/Channel_Interface_Media_Signalling.xml
index 41419d2..f3effc6 100644
--- a/spec/Channel_Interface_Media_Signalling.xml
+++ b/spec/Channel_Interface_Media_Signalling.xml
@@ -120,7 +120,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
     <tp:property name="stun-server" type="s">
       <tp:deprecated version="0.17.UNRELEASED">Use the <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Media.StreamHandler">STUNServer</tp:dbus-ref>
+          namespace="org.freedesktop.Telepathy.Media.StreamHandler">STUNServers</tp:dbus-ref>
         property on the Media.StreamHandler, if available; use this
         as a fallback.</tp:deprecated>
       <tp:docstring>
@@ -131,7 +131,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
     <tp:property name="stun-port" type="q">
       <tp:deprecated version="0.17.UNRELEASED">Use the <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Media.StreamHandler">STUNServer</tp:dbus-ref>
+          namespace="org.freedesktop.Telepathy.Media.StreamHandler">STUNServers</tp:dbus-ref>
         property on the Media.StreamHandler, if available; use this
         as a fallback.</tp:deprecated>
       <tp:docstring>
diff --git a/spec/Media_Stream_Handler.xml b/spec/Media_Stream_Handler.xml
index 8b87cde..695eeee 100644
--- a/spec/Media_Stream_Handler.xml
+++ b/spec/Media_Stream_Handler.xml
@@ -70,14 +70,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:member>
     </tp:struct>
 
-    <property name="STUNServer" tp:name-for-bindings="STUN_Server"
-      type="s" access="read">
+    <property name="STUNServers" tp:name-for-bindings="STUN_Servers"
+      type="a(sq)" tp:type="Socket_Address_IP[]" access="read">
       <tp:added version="0.17.UNRELEASED"/>
       <tp:docstring>
-        The IP address of the STUN server to use for NAT traversal, as
-        a dotted-quad IPv4 address literal or an RFC2373 IPv6 address literal.
+        The IP addresses of possible STUN servers to use for NAT traversal, as
+        dotted-quad IPv4 address literals or RFC2373 IPv6 address literals.
         This property cannot change once the stream has been created, so there
-        is no change notification. This MUST NOT be a DNS hostname.
+        is no change notification. The IP addresses MUST NOT be given as DNS
+        hostnames.
 
         <tp:rationale>
           High-quality connection managers already need an asynchronous
@@ -87,17 +88,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </property>
 
-    <property name="STUNPort" tp:name-for-bindings="STUN_Port"
-      type="u" access="read">
-      <tp:added version="0.17.UNRELEASED"/>
-      <tp:docstring>
-        The UDP port number to use on the
-        <tp:member-ref>STUNServer</tp:member-ref>.
-        This property cannot change once the stream has been created, so there
-        is no change notification.
-      </tp:docstring>
-    </property>
-
     <property name="NATTraversal" tp:name-for-bindings="NAT_Traversal"
       type="s" access="read">
       <tp:added version="0.17.UNRELEASED"/>
@@ -108,7 +98,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <dl>
           <dt>none</dt>
           <dd>Raw UDP, with or without STUN, should be used. If the
-            <tp:member-ref>STUNServer</tp:member-ref> property is non-empty,
+            <tp:member-ref>STUNServers</tp:member-ref> property is non-empty,
             STUN SHOULD be used.</dd>
 
           <dt>stun</dt>
-- 
1.5.6.5