From nobody Thu Jul 07 12:13:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E430B10F8A91; Thu, 7 Jul 2022 12:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LdwKS6MfFz3b6p; Thu, 7 Jul 2022 12:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657195980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NN0PUybq1eR7OiMdQSJPqZf03dpp2eQI2qbMJkuWQyU=; b=jrjiK/tj4cbu/KVWr/Ez9tYlETAxqgfOpjs4Q2QiL/oWgc5RD3UNkMqwfef9YvHt1slD8m a843AqpJmouDMq6OcOAKWnIm3qcVR70qASpDtuhkgvzGTHlKtnLSXn1AOz3ucH7h1JtVzO 54oZ8YEVRc8Q9nr4xlSPZPWb9kGGBgY+myzr0aI9Qu059PvRQ83VL3lzNLyXReD0Pyw3N6 8JK6jdilNjpeREzB23aAPPLOxbGMxRPogeW+ZOGHy47hvjiw0qI0+x+YiWM2h99fCrVeOt y2Sz+pQmF9d7KAiwoa2sOBJAKBp6idpoI+1Y9hahK1CfSw8odAYiQyz15ZnaMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LdwKS5TNxzhXX; Thu, 7 Jul 2022 12:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 267CD09w045764; Thu, 7 Jul 2022 12:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267CD0kA045763; Thu, 7 Jul 2022 12:13:00 GMT (envelope-from git) Date: Thu, 7 Jul 2022 12:13:00 GMT Message-Id: <202207071213.267CD0kA045763@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 04630d170791 - main - net/frr8: New major version 8.2.2 of FRRouting List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04630d170791e12f2b698167a1002d1dad028849 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657195980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NN0PUybq1eR7OiMdQSJPqZf03dpp2eQI2qbMJkuWQyU=; b=A30okEs5SD+rF1yGUAlPMweeU9dD3Eogfu2pDr1PmeCLB/No+juLZADVbVk7u5S5pALPWX K5TPLBxDHZ2J8FMpvHlgLTmxwQj64cCfuVKsBo7I3ZfZfKRVjAZknlP6RQRbsjxezZHyPd ldeFlG6oQSeGzyZNM3MLSX4glF99m5zm9RfpZSGcC6Eo5FNZlHDfGnHeH4eeCqcZwLoPld kK/3r7ez5RPZi28tqbzJowoPk9hlMgo5A31P8Roaep7HNjA9PtAhdVTYo1USajfa3JH10j YPoe7hgZ9FBsz13FjY5VKON+P4lVwQuHbDUPtHvRcPlEBtsSsLn/Qed3Eza+6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657195980; a=rsa-sha256; cv=none; b=g4DExEjONmG+vctObkrzQ/zXlEULuhO+ptZBzyXsNxKZoe7jxpSTSlL1DZ1Y433NuwUW57 GFA2gIb5eDGBE/6OIC/DYP+RC15Wi12LSGpeq7+9LH6Qt/zQhzMJAtlaDaKnBND4hcPzOg z/wXebWpbDE+T0UceNnAJyIRLT3mpxO2pzFjDJxC0Fl317/IDaWP+rh8Wo5rZFYQwG0MjF ENQb+fFmpUyPh6dL5S9WhzlpyCfhgTpw2kkS5RDhkBrl7qqdQHOHD1WbgAKcbFE68yNJu1 khDV4sLfsrtWVG+1/DQbcZQfkbYO89DIM3s6m3FYMCSHYPjVaO5XMzTVTRwk0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=04630d170791e12f2b698167a1002d1dad028849 commit 04630d170791e12f2b698167a1002d1dad028849 Author: Olivier Cochard AuthorDate: 2022-07-07 11:42:17 +0000 Commit: Olivier Cochard CommitDate: 2022-07-07 12:12:50 +0000 net/frr8: New major version 8.2.2 of FRRouting PR: 260950 Obtained from: Bug fixes by hrs, improved by bijanebrahimi@riseup.net --- net/Makefile | 1 + net/frr8/Makefile | 146 ++++++++++++++++++++++++ net/frr8/distinfo | 3 + net/frr8/files/frr.in | 168 +++++++++++++++++++++++++++ net/frr8/files/patch-Makefile.am | 11 ++ net/frr8/files/patch-backport.patch | 175 ++++++++++++++++++++++++++++ net/frr8/files/watchfrr.in | 30 +++++ net/frr8/pkg-descr | 5 + net/frr8/pkg-message | 17 +++ net/frr8/pkg-plist | 220 ++++++++++++++++++++++++++++++++++++ 10 files changed, 776 insertions(+) diff --git a/net/Makefile b/net/Makefile index 73fec1368cb6..0b9b2633d090 100644 --- a/net/Makefile +++ b/net/Makefile @@ -167,6 +167,7 @@ SUBDIR += frp SUBDIR += frr7 SUBDIR += frr7-pythontools + SUBDIR += frr8 SUBDIR += fspclient SUBDIR += fspd SUBDIR += fsplib diff --git a/net/frr8/Makefile b/net/frr8/Makefile new file mode 100644 index 000000000000..997a9863fec9 --- /dev/null +++ b/net/frr8/Makefile @@ -0,0 +1,146 @@ +PORTNAME= frr +PORTVERSION= 8.2.2 +DISTVERSIONPREFIX= frr- +CATEGORIES= net +.if defined(PYTHONTOOLS) +PKGNAMESUFFIX= 8-pythontools +.else +PKGNAMESUFFIX= 8 +.endif + +MAINTAINER= olivier@FreeBSD.org + +COMMENT?= IP routing protocol suite including BGP, IS-IS, OSPF and RIP + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +.if defined(PYTHONTOOLS) +RUN_DEPENDS= frr-reload:net/frr8 + +USES= python:run,3.6+ shebangfix + +post-patch: + @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ + -e 's|/usr/bin|${PREFIX}/bin|g' \ + -e 's|/usr/local/bin/tail|${TAIL}|g' \ + ${WRKSRC}/tools/frr-reload.py + @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ + ${WRKSRC}/tools/generate_support_bundle.py + +do-install: + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}/${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/generate_support_bundle.py ${STAGEDIR}/${PREFIX}/sbin/ + ${INSTALL_DATA} ${WRKSRC}/tools/etc/frr/support_bundle_commands.conf ${STAGEDIR}${ETCDIR}/ +.else + +BUILD_DEPENDS= gawk:lang/gawk +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libyang.so.2:net/libyang2 \ + libcares.so:dns/c-ares \ + libpcre2-8.so:devel/pcre2 + +USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ + makeinfo python:build,3.6+ readline shebangfix + +BINARY_ALIAS= python=${PYTHON_VERSION} + +CONFLICTS= openbgpd openospfd zebra quagga + +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USE_LDCONFIG= yes +.endif + +USE_GITHUB= yes +GH_ACCOUNT= FRRouting + +.if defined(PYTHONTOOLS) +NO_BUILD= yes +NO_ARCH= yes + +SHEBANG_FILES= tools/frr-reload.py \ + tools/generate_support_bundle.py +PLIST= ${.CURDIR}/pkg-plist +PKGMESSAGE= "" +.else +INFO= frr + +OPTIONS_DEFINE= CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \ + VTYSH MANPAGES MULTIPATH TCMALLOC RPKI SHARPD SNMP +OPTIONS_DEFAULT= VTYSH RPKI FPM MANPAGES +OPTIONS_SUB= yes + +CONFIGROLLBACKS_DESC= Enable configuration rollback support +FPM_DESC= Enable Forwarding Plane Manager support +DATACENTER_DESC= Use reduced BGP timers +LDPD_DESC= Build ldpd +MULTIPATH_DESC= Enable multipath function +PAM_DESC= Use libpam for PAM support in vtysh +RPKI_DESC= Add BGP RPKI (RFC 6810) support +SHELLACCESS_DESC= Allow users to access shell/telnet/ssh +SNMP_DESC= SNMP support +SHARPD_DESC= Build sharpd +TCMALLOC_DESC= Use tcmalloc +VTYSH_DESC= Build integrated vty shell + +USERS= frr +GROUPS= frr frrvty + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +# PIM compile but didn't work on FreeBSD +CONFIGURE_ARGS= --enable-user=frr \ + --enable-group=frr \ + --enable-vty-group=frrvty \ + --disable-doc-html \ + --sysconfdir=${ETCDIR} \ + --localstatedir=/var/run/frr \ + --disable-backtrace \ + --disable-nhrpd \ + --disable-pathd \ + --disable-ospfclient \ + --disable-pimd \ + --disable-vrrpd \ + --with-vtysh-pager=cat + +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_CONFIGURE_OFF= --disable-doc +CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks +DATACENTER_CONFIGURE_ENABLE= datacenter +SHELLACCESS_CONFIGURE_ENABLE= shell-access +FPM_CONFIGURE_ENABLE= fpm +PAM_CONFIGURE_WITH= libpam +LDPD_CONFIGURE_ENABLE= ldpd +MULTIPATH_CONFIGURE_ON= --enable-multipath=64 +RPKI_CONFIGURE_ENABLE= rpki +RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \ + libssh.so:security/libssh +TCMALLOC_CONFIGURE_ENABLE= tcmalloc +TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools +SNMP_CONFIGURE_ENABLE= snmp +SNMP_CFLAGS= "-std=gnu99" +SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +SNMP_USES= ssl +SHARPD_CONFIGURE_ENABLE= sharpd +VTYSH_CONFIGURE_ENABLE= vtysh + +USE_RC_SUBR= frr watchfrr + +SHEBANG_FILES= yang/embedmodel.py + +post-patch: + @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ + -e 's|/usr/lib/|${PREFIX}/lib/|g' \ + -e 's|frr-pythontools|frr8-pythontools|g' \ + ${WRKSRC}/tools/frr-reload + +post-install: + ${MKDIR} ${STAGEDIR}/var/run/frr + ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload ${STAGEDIR}${PREFIX}/sbin +.endif + +.include diff --git a/net/frr8/distinfo b/net/frr8/distinfo new file mode 100644 index 000000000000..a66f71561ac9 --- /dev/null +++ b/net/frr8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1648249835 +SHA256 (FRRouting-frr-frr-8.2.2_GH0.tar.gz) = 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f +SIZE (FRRouting-frr-frr-8.2.2_GH0.tar.gz) = 9439460 diff --git a/net/frr8/files/frr.in b/net/frr8/files/frr.in new file mode 100644 index 000000000000..222e56234729 --- /dev/null +++ b/net/frr8/files/frr.in @@ -0,0 +1,168 @@ +#!/bin/sh + +# PROVIDE: frr dynamicrouting +# REQUIRE: netif routing +# KEYWORD: nojailvnet shutdown + +# Add the following line to /etc/rc.conf to enable frr: +# frr_enable="YES" +# +# You may also wish to use the following variables to fine-tune startup: +# Enable Integrated configuration mode (using the single configuration file +# frr.conf in place of one file for each dameon) +# frr_vtysh_boot="YES" +# Selecting limited set of daemons to run +# frr_daemons="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd" +# Global tuning +# frr_flags="" +# Per daemon tuning may be done with daemon_name_flags +# zebra_flags="-P 0" +# bgpd_flags="-nrP 0" and so on +# If you want to give the routing daemons a chance to catchup before +# continuing, set frr_wait_for to a "default" or certain prefix. +# frr_wait_for="default" +# Set the time limit for the wait. +# frr_wait_seconds="90" +# +# If the frr daemons require additional shared libraries to start, +# use the following variable to run ldconfig(8) in advance: +# frr_extralibs_path="/usr/local/lib ..." +# +# This RC script was adapted from the net/quagga port + +. /etc/rc.subr + +name=frr +rcvar=${name}_enable + +start_postcmd=start_postcmd +stop_postcmd="rm -f $pidfile" +configtest_cmd=check_config +extra_commands=configtest +command_args="-d" + +load_rc_config $name +: ${frr_enable:="NO"} +: ${frr_flags:=""} +: ${frr_daemons:="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd"} +: ${frr_vtysh_boot:="NO"} +: ${frr_wait_for:=""} +: ${frr_wait_seconds:="90"} + +check_config() +{ + echo "Checking $daemon.conf" + # pimd doesn't support -C + if [ "$daemon" = "pimd" ]; then + echo "Ignored" + else + $command $daemon_flags -C + result=$? + if [ "$result" -eq "0" ]; then + echo "OK" + else + echo "FAILED" + exit + fi + fi +} + +start_postcmd() +{ + local waited_for + waited_for=0 + # Wait only when last daemon has started. + if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then + return; + fi + if [ -n "${frr_wait_for}" ]; then + echo Waiting for ${frr_wait_for} route... + while [ ${waited_for} -lt ${frr_wait_seconds} ]; do + /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; + waited_for=$((waited_for+1)) + sleep 1; + done + [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... + fi +} + +do_cmd() +{ + local ret + ret=0 + frr_cmd=$1 + if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then + echo "Checking intergrated config..." + daemon="vtysh" + daemon_flags="" + command=%%PREFIX%%/bin/${daemon} + if ! [ -f %%ETCDIR%%/vtysh.conf ]; then + touch %%ETCDIR%%/vtysh.conf + fi + check_config + fi + for daemon in ${frr_daemons}; do + command=%%PREFIX%%/sbin/${daemon} + pidfile=/var/run/frr/${daemon}.pid + if ! checkyesno frr_vtysh_boot; then + required_files=%%ETCDIR%%/${daemon}.conf + if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then + check_config + fi + if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then + continue + fi + fi + if [ ${frr_cmd} = "stop" ] && [ -z "$(check_process ${command})" ]; then + continue + fi + eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} + name=${daemon} + _rc_restart_done=false + run_rc_command "$1" || ret=1 + done + if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then + echo "Booting for integrated-vtysh-config..." + %%PREFIX%%/bin/vtysh -b + fi + return ${ret} +} + +frr_cmd=$1 + +case "$1" in + force*) + frr_cmd=${frr_cmd#force} + ;; + fast*) + frr_cmd=${frr_cmd#fast} + ;; +esac +shift + +if [ $# -ge 1 -a "$1" != "all" ]; then + frr_daemons="$*" +fi + +case "${frr_cmd}" in + start|quietstart) + if [ -n "${frr_extralibs_path}" ]; then + /sbin/ldconfig -m ${frr_extralibs_path} + fi + # Why should I need to add this check ? + checkyesno frr_enable && do_cmd "start" + ;; + stop) + frr_daemons=$(reverse_list ${frr_daemons}) + do_cmd "stop" + ;; + restart) + frr_daemons=$(reverse_list ${frr_daemons}) + do_cmd "stop" + frr_daemons=$(reverse_list ${frr_daemons}) + checkyesno frr_enable && do_cmd "start" + ;; + *) + do_cmd "${frr_cmd}" + ;; +esac diff --git a/net/frr8/files/patch-Makefile.am b/net/frr8/files/patch-Makefile.am new file mode 100644 index 000000000000..626f17a2d784 --- /dev/null +++ b/net/frr8/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2021-11-08 12:44:24.000000000 +0900 ++++ Makefile.am 2021-12-23 09:23:13.400659000 +0900 +@@ -168,7 +168,7 @@ + include qpb/subdir.am + include fpm/subdir.am + include grpc/subdir.am +-include tools/subdir.am ++# include tools/subdir.am + + include bgpd/subdir.am + include bgpd/rfp-example/librfp/subdir.am diff --git a/net/frr8/files/patch-backport.patch b/net/frr8/files/patch-backport.patch new file mode 100644 index 000000000000..434a37a08aa6 --- /dev/null +++ b/net/frr8/files/patch-backport.patch @@ -0,0 +1,175 @@ +From 5362aa8ce565554973b282e47084e8b3cacabadb Mon Sep 17 00:00:00 2001 +From: Bijan +Date: Tue, 1 Feb 2022 11:03:00 +0330 +Subject: [PATCH 1/2] zebra: Keep the interface flags safe on multiple ioctl + calls + +Trying to call multiple ioctl calls on ifreq will result in +overwriting ifreq with garbage data. On if_get_flags call, +try to keep the flags field safe from another possible ioctl +call before applying the flags field. + +Modified code as per Code Review, done by Donald Sharp. + +Signed-off-by: Bijan +(cherry picked from commit 16dca7cec5f47b7a6f83822a1e681652b7d2d60d) +--- + zebra/ioctl.c | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git zebra/ioctl.c zebra/ioctl.c +index 8b30eea9f11..9b6aaf1d85a 100644 +--- zebra/ioctl.c ++++ zebra/ioctl.c +@@ -410,11 +410,14 @@ int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) + void if_get_flags(struct interface *ifp) + { + int ret; +- struct ifreq ifreq; ++ struct ifreq ifreqflags; ++ struct ifreq ifreqdata; + +- ifreq_set_name(&ifreq, ifp); ++ ifreq_set_name(&ifreqflags, ifp); ++ ifreq_set_name(&ifreqdata, ifp); + +- ret = vrf_if_ioctl(SIOCGIFFLAGS, (caddr_t)&ifreq, ifp->vrf->vrf_id); ++ ret = vrf_if_ioctl(SIOCGIFFLAGS, (caddr_t)&ifreqflags, ++ ifp->vrf->vrf_id); + if (ret < 0) { + flog_err_sys(EC_LIB_SYSTEM_CALL, + "vrf_if_ioctl(SIOCGIFFLAGS %s) failed: %s", +@@ -448,8 +451,8 @@ void if_get_flags(struct interface *ifp) + struct if_data ifd = {.ifi_link_state = 0}; + struct if_data *ifdata = &ifd; + +- ifreq.ifr_data = (caddr_t)ifdata; +- ret = vrf_if_ioctl(SIOCGIFDATA, (caddr_t)&ifreq, ifp->vrf->vrf_id); ++ ifreqdata.ifr_data = (caddr_t)ifdata; ++ ret = vrf_if_ioctl(SIOCGIFDATA, (caddr_t)&ifreqdata, ifp->vrf->vrf_id); + #endif + + if (ret == -1) +@@ -459,12 +462,12 @@ void if_get_flags(struct interface *ifp) + safe_strerror(errno)); + else { + if (ifdata->ifi_link_state >= LINK_STATE_UP) +- SET_FLAG(ifreq.ifr_flags, IFF_RUNNING); ++ SET_FLAG(ifreqflags.ifr_flags, IFF_RUNNING); + else if (ifdata->ifi_link_state == LINK_STATE_UNKNOWN) + /* BSD traditionally treats UNKNOWN as UP */ +- SET_FLAG(ifreq.ifr_flags, IFF_RUNNING); ++ SET_FLAG(ifreqflags.ifr_flags, IFF_RUNNING); + else +- UNSET_FLAG(ifreq.ifr_flags, IFF_RUNNING); ++ UNSET_FLAG(ifreqflags.ifr_flags, IFF_RUNNING); + } + + #elif defined(HAVE_BSD_LINK_DETECT) +@@ -489,14 +492,14 @@ void if_get_flags(struct interface *ifp) + ifp->name, safe_strerror(errno)); + } else if (ifmr.ifm_status & IFM_AVALID) { /* media state is valid */ + if (ifmr.ifm_status & IFM_ACTIVE) /* media is active */ +- SET_FLAG(ifreq.ifr_flags, IFF_RUNNING); ++ SET_FLAG(ifreqflags.ifr_flags, IFF_RUNNING); + else +- UNSET_FLAG(ifreq.ifr_flags, IFF_RUNNING); ++ UNSET_FLAG(ifreqflags.ifr_flags, IFF_RUNNING); + } + #endif /* HAVE_BSD_LINK_DETECT */ + + out: +- if_flags_update(ifp, (ifreq.ifr_flags & 0x0000ffff)); ++ if_flags_update(ifp, (ifreqflags.ifr_flags & 0x0000ffff)); + } + + /* Set interface flags */ + +From f26e0528634a8ad8e401ba8d9f708335a9349be1 Mon Sep 17 00:00:00 2001 +From: Donald Sharp +Date: Thu, 24 Mar 2022 12:57:01 -0400 +Subject: [PATCH 2/2] zebra: Don't send uninited data to kernel on FreeBSD + +When running zebra w/ valgrind, it was noticed that there +was a bunch of passing uninitialized data to the kernel: + +==38194== Syscall param ioctl(generic) points to uninitialised byte(s) +==38194== at 0x4CDF88A: ioctl (in /lib/libc.so.7) +==38194== by 0x49A4031: vrf_ioctl (vrf.c:860) +==38194== by 0x2AFE29: vrf_if_ioctl (ioctl.c:91) +==38194== by 0x2AFF39: if_get_mtu (ioctl.c:161) +==38194== by 0x2B12C3: ifm_read (kernel_socket.c:653) +==38194== by 0x2A7F76: interface_list (if_sysctl.c:129) +==38194== by 0x2E9958: zebra_ns_enable (zebra_ns.c:127) +==38194== by 0x2E9958: zebra_ns_init (zebra_ns.c:214) +==38194== by 0x2B3F82: main (main.c:401) +==38194== Address 0x7fc000967 is on thread 1's stack +==38194== in frame #3, created by if_get_mtu (ioctl.c:155) +==38194== +==38194== Syscall param ioctl(generic) points to uninitialised byte(s) +==38194== at 0x4CDF88A: ioctl (in /lib/libc.so.7) +==38194== by 0x49A4031: vrf_ioctl (vrf.c:860) +==38194== by 0x2AFE29: vrf_if_ioctl (ioctl.c:91) +==38194== by 0x2AFED9: if_get_metric (ioctl.c:143) +==38194== by 0x2B12CB: ifm_read (kernel_socket.c:655) +==38194== by 0x2A7F76: interface_list (if_sysctl.c:129) +==38194== by 0x2E9958: zebra_ns_enable (zebra_ns.c:127) +==38194== by 0x2E9958: zebra_ns_init (zebra_ns.c:214) +==38194== by 0x2B3F82: main (main.c:401) +==38194== Address 0x7fc000967 is on thread 1's stack +==38194== in frame #3, created by if_get_metric (ioctl.c:137) +==38194== +==38194== Syscall param ioctl(generic) points to uninitialised byte(s) +==38194== at 0x4CDF88A: ioctl (in /lib/libc.so.7) +==38194== by 0x49A4031: vrf_ioctl (vrf.c:860) +==38194== by 0x2AFE29: vrf_if_ioctl (ioctl.c:91) +==38194== by 0x2B052D: if_get_flags (ioctl.c:419) +==38194== by 0x2B1CF1: ifam_read (kernel_socket.c:930) +==38194== by 0x2A7F57: interface_list (if_sysctl.c:132) +==38194== by 0x2E9958: zebra_ns_enable (zebra_ns.c:127) +==38194== by 0x2E9958: zebra_ns_init (zebra_ns.c:214) +==38194== by 0x2B3F82: main (main.c:401) +==38194== Address 0x7fc000707 is on thread 1's stack +==38194== in frame #3, created by if_get_flags (ioctl.c:411) + +Valgrind is no longer reporting these issues. + +Signed-off-by: Donald Sharp +(cherry picked from commit ceacdc721682cdc929835ff3adc1e0f824f83dcb) +--- + zebra/ioctl.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git zebra/ioctl.c zebra/ioctl.c +index 9b6aaf1d85a..a895ed94100 100644 +--- zebra/ioctl.c ++++ zebra/ioctl.c +@@ -136,7 +136,7 @@ static int if_ioctl_ipv6(unsigned long request, caddr_t buffer) + void if_get_metric(struct interface *ifp) + { + #ifdef SIOCGIFMETRIC +- struct ifreq ifreq; ++ struct ifreq ifreq = {}; + + ifreq_set_name(&ifreq, ifp); + +@@ -153,7 +153,7 @@ void if_get_metric(struct interface *ifp) + /* get interface MTU */ + void if_get_mtu(struct interface *ifp) + { +- struct ifreq ifreq; ++ struct ifreq ifreq = {}; + + ifreq_set_name(&ifreq, ifp); + +@@ -410,8 +410,8 @@ int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) + void if_get_flags(struct interface *ifp) + { + int ret; +- struct ifreq ifreqflags; +- struct ifreq ifreqdata; ++ struct ifreq ifreqflags = {}; ++ struct ifreq ifreqdata = {}; + + ifreq_set_name(&ifreqflags, ifp); + ifreq_set_name(&ifreqdata, ifp); diff --git a/net/frr8/files/watchfrr.in b/net/frr8/files/watchfrr.in new file mode 100644 index 000000000000..f3a36434e7f6 --- /dev/null +++ b/net/frr8/files/watchfrr.in @@ -0,0 +1,30 @@ +#!/bin/sh + +# PROVIDE: watchfrr +# REQUIRE: NETWORKING frr +# KEYWORD: nojailvtnet shutdown + +# Add the following line to /etc/rc.conf to enable watchfrr: +# watchfrr_enable="YES" +# +# You may also wish to use the following variables to fine-tune startup: +# watchfrr_flags +# Example of flags usage: +# watchfrr_flags=" -d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd" + +. /etc/rc.subr + +name=watchfrr +rcvar=${name}_enable + +load_rc_config $name + +stop_postcmd="rm -f $pidfile" + +watchfrr_enable=${watchfrr_enable:-"NO"} +watchfrr_flags=${watchfrr_flags:-"-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd"} + +command=%%PREFIX%%/sbin/watchfrr +pidfile=/var/run/frr/watchfrr.pid + +run_rc_command "$1" diff --git a/net/frr8/pkg-descr b/net/frr8/pkg-descr new file mode 100644 index 000000000000..6ac4ad877355 --- /dev/null +++ b/net/frr8/pkg-descr @@ -0,0 +1,5 @@ +FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms +which includes protocol daemons for BGP, IS-IS, OSPF and RIP. FRR has its roots +in the Quagga project. + +WWW: https://frrouting.org/ diff --git a/net/frr8/pkg-message b/net/frr8/pkg-message new file mode 100644 index 000000000000..3db74b88e26c --- /dev/null +++ b/net/frr8/pkg-message @@ -0,0 +1,17 @@ +[ +{ type: install + message: <