diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2017-04-03 12:11:55 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2017-04-03 12:11:55 -0400 |
| commit | 68ff86f942ff84138074496a53d73f4dacac4444 (patch) | |
| tree | adccdd30b3e9d5ea37b302c070429edddb70747e /stun | |
| parent | f1e2443256f28fd84e721e028cff1a087903857c (diff) | |
| download | libnice-68ff86f942ff84138074496a53d73f4dacac4444.tar.gz | |
stun: Use unions fix alignment issues
This makes clang happy.
Diffstat (limited to 'stun')
| -rw-r--r-- | stun/usages/bind.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/stun/usages/bind.c b/stun/usages/bind.c index c5b09ab..8dd7afc 100644 --- a/stun/usages/bind.c +++ b/stun/usages/bind.c @@ -99,6 +99,12 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, { int code = -1; StunMessageReturn val; + union { + struct sockaddr *sa; + struct sockaddr_storage *sas; + } sa; + + sa.sa = addr; if (stun_message_get_method (msg) != STUN_BINDING) return STUN_USAGE_BIND_RETURN_INVALID; @@ -124,9 +130,15 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, /* ALTERNATE-SERVER mechanism */ if ((code / 100) == 3) { + union { + struct sockaddr *sa; + struct sockaddr_storage *sas; + } alternate_sa; + + alternate_sa.sa = alternate_server; if (alternate_server && alternate_server_len) { if (stun_message_find_addr (msg, STUN_ATTRIBUTE_ALTERNATE_SERVER, - (struct sockaddr_storage *) alternate_server, + alternate_sa.sas, alternate_server_len) != STUN_MESSAGE_RETURN_SUCCESS) { stun_debug (" Unexpectedly missing ALTERNATE-SERVER attribute"); return STUN_USAGE_BIND_RETURN_ERROR; @@ -152,13 +164,13 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, stun_debug ("Received %u-bytes STUN message", stun_message_length (msg)); val = stun_message_find_xor_addr (msg, - STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, (struct sockaddr_storage *)addr, + STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, sa.sas, addrlen); if (val != STUN_MESSAGE_RETURN_SUCCESS) { stun_debug (" No XOR-MAPPED-ADDRESS: %d", val); val = stun_message_find_addr (msg, - STUN_ATTRIBUTE_MAPPED_ADDRESS, (struct sockaddr_storage *)addr, + STUN_ATTRIBUTE_MAPPED_ADDRESS, sa.sas, addrlen); if (val != STUN_MESSAGE_RETURN_SUCCESS) { |