svn commit: r531270 - in head/net/radvd: . files
Babak Farrokhi
farrokhi at FreeBSD.org
Thu Apr 9 20:31:46 UTC 2020
Author: farrokhi
Date: Thu Apr 9 20:31:45 2020
New Revision: 531270
URL: https://svnweb.freebsd.org/changeset/ports/531270
Log:
net/radvd: fix group join fail on multiple tries
PR: 245393
Submitted by: Franco Fichtner <franco at opnsense.org>
Modified:
head/net/radvd/Makefile
head/net/radvd/files/patch-device-bsd44.c
Modified: head/net/radvd/Makefile
==============================================================================
--- head/net/radvd/Makefile Thu Apr 9 20:23:25 2020 (r531269)
+++ head/net/radvd/Makefile Thu Apr 9 20:31:45 2020 (r531270)
@@ -3,6 +3,7 @@
PORTNAME= radvd
PORTVERSION= 2.18
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.litech.org/radvd/dist/
Modified: head/net/radvd/files/patch-device-bsd44.c
==============================================================================
--- head/net/radvd/files/patch-device-bsd44.c Thu Apr 9 20:23:25 2020 (r531269)
+++ head/net/radvd/files/patch-device-bsd44.c Thu Apr 9 20:31:45 2020 (r531270)
@@ -1,6 +1,6 @@
---- device-bsd44.c.orig 2017-06-29 04:32:29 UTC
+--- device-bsd44.c.orig 2018-02-18 22:45:02 UTC
+++ device-bsd44.c
-@@ -126,7 +126,28 @@ ret:
+@@ -126,7 +126,31 @@ ret:
return -1;
}
@@ -18,7 +18,10 @@
+ flog(LOG_ERR, "inet_pton failed");
+ return (-1);
+ }
-+
++
++ /* if we leave unconditionally the join cannot fail */
++ setsockopt(sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq));
++
+ if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+ &mreq, sizeof(mreq)) < 0) {
+ flog(LOG_ERR, "can't join ipv6-allrouters on %s", iface->props.name);
@@ -30,3 +33,10 @@
int set_interface_linkmtu(const char *iface, uint32_t mtu)
{
+@@ -161,5 +185,5 @@ int check_ip6_forwarding(void)
+ int check_ip6_iface_forwarding(const char *iface)
+ {
+ dlog(LOG_DEBUG, 4, "checking ipv6 forwarding of interface not supported");
+- return -1;
++ return 1;
+ }
More information about the svn-ports-head
mailing list