diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2014-05-02 17:53:40 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2014-05-02 17:53:42 -0400 |
commit | d66a31554b5021f27641472b6ca9f7d5225f6502 (patch) | |
tree | abdbf61d6294b98dfc81fafb57c26c6a5995c5f3 | |
parent | 8da016a76c9b05c56fe00d4cd1cd26813cf69951 (diff) | |
download | libnice-d66a31554b5021f27641472b6ca9f7d5225f6502.tar.gz |
stunmessage: Revert another function to use sockaddr
The farstream unit tests were using it.
-rw-r--r-- | socket/turn.c | 4 | ||||
-rw-r--r-- | stun/stunmessage.c | 10 | ||||
-rw-r--r-- | stun/stunmessage.h | 2 | ||||
-rw-r--r-- | stun/tests/test-format.c | 7 | ||||
-rw-r--r-- | stun/tools/stund.c | 2 | ||||
-rw-r--r-- | stun/usages/ice.c | 2 | ||||
-rw-r--r-- | tests/test-new-dribble.c | 2 |
7 files changed, 16 insertions, 13 deletions
diff --git a/socket/turn.c b/socket/turn.c index e852837..39c1aaf 100644 --- a/socket/turn.c +++ b/socket/turn.c @@ -662,7 +662,7 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to, goto send; } if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_DESTINATION_ADDRESS, - &sa.storage, sizeof(sa)) != + &sa.addr, sizeof(sa)) != STUN_MESSAGE_RETURN_SUCCESS) goto send; @@ -1831,7 +1831,7 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer) if (stun_message_append_addr (&msg->message, STUN_ATTRIBUTE_DESTINATION_ADDRESS, - &sa.storage, sizeof(sa)) + &sa.addr, sizeof(sa)) != STUN_MESSAGE_RETURN_SUCCESS) { g_free (msg); return FALSE; 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) { diff --git a/tests/test-new-dribble.c b/tests/test-new-dribble.c index d621f0f..b00e6ab 100644 --- a/tests/test-new-dribble.c +++ b/tests/test-new-dribble.c @@ -195,7 +195,7 @@ recv_packet: &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: |