treat '-f -' as a request to read commands from stdin in a way which …

.clang-format

@@ -25,6 +25,11 @@ CommentPragmas: '\$(FRR|clippy)'
 ContinuationIndentWidth: 8
 ForEachMacros:
   # lib
+  - frr_each
+  - frr_each_safe
+  - frr_each_from
+  - frr_with_mutex
+  - frr_with_privs
   - LIST_FOREACH
   - LIST_FOREACH_SAFE
   - SLIST_FOREACH
@@ -61,5 +66,6 @@ ForEachMacros:
   - SUBGRP_FOREACH_ADJ_SAFE
   - AF_FOREACH
   - FOREACH_AFI_SAFI
+  - FOREACH_SAFI
   # ospfd
   - LSDB_LOOP

.dir-locals.el

@@ -2,7 +2,7 @@
 ;;; For more information see (info "(emacs) Directory Variables")
 ;;; Match project coding conventions
 
-((c-mode
-  (indent-tabs-mode . t)
-  (show-trailing-whitespace . t)
-  (c-basic-offset . 8)))
+((c-mode . ((indent-tabs-mode . t)
+            (show-trailing-whitespace . t)
+            (c-basic-offset . 8)
+            )))

.dockerignore

@@ -6,3 +6,4 @@
 **/*.so
 **/.libs
 docker/alpine/pkgs
+docker/centos/pkgs

.git-blame-ignore-revs

@@ -0,0 +1 @@
+d62a17aedeb0eebdba98238874bb13d62c48dbf9

.github/ISSUE_TEMPLATE/bug_report.md

@@ -37,7 +37,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Versions**
  - OS Kernel: [e.g. Linux, OpenBSD, etc] [version]
- - FRR Version [version]
+ - FRR Version: [version]
 
 **Additional context**
 Add any other context about the problem here.

.gitignore

@@ -33,6 +33,10 @@
 /Makefile
 /Makefile.in
 
+/symalyzer_report.html
+/jquery-3.4.1.min.js
+/jquery-3.4.1.min.js.tmp
+
 ### autoconf/automake subdir stuff
 
 .deps
@@ -49,7 +53,18 @@
 *.pb.h
 *.pb-c.h
 *.pb-c.c
+*.pb.cc
 *_clippy.c
+*.bc
+*.cg.json
+*.cg.dot
+*.cg.svg
+
+### gcov outputs
+
+*.gcno
+*.gcov
+*.gcda
 
 ### dist
 
@@ -87,5 +102,9 @@ GSYMS
 GRTAGS
 GPATH
 compile_commands.json
+.ccls-cache
 .dirstamp
 refix
+.vscode
+.kitchen
+.emacs.desktop*

Makefile.am

@@ -12,7 +12,9 @@ AM_CFLAGS = \
 	# end
 AM_CPPFLAGS = \
 	-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
-	-I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
+	-I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib \
+	$(LUA_INCLUDE) \
+	# end
 AM_LDFLAGS = \
 	-export-dynamic \
 	$(AC_LDFLAGS) \
@@ -38,6 +40,12 @@ shvar-%:
 var-%:
 	@echo "$($*)" >&$(VARFD)
 
+if ONLY_CLIPPY
+.DEFAULT_GOAL := clippy-only
+endif
+clippy-only: Makefile lib/clippy config.h
+.PHONY: clippy-only
+
 # overwriting these vars breaks cross-compilation.  let's be helpful and warn.
 #
 # note: "#AUTODERP# " will be removed from Makefile by configure.  These are
@@ -81,9 +89,11 @@ var-%:
 #AUTODERP# endif
 
 EXTRA_DIST =
+EXTRA_PROGRAMS =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
+SUFFIXES =
 
 examplesdir = $(exampledir)
 
@@ -96,13 +106,13 @@ noinst_LIBRARIES =
 nodist_noinst_DATA =
 lib_LTLIBRARIES =
 module_LTLIBRARIES =
-libyang_plugins_LTLIBRARIES =
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
 dist_examples_DATA =
 dist_yangmodels_DATA =
 man_MANS =
 vtysh_scan =
+clippy_scan =
 
 ## libtool, the self-made GNU scourge
 ## ... this should fix relinking
@@ -111,18 +121,19 @@ vtysh_scan =
 $(AUTOMAKE_DUMMY)install-moduleLTLIBRARIES: install-libLTLIBRARIES
 $(AUTOMAKE_DUMMY)install-binPROGRAMS: install-libLTLIBRARIES
 $(AUTOMAKE_DUMMY)install-sbinPROGRAMS: install-libLTLIBRARIES
