net/frr: Update to 8.2.2

Features 8.2.2 Release
    BGP Long-lived graceful restart capability
    (http://docs.frrouting.org/en/stable-8.2/bgp.html#long-lived-graceful-restart)
    BGP Extended Optional Parameters Length for BGP OPEN Message
    (http://docs.frrouting.org/en/stable-8.2/bgp.html#clicmd-neighbor-PEER-extended-optional-parameters)
    BGP Extended BGP Administrative Shutdown Communication
    IS-IS Link State Traffic Engineering support
    (http://docs.frrouting.org/en/stable-8.2/isisd.html#traffic-engineering)
    OSPFv3 Support for NSSA Type-7 address ranges
    (http://docs.frrouting.org/en/stable-8.2/ospf6d.html#ospf6-area)
    PBR VLAN actions support
    (http://docs.frrouting.org/en/stable-8.2/pbr.html#pbr-maps)

Features 8.1 Release
    Lua hooks are now feature complete, with one hook available for use
    (http://docs.frrouting.org/en/latest/scripting.html)
    Improvements to SRv6 (Segment Routing over IPv6)
    (http://docs.frrouting.org/en/latest/zebra.html#segment-routing-ipv6)
    Improvements to Prefix-SID (Type 5)
    EVPN route type-5 gateway IP overlay Index
    (http://docs.frrouting.org/en/latest/bgp.html#evpn-overlay-index-gateway-ip)
    OSPFv3 NSSA and NSSA totally stub areas
    (http://docs.frrouting.org/en/latest/ospf6d.html#ospf6-area)
    OSPFv3 ASBR summarization
    (http://docs.frrouting.org/en/latest/ospf6d.html#asbr-summarisation-support-in-ospfv3)
    OSPFv3 Graceful Restart
    (http://docs.frrouting.org/en/latest/ospf6d.html#graceful-restart)
    OSPFv2 Graceful Restart (restarting mode added, helper was already implemented)
    (http://docs.frrouting.org/en/latest/ospfd.html#graceful-restart)

Further release information: https://github.com/FRRouting/frr/releases/


(kardel)

$NetBSD: patch-lib_frr__pthread.c,v 1.1 2022/05/16 11:54:20 kardel Exp $

	avoid tripping over NULL pointer

--- lib/frr_pthread.c.orig	2022-03-13 15:59:48.000000000 +0000
+++ lib/frr_pthread.c
@@ -141,7 +141,7 @@ int frr_pthread_set_name(struct frr_pthr
 # ifdef GNU_LINUX
 	ret = pthread_setname_np(fpt->thread, fpt->os_name);
 # elif defined(__NetBSD__)
-	ret = pthread_setname_np(fpt->thread, fpt->os_name, NULL);
+	ret = pthread_setname_np(fpt->thread, fpt->os_name ? fpt->os_name : "-n/a-", NULL);
 # endif
 #elif defined(HAVE_PTHREAD_SET_NAME_NP)
 	pthread_set_name_np(fpt->thread, fpt->os_name);

$NetBSD: patch-pimd_pim__mroute.c,v 1.1 2022/05/16 11:54:20 kardel Exp $

	Support HAVE_IP_RECVDSTADDR and HAVE_IP_RECVIF

--- pimd/pim_mroute.c.orig	2021-03-04 02:14:50.000000000 +0000
+++ pimd/pim_mroute.c
@@ -106,6 +106,26 @@ static int pim_mroute_set(struct pim_ins
 		}
 	}
 #endif
+#if defined(HAVE_IP_RECVDSTADDR)
+		/* BSD IP_RECVDSTADDR */
+		data = 1;
+		if (setsockopt(pim->mroute_socket, IPPROTO_IP, IP_RECVDSTADDR, &data,
+			       data_len)) {
+			zlog_warn(
+				"Could not set IP_RECVDSTADDR on socket fd=%d: errno=%d: %s",
+				pim->mroute_socket, errno, safe_strerror(errno));
+		}
+#endif
+#if defined(HAVE_IP_RECVIF)
+		/* BSD IP_RECVIF */
+		data = 1;
+		if (setsockopt(pim->mroute_socket, IPPROTO_IP, IP_RECVIF, &data,
+			       data_len)) {
+			zlog_warn(
+				"Could not set IP_RECVIF on socket fd=%d: errno=%d: %s",
+				pim->mroute_socket, errno, safe_strerror(errno));
+		}
+#endif
 
 	setsockopt_so_recvbuf(pim->mroute_socket, 1024 * 1024 * 8);
 

$NetBSD: patch-pimd_pim__sock.c,v 1.1 2022/05/16 11:54:20 kardel Exp $

	Support HAVE_STRUCT_IP_MREQN_IMR_IFINDEX and HAVE_IP_RECVIF

--- pimd/pim_sock.c.orig	2022-03-13 15:59:48.000000000 +0000
+++ pimd/pim_sock.c
@@ -27,7 +27,9 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <errno.h>
-
+#ifdef __NetBSD__
+#include <net/if.h>
+#endif
 #include "log.h"
 #include "privs.h"
 #include "if.h"
@@ -97,11 +99,6 @@ int pim_socket_mcast(int protocol, struc
 		     uint8_t loop)
 {
 	int rcvbuf = 1024 * 1024 * 8;
-#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
-	struct ip_mreqn mreq;
-#else
-	struct ip_mreq mreq;
-#endif
 	int fd;
 
 	fd = pim_socket_raw(protocol);
@@ -146,6 +143,15 @@ int pim_socket_mcast(int protocol, struc
 				"Could not set IP_RECVDSTADDR on socket fd=%d: errno=%d: %s",
 				fd, errno, safe_strerror(errno));
 		}
+#elif defined(HAVE_IP_RECVIF)
+		/* BSD IP_RECVIF */
+		int opt = 1;
+		if (setsockopt(fd, IPPROTO_IP, IP_RECVIF, &opt,
+			       sizeof(opt))) {
+			zlog_warn(
+				"Could not set IP_RECVDSTADDR on socket fd=%d: errno=%d: %s",
+				fd, errno, safe_strerror(errno));
+		}
 #else
 		flog_err(
 			EC_LIB_DEVELOPMENT,
@@ -208,23 +214,26 @@ int pim_socket_mcast(int protocol, struc
 		return PIM_SOCK_ERR_LOOP;
 	}
 
-	memset(&mreq, 0, sizeof(mreq));
+	{
 #ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
-	mreq.imr_ifindex = ifp->ifindex;
+		struct ip_mreqn mreq;
+
+		memset(&mreq, 0, sizeof(mreq));
+		mreq.imr_ifindex = ifp->ifindex;
+		if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (void *)&mreq,
+		       	sizeof(mreq)))
 #else
-/*
- * I am not sure what to do here yet for *BSD
- */
-// mreq.imr_interface = ifindex;
+		uint32_t idx = htonl(ifp->ifindex);
+		if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, &idx, sizeof(idx)))
 #endif
 
-	if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (void *)&mreq,
-		       sizeof(mreq))) {
-		zlog_warn(
-			"Could not set Outgoing Interface Option on socket fd=%d: errno=%d: %s",
-			fd, errno, safe_strerror(errno));
-		close(fd);
-		return PIM_SOCK_ERR_IFACE;
+		{
+			zlog_warn(
+				"Could not set Outgoing Interface Option on socket fd=%d: errno=%d: %s",
+				fd, errno, safe_strerror(errno));
+			close(fd);
+			return PIM_SOCK_ERR_IFACE;
+		}
 	}
 
 	if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf)))
@@ -379,7 +388,7 @@ int pim_socket_recvfromto(int fd, uint8_
 			if (ifindex)
 				*ifindex = i->ipi_ifindex;
 
-			break;
+			continue;
 		}
 #endif
 
@@ -392,14 +401,20 @@ int pim_socket_recvfromto(int fd, uint8_
 			if (tolen)
 				*tolen = sizeof(struct sockaddr_in);
 
-			break;
+			continue;
 		}
 #endif
 
-#if defined(HAVE_IP_RECVIF) && defined(CMSG_IFINDEX)
-		if (cmsg->cmsg_type == IP_RECVIF)
-			if (ifindex)
-				*ifindex = CMSG_IFINDEX(cmsg);
+#if defined(HAVE_IP_RECVIF)
+		if (cmsg->cmsg_type == IP_RECVIF && ifindex) {
+#ifdef __NetBSD__
+			struct sockaddr_dl *dl = (struct sockaddr_dl *)CMSG_DATA(cmsg);
+			*ifindex = dl->sdl_index;
+#elif defined(CMSG_IFINDEX)
+			*ifindex = CMSG_IFINDEX(cmsg);
+#endif
+			continue;
+		}
 #endif
 
 	} /* for (cmsg) */