mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

net/radvd: improve FreeBSD multicast patch for version 12 and up

Browse Source 
PR:		252877
Submitted by:	Franco Fichtner <franco@opnsense.org>
This commit is contained in:
Babak Farrokhi 2021-02-05 00:54:20 +00:00
parent 109e30df04
commit 1cbc4a6ff6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=564071
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/radvd/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= radvd
PORTVERSION= 2.19
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.litech.org/radvd/dist/

16
net/radvd/files/patch-device-bsd44.c
View File

@ -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");

23
net/radvd/files/patch-interface.c Normal file
View File

@ -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;
}