-$(AUTOMAKE_DUMMY)install-libyang_pluginsLTLIBRARIES: install-libLTLIBRARIES
 
 include doc/subdir.am
 include doc/user/subdir.am
 include doc/manpages/subdir.am
 include doc/developer/subdir.am
 include include/subdir.am
 include lib/subdir.am
+include mlag/subdir.am
 include zebra/subdir.am
 include watchfrr/subdir.am
 include qpb/subdir.am
 include fpm/subdir.am
+include grpc/subdir.am
 include tools/subdir.am
 include solaris/subdir.am
 
@@ -146,6 +157,7 @@ include staticd/subdir.am
 include bfdd/subdir.am
 include yang/subdir.am
 include yang/libyang_plugins/subdir.am
+include vrrpd/subdir.am
 
 include vtysh/subdir.am
 include tests/subdir.am
@@ -174,6 +186,8 @@ EXTRA_DIST += \
 	\
 	python/clidef.py \
 	python/clippy/__init__.py \
+	python/makevars.py \
+	python/makefile.py \
 	\
 	redhat/frr.logrotate \
 	redhat/frr.pam \
@@ -187,7 +201,6 @@ EXTRA_DIST += \
 	snapcraft/defaults \
 	snapcraft/helpers \
 	snapcraft/snap \
-	\
 	babeld/Makefile \
 	bgpd/Makefile \
 	bgpd/rfp-example/librfp/Makefile \
@@ -198,6 +211,7 @@ EXTRA_DIST += \
 	doc/user/Makefile \
 	eigrpd/Makefile \
 	fpm/Makefile \
+	grpc/Makefile \
 	isisd/Makefile \
 	ldpd/Makefile \
 	lib/Makefile \
@@ -216,16 +230,51 @@ EXTRA_DIST += \
 	vtysh/Makefile \
 	watchfrr/Makefile \
 	zebra/Makefile \
+	vrrpd/Makefile \
 	# end
 
-noinst_HEADERS += defaults.h
+AM_V_LLVM_BC = $(am__v_LLVM_BC_$(V))
+am__v_LLVM_BC_ = $(am__v_LLVM_BC_$(AM_DEFAULT_VERBOSITY))
+am__v_LLVM_BC_0 = @echo "  LLVM.BC " $@;
+am__v_LLVM_BC_1 = 
+
+AM_V_LLVM_LD = $(am__v_LLVM_LD_$(V))
+am__v_LLVM_LD_ = $(am__v_LLVM_LD_$(AM_DEFAULT_VERBOSITY))
+am__v_LLVM_LD_0 = @echo "  LLVM.LD " $@;
+am__v_LLVM_LD_1 = 
 
-clean-local: clean-python
-.PHONY: clean-python
+SUFFIXES += .lo.bc .o.bc
+
+.o.o.bc:
+	$(AM_V_LLVM_BC)$(COMPILE) -emit-llvm -c -o $@ $(patsubst %.o,%.c,$<)
+.lo.lo.bc:
+	$(AM_V_LLVM_BC)$(COMPILE) -emit-llvm -c -o $@ $(patsubst %.lo,%.c,$<)
+
+%.cg.json: %.bc tools/frr-llvm-cg
+	tools/frr-llvm-cg -o $@ $<
+%.cg.dot: %.cg.json
+	$(PYTHON) $(top_srcdir)/python/callgraph-dot.py $< $@
+%.cg.svg: %.cg.dot
+	@echo if the following command fails, you need to install graphviz.
+	@echo also, the output is nondeterministic. run it multiple times and use the nicest output.
+	@echo tuning parameters may yield nicer looking graphs as well.
+	fdp -GK=0.7 -Gstart=42231337 -Gmaxiter=2000 -Elen=2 -Gnodesep=1.5 -Tsvg -o$@ $<
+# don't delete intermediaries
+.PRECIOUS: %.cg.json %.cg.dot
+
+# <lib>.la.bc, <lib>.a.bc and <daemon>.bc targets are generated by
+# python/makefile.py
+LLVM_LINK = llvm-link-$(llvm_version)
+
+clean-local: clean-python clean-llvm-bitcode
+.PHONY: clean-python clean-llvm-bitcode
 clean-python:
 	find . -name __pycache__ -o -name .pytest_cache | xargs rm -rf
 	find . -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f
 
