Attachment 213122 Details for Bug 245393 – OPNsense patch

[patch] OPNsense patch

radvd-leave.patch (text/plain), 1.72 KB, created by Franco Fichtner on 2020-04-06 09:20:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2020-04-06 09:20:59 UTC

Size: 1.72 KB

patch

obsolete

>From 0272beeae5b0d3cfbd0d5b13c979f72af9427981 Mon Sep 17 00:00:00 2001
>From: Franco Fichtner <franco@opnsense.org>
>Date: Wed, 1 Apr 2020 17:08:52 +0200
>Subject: [PATCH] net/radvd: address join dilemma #76
>
>---
> net/radvd/Makefile                   |  1 +
> net/radvd/files/patch-device-bsd44.c | 16 +++++++++++++---
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/net/radvd/Makefile b/net/radvd/Makefile
>index 2eb68de6bff..b5174cdcf00 100644
>--- a/net/radvd/Makefile
>+++ b/net/radvd/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	radvd
> PORTVERSION=	2.18
>+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 79c0c84c1cc..395bb3614b9 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	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;
>+ }

Actions: View | Diff

Attachments on bug 245393: 213122