stunmessage: Revert another function to use sockaddr

The farstream unit tests were using it.

5 files changed, 13 insertions, 10 deletions

diff --git a/stun/stunmessage.c b/stun/stunmessage.c
index b9c02b7..8e22e21 100644
--- a/stun/stunmessage.c
+++ b/stun/stunmessage.c
@@ -420,7 +420,7 @@ stun_message_append_string (StunMessage * msg, StunAttribute type,
 
 StunMessageReturn
 stun_message_append_addr (StunMessage *msg, StunAttribute type,
-    const struct sockaddr_storage *addr, socklen_t addrlen)
+    const struct sockaddr *addr, socklen_t addrlen)
 {
   const void *pa;
   uint8_t *ptr;
@@ -430,7 +430,7 @@ stun_message_append_addr (StunMessage *msg, StunAttribute type,
   if ((size_t) addrlen < sizeof (struct sockaddr))
     return STUN_MESSAGE_RETURN_INVALID;
 
-  switch (addr->ss_family)
+  switch (addr->sa_family)
   {
     case AF_INET:
       {
@@ -488,7 +488,8 @@ stun_message_append_xor_addr (StunMessage *msg, StunAttribute type,
   if (val)
     return val;
 
-  return stun_message_append_addr (msg, type, &tmpaddr, addrlen);
+  return stun_message_append_addr (msg, type, (struct sockaddr *) &tmpaddr,
+      addrlen);
 }
 
 StunMessageReturn
@@ -508,7 +509,8 @@ stun_message_append_xor_addr_full (StunMessage *msg, StunAttribute type,
   if (val)
     return val;
 
-  return stun_message_append_addr (msg, type, &tmpaddr, addrlen);
+  return stun_message_append_addr (msg, type, (struct sockaddr *) &tmpaddr,
+      addrlen);
 }
 
 
diff --git a/stun/stunmessage.h b/stun/stunmessage.h
index 4a53e67..0994420 100644
--- a/stun/stunmessage.h
+++ b/stun/stunmessage.h
@@ -795,7 +795,7 @@ StunMessageReturn stun_message_append_string (StunMessage *msg,
  * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown.
  */
 StunMessageReturn stun_message_append_addr (StunMessage * msg,
-    StunAttribute type, const struct sockaddr_storage *addr, socklen_t addrlen);
+    StunAttribute type, const struct sockaddr *addr, socklen_t addrlen);
 
 /**
  * stun_message_append_xor_addr:
diff --git a/stun/tests/test-format.c b/stun/tests/test-format.c
index 19cde87..735b073 100644
--- a/stun/tests/test-format.c
+++ b/stun/tests/test-format.c
@@ -146,7 +146,7 @@ check_af (const char *name, int family, socklen_t addrlen)
   stun_agent_init_request (&agent, &msg, buf, sizeof(buf), STUN_BINDING);
 
   if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS,
-          &addr, addrlen) !=
+          (struct sockaddr *) &addr, addrlen) !=
       STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS)
     fatal ("Unknown address family test failed");
   if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS,
@@ -156,7 +156,8 @@ check_af (const char *name, int family, socklen_t addrlen)
 
   addr.ss_family = family;
   if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS,
-          &addr, addrlen - 1) != STUN_MESSAGE_RETURN_INVALID)
+          (struct sockaddr *) &addr, addrlen - 1) !=
+      STUN_MESSAGE_RETURN_INVALID)
     fatal ("Too small %s sockaddr test failed", name);
 
   if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS,
@@ -164,7 +165,7 @@ check_af (const char *name, int family, socklen_t addrlen)
     fatal ("Too small %s sockaddr xor test failed", name);
 
   if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS,
-          &addr, addrlen) != STUN_MESSAGE_RETURN_SUCCESS)
+          (struct sockaddr *) &addr, addrlen) != STUN_MESSAGE_RETURN_SUCCESS)
     fatal ("%s sockaddr test failed", name);
 
   if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS,
diff --git a/stun/tools/stund.c b/stun/tools/stund.c
index 7af3a51..addc4fa 100644
--- a/stun/tools/stund.c
+++ b/stun/tools/stund.c
@@ -226,7 +226,7 @@ static int dgram_process (int sock, StunAgent *oldagent, StunAgent *newagent)
             STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, &addr.storage, addr_len);
       else
          stun_message_append_addr (&response, STUN_ATTRIBUTE_MAPPED_ADDRESS,
-             &addr.storage, addr_len);
+             &addr.addr, addr_len);
       break;
 
     case STUN_SHARED_SECRET:
diff --git a/stun/usages/ice.c b/stun/usages/ice.c
index 1db1bb4..1aa887d 100644
--- a/stun/usages/ice.c
+++ b/stun/usages/ice.c
@@ -305,7 +305,7 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
         src, srclen);
   } else {
     val = stun_message_append_addr (msg, STUN_ATTRIBUTE_MAPPED_ADDRESS,
-        src, srclen);
+        (struct sockaddr *) src, srclen);
   }
 
   if (val != STUN_MESSAGE_RETURN_SUCCESS) {