+clean-llvm-bitcode:
+	find . -name "*.bc" -o -name "*.cg.json" -o -name "*.cg.dot" -o -name "*.cg.svg" | xargs rm -f
+
 redistclean:
 	$(MAKE) distclean CONFIG_CLEAN_FILES="$(filter-out $(EXTRA_DIST), $(CONFIG_CLEAN_FILES))"
 

README.md

@@ -1,3 +1,7 @@
+<p align="center">
+<img src="http://docs.frrouting.org/en/latest/_static/frr-icon.svg" alt="Icon" width="20%"/>
+</p>
+
 FRRouting
 =========
 
@@ -20,20 +24,22 @@ FRR currently supports the following protocols:
 * Babel
 * PBR
 * OpenFabric
+* VRRP
 * EIGRP (alpha)
 * NHRP (alpha)
 
 Installation & Use
 ------------------
 
-Packages are available for various distributions on our
+For source tarballs, see the
 [releases page](https://github.com/FRRouting/frr/releases).
 
-Snaps are also available [here](https://snapcraft.io/frr).
+For Debian and its derivatives, use the APT repository at
+[https://deb.frrouting.org/](https://deb.frrouting.org/).
 
 Instructions on building and installing from source for supported platforms may
-be found
-[here](http://docs.frrouting.org/projects/dev-guide/en/latest/building.html).
+be found in the
+[developer docs](http://docs.frrouting.org/projects/dev-guide/en/latest/building.html).
 
 Once installed, please refer to the [user guide](http://docs.frrouting.org/)
 for instructions on use.

alpine/APKBUILD.in

@@ -1,25 +1,24 @@
 # Maintainer: Arthur Jones <arthur.jones@riverbed.com>
 pkgname=frr
+arch="all"
 pkgver=@VERSION@
 pkgrel=0
-pkgdesc="Free Range Routing is a fork of quagga"
+pkgdesc="FRRouting is a fork of quagga"
 url="https://frrouting.org/"
-arch="x86_64"
 license="GPL-2.0"
-depends="json-c c-ares ipsec-tools iproute2 python py-ipaddr bash"
+depends="json-c c-ares iproute2 python3 bash"
 makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
-    acct autoconf automake bash
-    binutils bison bsd-compat-headers build-base
-    c-ares c-ares-dev ca-certificates cryptsetup-libs curl
-    device-mapper-libs expat fakeroot flex fortify-headers gdbm
-    git gmp isl json-c-dev kmod lddtree libacl libatomic libattr
-    libblkid libburn libbz2 libc-dev libcap libcurl libedit libffi libgcc
-    libgomp libisoburn libisofs libltdl libressl libssh2
-    libstdc++ libtool libuuid libyang-dev linux-headers lzip lzo m4 make mkinitfs mpc1
-    mpfr3 mtools musl-dev ncurses-libs ncurses-terminfo ncurses-terminfo-base
-    patch pax-utils pcre perl pkgconf python2 python2-dev readline
-    readline-dev sqlite-libs squashfs-tools sudo tar texinfo xorriso xz-libs
-    py-sphinx"
+    acct autoconf automake bash binutils bison bsd-compat-headers build-base
+    c-ares c-ares-dev ca-certificates cryptsetup-libs curl device-mapper-libs
+    expat fakeroot flex fortify-headers gdbm git gmp isl json-c-dev kmod
+    lddtree libacl libatomic libattr libblkid libburn libbz2 libc-dev
+    libcap-dev libcurl libedit libffi libgcc libgomp libisoburn libisofs
+    libltdl libressl libssh2 libstdc++ libtool libuuid libyang-dev
+    linux-headers lzip lzo m4 make mkinitfs mpc1 mpfr4 mtools musl-dev
+    ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre
+    perl pkgconf python3 python3-dev readline readline-dev sqlite-libs
+    squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev
+    py3-sphinx"
 checkdepends="pytest py-setuptools"
 install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
@@ -35,13 +34,15 @@ _user=frr
 
 build() {
 	cd "$builddir"
+
 	./configure \
 		--prefix=/usr \
 		--sbindir=$_sbindir \
 		--sysconfdir=$_sysconfdir \
 		--libdir=$_libdir \
 		--localstatedir=$_localstatedir \
 		--enable-systemd=no \
+		--enable-rpki \
 		--enable-vtysh \
 		--enable-multipath=64 \
 		--enable-vty-group=frrvty \