Rather than listening on two sockets, one for IPv4 and one for IPv6 the

csync server listens on one IPv6 socket and uses IPv4 mapped IPv6 addresses
to support IPv4.  This IPv6 feature is disabled by default on FreeBSD so
add a patch to enable it on the server socket.

PR:		208928
Tested by:	ari@ish.com.au
Approved by:	alexey@renatasystems.org (maintainer)
This commit is contained in:
Tijl Coosemans 2016-04-27 20:05:11 +00:00
parent a658ac7f1f
commit 36df7703e4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=414130
2 changed files with 22 additions and 1 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= csync2
PORTVERSION= 2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://oss.linbit.com/csync2/

View file

@ -0,0 +1,21 @@
--- csync2.c.orig 2013-05-02 12:58:04 UTC
+++ csync2.c
@@ -256,7 +256,7 @@ static int csync_server_bind(void)
struct addrinfo hints;
struct addrinfo *result, *rp;
int save_errno;
- int sfd = -1, s, on = 1;
+ int sfd = -1, s, off = 0, on = 1;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */
hints.ai_socktype = SOCK_STREAM;
@@ -284,6 +284,9 @@ static int csync_server_bind(void)
goto error;
if (setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &on, (socklen_t) sizeof(on)) < 0)
goto error;
+ if (rp->ai_family == AF_INET6)
+ if (setsockopt(sfd, IPPROTO_IPV6, IPV6_V6ONLY, &off, (socklen_t) sizeof(off)) < 0)
+ goto error;
if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == 0)
break; /* Success */