diff options
| author | Babak Farrokhi <farrokhi@FreeBSD.org> | 2021-02-05 00:54:20 +0000 |
|---|---|---|
| committer | Babak Farrokhi <farrokhi@FreeBSD.org> | 2021-02-05 00:54:20 +0000 |
| commit | 1cbc4a6ff605f36cffb881244c86aeeeb00e4664 (patch) | |
| tree | 7c29c25395f94702b40f972675822afdb45a458a | |
| parent | Mark as broken due to pkg-fallout messages indicating a cmake abort (diff) | |
net/radvd: improve FreeBSD multicast patch for version 12 and up
PR: 252877
Submitted by: Franco Fichtner <franco@opnsense.org>
Notes
Notes:
svn path=/head/; revision=564071
| -rw-r--r-- | net/radvd/Makefile | 1 | ||||
| -rw-r--r-- | net/radvd/files/patch-device-bsd44.c | 16 | ||||
| -rw-r--r-- | net/radvd/files/patch-interface.c | 23 |
3 files changed, 31 insertions, 9 deletions
diff --git a/net/radvd/Makefile b/net/radvd/Makefile index a86ea22ed15b..40ff063d98a0 100644 --- a/net/radvd/Makefile +++ b/net/radvd/Makefile @@ -3,6 +3,7 @@ PORTNAME= radvd PORTVERSION= 2.19 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.litech.org/radvd/dist/ diff --git a/net/radvd/files/patch-device-bsd44.c b/net/radvd/files/patch-device-bsd44.c index 395bb3614b9d..721c6785978e 100644 --- a/net/radvd/files/patch-device-bsd44.c +++ b/net/radvd/files/patch-device-bsd44.c @@ -1,6 +1,6 @@ ---- device-bsd44.c.orig 2018-02-18 22:45:02 UTC +--- device-bsd44.c.orig 2019-07-20 03:58:19 UTC +++ device-bsd44.c -@@ -126,7 +126,31 @@ ret: +@@ -126,8 +126,29 @@ ret: return -1; } @@ -8,7 +8,7 @@ +int setup_allrouters_membership(int sock, struct Interface *iface) +{ + struct ipv6_mreq mreq; -+ + + memset(&mreq, 0, sizeof(mreq)); + mreq.ipv6mr_interface = iface->props.if_index; + @@ -19,21 +19,19 @@ + 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) { ++ &mreq, sizeof(mreq)) < 0 && !iface->state_info.ready) { + flog(LOG_ERR, "can't join ipv6-allrouters on %s", iface->props.name); + return (-1); + } + + return 0; +} - ++ int set_interface_linkmtu(const char *iface, uint32_t mtu) { -@@ -161,5 +185,5 @@ int check_ip6_forwarding(void) + dlog(LOG_DEBUG, 4, "setting LinkMTU (%u) for %s is not supported", mtu, iface); +@@ -161,5 +182,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"); diff --git a/net/radvd/files/patch-interface.c b/net/radvd/files/patch-interface.c new file mode 100644 index 000000000000..77bcbaba6a93 --- /dev/null +++ b/net/radvd/files/patch-interface.c @@ -0,0 +1,23 @@ +--- interface.c.orig 2020-12-29 09:42:21 UTC ++++ interface.c +@@ -61,6 +61,8 @@ void touch_iface(struct Interface *iface) + + int setup_iface(int sock, struct Interface *iface) + { ++ int was_ready = iface->state_info.ready; ++ + iface->state_info.changed = 0; + iface->state_info.ready = 0; + +@@ -97,8 +99,11 @@ int setup_iface(int sock, struct Interface *iface) + return -1; + } + ++ iface->state_info.ready = was_ready; ++ + /* join the allrouters multicast group so we get the solicitations */ + if (setup_allrouters_membership(sock, iface) < 0) { ++ iface->state_info.ready = 0; + return -1; + } + |