[Pkg-telepathy-commits] [libnice] 216/265: stun: Restore argument type to stun_usage_bind_process(), it's used outside libnice

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 5891c95646bfbcf7789128b712fb5e242719df91
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Tue Apr 15 23:18:21 2014 -0400

    stun: Restore argument type to stun_usage_bind_process(), it's used outside libnice
---
 agent/conncheck.c  |  4 ++--
 stun/usages/bind.c | 16 +++++++++-------
 stun/usages/bind.h |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/agent/conncheck.c b/agent/conncheck.c
index d202d69..5c55317 100644
--- a/agent/conncheck.c
+++ b/agent/conncheck.c
@@ -2267,8 +2267,8 @@ static gboolean priv_map_reply_to_discovery_request (NiceAgent *agent, StunMessa
       stun_message_id (&d->stun_message, discovery_id);
 
       if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)) == 0) {
-        res = stun_usage_bind_process (resp, &sockaddr.storage,
-            &socklen, &alternate.storage, &alternatelen);
+        res = stun_usage_bind_process (resp, &sockaddr.addr,
+            &socklen, &alternate.addr, &alternatelen);
         nice_debug ("Agent %p : stun_bind_process/disc for %p res %d.",
             agent, d, (int)res);
 
diff --git a/stun/usages/bind.c b/stun/usages/bind.c
index 69008c4..eeb6039 100644
--- a/stun/usages/bind.c
+++ b/stun/usages/bind.c
@@ -94,8 +94,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg,
 }
 
 StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
-    struct sockaddr_storage *addr, socklen_t *addrlen,
-    struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len)
+    struct sockaddr *addr, socklen_t *addrlen,
+    struct sockaddr *alternate_server, socklen_t *alternate_server_len)
 {
   int code = -1;
   StunMessageReturn val;
@@ -126,7 +126,7 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
       if ((code / 100) == 3) {
         if (alternate_server && alternate_server_len) {
           if (stun_message_find_addr (msg, STUN_ATTRIBUTE_ALTERNATE_SERVER,
-                  alternate_server,
+                  (struct sockaddr_storage *) alternate_server,
                   alternate_server_len) != STUN_MESSAGE_RETURN_SUCCESS) {
             stun_debug (" Unexpectedly missing ALTERNATE-SERVER attribute\n");
             return STUN_USAGE_BIND_RETURN_ERROR;
@@ -152,12 +152,14 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
   stun_debug ("Received %u-bytes STUN message\n", stun_message_length (msg));
 
   val = stun_message_find_xor_addr (msg,
-      STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, addr, addrlen);
+      STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, (struct sockaddr_storage *)addr,
+      addrlen);
   if (val != STUN_MESSAGE_RETURN_SUCCESS)
   {
     stun_debug (" No XOR-MAPPED-ADDRESS: %d\n", val);
     val = stun_message_find_addr (msg,
-        STUN_ATTRIBUTE_MAPPED_ADDRESS, addr, addrlen);
+        STUN_ATTRIBUTE_MAPPED_ADDRESS, (struct sockaddr_storage *)addr,
+        addrlen);
     if (val != STUN_MESSAGE_RETURN_SUCCESS)
     {
       stun_debug (" No MAPPED-ADDRESS: %d\n", val);
@@ -529,8 +531,8 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
     if (valid != STUN_VALIDATION_SUCCESS) {
       ret = STUN_USAGE_TRANS_RETURN_RETRY;
     } else {
-      bind_ret = stun_usage_bind_process (&msg, addr, addrlen,
-          &alternate_server, &alternate_server_len);
+      bind_ret = stun_usage_bind_process (&msg, (struct sockaddr *)  addr,
+          addrlen, (struct sockaddr *) &alternate_server, &alternate_server_len);
       if (bind_ret == STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER) {
         stun_trans_deinit (&trans);
 
diff --git a/stun/usages/bind.h b/stun/usages/bind.h
index b34287c..500f9fe 100644
--- a/stun/usages/bind.h
+++ b/stun/usages/bind.h
@@ -121,8 +121,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg,
  * Note that #STUN_USAGE_BIND_RETURN_TIMEOUT cannot be returned by this function
  */
 StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
-    struct sockaddr_storage *addr, socklen_t *addrlen,
-    struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len);
+    struct sockaddr *addr, socklen_t *addrlen,
+    struct sockaddr *alternate_server, socklen_t *alternate_server_len);
 
 /**
  * stun_usage_bind_keepalive:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git