Commit 474d858f authored by Michael Niedermayer's avatar Michael Niedermayer

Revert "avformat/rtpproto: fix strict aliasing violations with sockaddr"

It appears this breaks build with MSVC
until someone who has MSVC setup has time to investigate and
workaround/fix this, its better to revert so that build is not broken
Thats even more so as the original commit only fixed a hypothetical issue

This reverts commit e587a428.
parent 4b58349b
...@@ -130,26 +130,23 @@ static int compare_addr(const struct sockaddr_storage *a, ...@@ -130,26 +130,23 @@ static int compare_addr(const struct sockaddr_storage *a,
static int get_port(const struct sockaddr_storage *ss) static int get_port(const struct sockaddr_storage *ss)
{ {
sockaddr_union ssu = (sockaddr_union){.storage = *ss};
if (ss->ss_family == AF_INET) if (ss->ss_family == AF_INET)
return ntohs(ssu.in.sin_port); return ntohs(((const struct sockaddr_in *)ss)->sin_port);
#if HAVE_STRUCT_SOCKADDR_IN6 #if HAVE_STRUCT_SOCKADDR_IN6
if (ss->ss_family == AF_INET6) if (ss->ss_family == AF_INET6)
return ntohs(ssu.in6.sin6_port); return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port);
#endif #endif
return 0; return 0;
} }
static void set_port(struct sockaddr_storage *ss, int port) static void set_port(struct sockaddr_storage *ss, int port)
{ {
sockaddr_union ssu = (sockaddr_union){.storage = *ss};
if (ss->ss_family == AF_INET) if (ss->ss_family == AF_INET)
ssu.in.sin_port = htons(port); ((struct sockaddr_in *)ss)->sin_port = htons(port);
#if HAVE_STRUCT_SOCKADDR_IN6 #if HAVE_STRUCT_SOCKADDR_IN6
else if (ss->ss_family == AF_INET6) else if (ss->ss_family == AF_INET6)
ssu.in6.sin6_port = htons(port); ((struct sockaddr_in6 *)ss)->sin6_port = htons(port);
#endif #endif
*ss = ssu.storage;
} }
static int rtp_check_source_lists(RTPContext *s, struct sockaddr_storage *source_addr_ptr) static int rtp_check_source_lists(RTPContext *s, struct sockaddr_storage *source_addr_ptr)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment