yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

test SIN6_LEN not __FreeBSD__ for sin6_len

Browse source
This commit is contained in:
Jonathan Gray 2012-08-12 13:40:43 +10:00
parent f292c1e22d
commit 22fa99b713
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backends/unix/network.c
View file

@ -98,7 +98,7 @@ NetadrToSockadr(netadr_t *a, struct sockaddr_storage *s)
s6->sin6_family = AF_INET6; s6->sin6_family = AF_INET6;
s6->sin6_port = a->port; s6->sin6_port = a->port;
#ifdef __FreeBSD__ #ifdef SIN6_LEN
s6->sin6_len = sizeof(struct sockaddr_in6); s6->sin6_len = sizeof(struct sockaddr_in6);
#endif #endif
@ -112,7 +112,7 @@ NetadrToSockadr(netadr_t *a, struct sockaddr_storage *s)
if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)a->ip)) if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)a->ip))
{ {
#ifdef __FreeBSD__ #ifdef SIN6_LEN
s->ss_len = sizeof(struct sockaddr_in); s->ss_len = sizeof(struct sockaddr_in);
#endif #endif
s->ss_family = AF_INET; s->ss_family = AF_INET;
@ -128,7 +128,7 @@ NetadrToSockadr(netadr_t *a, struct sockaddr_storage *s)
s6->sin6_family = AF_INET6; s6->sin6_family = AF_INET6;
memcpy(&s6->sin6_addr, a->ip, sizeof(s6->sin6_addr)); memcpy(&s6->sin6_addr, a->ip, sizeof(s6->sin6_addr));
s6->sin6_port = a->port; s6->sin6_port = a->port;
#ifdef __FreeBSD__ #ifdef SIN6_LEN
s6->sin6_len = sizeof(struct sockaddr_in6); s6->sin6_len = sizeof(struct sockaddr_in6);
#endif #endif
@ -296,7 +296,7 @@ NET_BaseAdrToString(netadr_t a)
if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)a.ip)) if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)a.ip))
{ {
#ifdef __FreeBSD__ #ifdef SIN6_LEN
ss.ss_len = sizeof(struct sockaddr_in); ss.ss_len = sizeof(struct sockaddr_in);
#endif #endif
ss.ss_family = AF_INET; ss.ss_family = AF_INET;
@ -306,7 +306,7 @@ NET_BaseAdrToString(netadr_t a)
} }
else else
{ {
#ifdef __FreeBSD__ #ifdef SIN6_LEN
s6->sin6_len = sizeof(struct sockaddr_in6); s6->sin6_len = sizeof(struct sockaddr_in6);
#endif #endif
s6->sin6_scope_id = a.scope_id; s6->sin6_scope_id = a.scope_id;
@ -314,7 +314,7 @@ NET_BaseAdrToString(netadr_t a)
memcpy(&s6->sin6_addr, a.ip, sizeof(struct in6_addr)); memcpy(&s6->sin6_addr, a.ip, sizeof(struct in6_addr));
} }
#ifdef __FreeBSD__ #ifdef SIN6_LEN
socklen_t const salen = ss.ss_len; socklen_t const salen = ss.ss_len;
#else #else
socklen_t const salen = sizeof(ss); socklen_t const salen = sizeof(ss);
@ -670,7 +670,7 @@ NET_SendPacket(netsrc_t sock, int length, void *data, netadr_t to)
multicast address. getaddrinfo is multicast address. getaddrinfo is
passed a multicast address of the passed a multicast address of the
form ff0x::xxx%multicast_interface */ form ff0x::xxx%multicast_interface */
#ifdef __FreeBSD__ #ifdef SIN6_LEN
error = getnameinfo((struct sockaddr *)s6, s6->sin6_len, tmp, error = getnameinfo((struct sockaddr *)s6, s6->sin6_len, tmp,
sizeof(tmp), NULL, 0, NI_NUMERICHOST); sizeof(tmp), NULL, 0, NI_NUMERICHOST);
#else #else