repositories
/
deb_shairplay.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPV6_V6ONLY set by default on win32
[deb_shairplay.git]
/
src
/
lib
/
netutils.c
diff --git
a/src/lib/netutils.c
b/src/lib/netutils.c
index 5399fb07f56520e7b3001176770666b60526ca36..3fc8838547aeb6857591eb95849f30737a5cd9c8 100644
(file)
--- a/
src/lib/netutils.c
+++ b/
src/lib/netutils.c
@@
-71,12
+71,19
@@
netutils_init_socket(unsigned short *port, int use_ipv6, int use_udp)
memset(&saddr, 0, sizeof(saddr));
if (use_ipv6) {
struct sockaddr_in6 *sin6ptr = (struct sockaddr_in6 *)&saddr;
memset(&saddr, 0, sizeof(saddr));
if (use_ipv6) {
struct sockaddr_in6 *sin6ptr = (struct sockaddr_in6 *)&saddr;
+ int v6only = 1;
/* Initialize sockaddr for bind */
sin6ptr->sin6_family = family;
sin6ptr->sin6_addr = in6addr_any;
sin6ptr->sin6_port = htons(*port);
/* Initialize sockaddr for bind */
sin6ptr->sin6_family = family;
sin6ptr->sin6_addr = in6addr_any;
sin6ptr->sin6_port = htons(*port);
+#ifndef WIN32
+ /* Make sure we only listen to IPv6 addresses */
+ setsockopt(server_fd, IPPROTO_IPV6, IPV6_V6ONLY,
+ (char *) &v6only, sizeof(v6only));
+#endif
+
socklen = sizeof(*sin6ptr);
ret = bind(server_fd, (struct sockaddr *)sin6ptr, socklen);
if (ret == -1) {
socklen = sizeof(*sin6ptr);
ret = bind(server_fd, (struct sockaddr *)sin6ptr, socklen);
if (ret == -1) {
@@
-178,7
+185,7
@@
netutils_parse_address(int family, const char *src, void *dst, int dstlen)
length = -1;
for (ptr=result; ptr!=NULL; ptr=ptr->ai_next) {
length = -1;
for (ptr=result; ptr!=NULL; ptr=ptr->ai_next) {
- if (family == ptr->ai_family && dstlen >= ptr->ai_addrlen) {
+ if (family == ptr->ai_family &&
(unsigned int)
dstlen >= ptr->ai_addrlen) {
memcpy(dst, ptr->ai_addr, ptr->ai_addrlen);
length = ptr->ai_addrlen;
break;
memcpy(dst, ptr->ai_addr, ptr->ai_addrlen);
length = ptr->ai_addrlen;
break;