[telepathy-gabble/master] add access control port to SupportedSocketTypes

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Thu May 21 04:29:00 PDT 2009


---
 src/tube-stream.c                               |    4 ++++
 tests/twisted/tubes/test-get-available-tubes.py |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index 86d06fb..e033a94 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -2140,6 +2140,8 @@ gabble_tube_stream_get_supported_socket_types (void)
       1);
   access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
   g_array_append_val (ipv4_tab, access_control);
+  access_control = TP_SOCKET_ACCESS_CONTROL_PORT;
+  g_array_append_val (ipv4_tab, access_control);
   g_hash_table_insert (ret, GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_IPV4),
       ipv4_tab);
 
@@ -2148,6 +2150,8 @@ gabble_tube_stream_get_supported_socket_types (void)
       1);
   access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
   g_array_append_val (ipv6_tab, access_control);
+  access_control = TP_SOCKET_ACCESS_CONTROL_PORT;
+  g_array_append_val (ipv6_tab, access_control);
   g_hash_table_insert (ret, GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_IPV6),
       ipv6_tab);
 
diff --git a/tests/twisted/tubes/test-get-available-tubes.py b/tests/twisted/tubes/test-get-available-tubes.py
index ebb1f60..cff5150 100644
--- a/tests/twisted/tubes/test-get-available-tubes.py
+++ b/tests/twisted/tubes/test-get-available-tubes.py
@@ -84,8 +84,10 @@ def test(q, bus, conn, stream):
     assertLength(3, stream_tubes_types)
     assertEquals([cs.SOCKET_ACCESS_CONTROL_LOCALHOST, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS],
         stream_tubes_types[cs.SOCKET_ADDRESS_TYPE_UNIX])
-    assertEquals([cs.SOCKET_ACCESS_CONTROL_LOCALHOST], stream_tubes_types[cs.SOCKET_ADDRESS_TYPE_IPV4])
-    assertEquals([cs.SOCKET_ACCESS_CONTROL_LOCALHOST], stream_tubes_types[cs.SOCKET_ADDRESS_TYPE_IPV6])
+    assertEquals([cs.SOCKET_ACCESS_CONTROL_LOCALHOST, cs.SOCKET_ACCESS_CONTROL_PORT],
+        stream_tubes_types[cs.SOCKET_ADDRESS_TYPE_IPV4])
+    assertEquals([cs.SOCKET_ACCESS_CONTROL_LOCALHOST, cs.SOCKET_ACCESS_CONTROL_PORT],
+        stream_tubes_types[cs.SOCKET_ADDRESS_TYPE_IPV6])
 
     # muc stream tube (new API)
     path, props = conn.Requests.CreateChannel({
-- 
1.5.6.5




More information about the telepathy-commits mailing list