[Telepathy-commits] [telepathy-salut/master] GibberBytestreamDirect and SalutDirectBytestreamManager: Use struct sockaddr_storage for storage but always pass struct sockaddr* + size as parameters

[Alban Crequy]

---
 lib/gibber/gibber-bytestream-direct.c |    4 ++--
 lib/gibber/gibber-bytestream-direct.h |    2 +-
 src/salut-direct-bytestream-manager.c |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c
index e22b387..e3e1e17 100644
--- a/lib/gibber/gibber-bytestream-direct.c
+++ b/lib/gibber/gibber-bytestream-direct.c
@@ -503,8 +503,8 @@ gibber_bytestream_direct_accept_socket (GibberBytestreamIface *bytestream,
       host, NI_MAXHOST, port, NI_MAXSERV,
       NI_NUMERICHOST | NI_NUMERICSERV);
 
-  if (priv->check_addr_func != NULL && !priv->check_addr_func (self, &addr,
-        addrlen, priv->check_addr_func_data))
+  if (priv->check_addr_func != NULL && !priv->check_addr_func (self,
+        (struct sockaddr *) &addr, addrlen, priv->check_addr_func_data))
     {
       DEBUG ("connection from %s refused by the bytestream user", host);
       return FALSE;
diff --git a/lib/gibber/gibber-bytestream-direct.h b/lib/gibber/gibber-bytestream-direct.h
index 837a94b..f3abcfb 100644
--- a/lib/gibber/gibber-bytestream-direct.h
+++ b/lib/gibber/gibber-bytestream-direct.h
@@ -30,7 +30,7 @@ typedef struct _GibberBytestreamDirect GibberBytestreamDirect;
 typedef struct _GibberBytestreamDirectClass GibberBytestreamDirectClass;
 
 typedef gboolean (* GibberBytestreamDirectCheckAddrFunc) (
-    GibberBytestreamDirect *bytestream, struct sockaddr_storage *addr,
+    GibberBytestreamDirect *bytestream, struct sockaddr *addr,
     socklen_t addrlen, gpointer user_data);
 
 struct _GibberBytestreamDirectClass {
diff --git a/src/salut-direct-bytestream-manager.c b/src/salut-direct-bytestream-manager.c
index 14d4e5c..25349a2 100644
--- a/src/salut-direct-bytestream-manager.c
+++ b/src/salut-direct-bytestream-manager.c
@@ -268,7 +268,7 @@ salut_direct_bytestream_manager_new (SalutConnection *conn)
 
 static gboolean
 check_bytestream_direct_peer_addr (GibberBytestreamDirect *bytestream,
-                                   struct sockaddr_storage *addr,
+                                   struct sockaddr *addr,
                                    socklen_t addrlen,
                                    gpointer user_data)
 {
@@ -299,7 +299,7 @@ check_bytestream_direct_peer_addr (GibberBytestreamDirect *bytestream,
   if (contact == NULL)
     return FALSE;
 
-  result = salut_contact_has_address (contact, addr);
+  result = salut_contact_has_address (contact, addr, addrlen);
   g_object_unref (contact);
 
   return result;
-- 
1.5.6.5