frr-reload: fix single-line context command processing

.clang-format

@@ -15,7 +15,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AlignAfterOpenBracket: true
 SpaceAfterCStyleCast: false
 MaxEmptyLinesToKeep: 2
-BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBinaryOperators: None
 BreakStringLiterals: false
 SortIncludes:    false
 IncludeCategories:
@@ -28,6 +28,9 @@ ForEachMacros:
   - frr_each
   - frr_each_safe
   - frr_each_from
+  - frr_rev_each
+  - frr_rev_each_safe
+  - frr_rev_each_from
   - frr_with_mutex
   - frr_with_privs
   - LIST_FOREACH
@@ -69,6 +72,7 @@ ForEachMacros:
   - SUBGRP_FOREACH_ADJ_SAFE
   - AF_FOREACH
   - FOREACH_AFI_SAFI
+  - FOREACH_AFI_SAFI_NSF
   - FOREACH_SAFI
   # ospfd
   - LSDB_LOOP

.dir-locals.el

@@ -4,5 +4,5 @@
 
 ((c-mode . ((indent-tabs-mode . t)
             (show-trailing-whitespace . t)
-            (c-basic-offset . 8)
-            )))
+            (c-basic-offset . 8)))
+ (json-mode . ((js-indent-level 4))))

.github/ISSUE_TEMPLATE/bug_report.md

@@ -50,8 +50,8 @@ A clear and concise description of what the bug is.
 Put "x" in "[ ]" if you already tried following:
 -->
 
-[ ] Did you check if this is a duplicate issue?
-[ ] Did you test it on the latest FRRouting/frr master branch?
+- [ ] Did you check if this is a duplicate issue?
+- [ ] Did you test it on the latest FRRouting/frr master branch?
 
 
 **To Reproduce**

.github/workflows/base-branch-label.yml

@@ -0,0 +1,20 @@
+name: Add base branch label
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  label:
+    if: github.repository == 'frrouting/frr'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: |
+            ${{ github.event.pull_request.base.ref }}

.github/workflows/conflicts.yml

@@ -0,0 +1,22 @@
+name: Add a conflict label is PR needs to rebase
+
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  conflicts:
+    if: github.repository == 'frrouting/frr'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check if PRs need a rebase (have some conflicts)
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "conflicts"
+          removeOnDirtyLabel: "no_conflicts"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/docker-daily-master.yml

@@ -0,0 +1,53 @@
+name: Build daily 'master' images for Docker
+
+on:
+  schedule:
+    - cron: '59 23 * * *'
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  docker_daily_master:
+    if: github.repository == 'frrouting/frr'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Custom variables
+        id: vars
+        run: |
+          # To package a specific git commit, the date of the commit gets
+          # appended to the latest release, e.g. 1.0.0_git20180204.
+          # This is the requirement by APKBUILD (abuild).
+          # More details: https://wiki.alpinelinux.org/wiki/APKBUILD_Reference.
+          echo ::set-output name=date::$(date +'%Y%m%d')
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: master
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/alpine/Dockerfile
+          push: true
+          tags: quay.io/frrouting/frr:master
+          build-args: PKGVER=${{ steps.vars.outputs.date }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7

.github/workflows/freeze.yml

@@ -0,0 +1,17 @@
+name: Warn before merging if a "freeze" label exists
+
+on:
+  pull_request_target:
+    types: [synchronize, opened, reopened, labeled, unlabeled]
+
+jobs:
+  freeze_warning:
+    if: ${{ contains(github.event.*.labels.*.name, 'freeze') }}
+    name: Warn before merging if a "freeze" label exists
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for "freeze" label
+        run: |
+          echo "Pull request is labeled as 'freeze'"
+          echo "This workflow fails so that the pull request cannot be merged."
+          exit 1

.github/workflows/mergifyio_backport.yml

@@ -0,0 +1,22 @@
+name: Mergifyio backport
+
+on: [issue_comment]
+
+jobs:
+  mergifyio_backport:
+    if: github.repository == 'frrouting/frr'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions-ecosystem/action-regex-match@v2
+        id: regex-match
+        with:
+          text: ${{ github.event.comment.body }}
+          regex: '[Mm]ergifyio backport '
+
+      - uses: actions-ecosystem/action-add-labels@v1
+        if: ${{ steps.regex-match.outputs.match != '' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          labels: backport

.github/workflows/size-label.yml

@@ -0,0 +1,26 @@
+name: Add PRs size label
+
+on: pull_request_target
+
+jobs:
+  size-label:
+    if: github.repository == 'frrouting/frr'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: size-label
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          sizes: >
+            {
+              "0": "XS",
+              "20": "S",
+              "50": "M",
+              "200": "L",
+              "800": "XL",
+              "2000": "XXL"
+            }

.github/workflows/stale.yml

@@ -0,0 +1,29 @@
+name: Mark stale issues
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "30 1 * * *"
+
+permissions:
+  contents: read
+
+jobs:
+  stale:
+    if: github.repository == 'frrouting/frr'
+    permissions:
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Comment or remove the `autoclose` label in order to avoid having this issue closed.'
+        stale-issue-label: autoclose
+        stale-pr-message: 'This PR is stale because it has been open 180 days with no activity. Comment or remove the `autoclose` label in order to avoid having this PR closed.'
+        stale-pr-label: autoclose
+        days-before-stale: 180
+        days-before-close: 194
+        days-before-pr-stale: 180
+        days-before-pr-close: 194

.gitignore

@@ -113,3 +113,5 @@ refix
 .emacs.desktop*
 
 /test-suite.log
+pceplib/test/*.log
+pceplib/test/*.trs

.pylintrc

@@ -0,0 +1,6 @@
+[MASTER]
+init-hook="import sys; sys.path.insert(0, '..')"
+signature-mutators=common_config.retry,retry
+
+[MESSAGES CONTROL]
+disable=I,C,R,W

Makefile.am

@@ -29,11 +29,33 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/assert \
 	$(CPPFLAGS_BASE) \
 	# end
+
+# AM_LDFLAGS is used for executables (daemons).  LDFLAGS can be left alone,
+# but if it is changed it should include $(AM_LDFLAGS)
 AM_LDFLAGS = \
+	-export-dynamic \
+	$(AC_LDFLAGS) \
+	$(AC_LDFLAGS_EXEC) \
+	$(SAN_FLAGS) \
+	# end
+
+# libraries need to use libxxx_LDFLAGS = $(LIB_LDFLAGS) -version-info X:Y:Z
+LIB_LDFLAGS = \
 	-export-dynamic \
 	$(AC_LDFLAGS) \
 	$(SAN_FLAGS) \
 	# end
+
+# modules need to use xxx_LDFLAGS = $(MODULE_LDFLAGS)
+MODULE_LDFLAGS = \
+	-export-dynamic \
+	-avoid-version \
+	-module \
+	-shared \
+	$(AC_LDFLAGS) \
+	$(SAN_FLAGS) \
+	# end
+
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE)
 
 AR_FLAGS = @AR_FLAGS@
@@ -122,7 +144,6 @@ pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
 dist_yangmodels_DATA =
 man_MANS =
-vtysh_scan =
 vtysh_daemons =
 clippy_scan =
 
@@ -204,12 +225,13 @@ EXTRA_DIST += \
 	python/makefile.py \
 	python/tiabwarfo.py \
 	python/xrelfo.py \
+	python/xref2vtysh.py \
 	python/test_xrelfo.py \
 	python/runtests.py \
 	\
 	python/xrefstructs.json \
 	\
-	redhat/frr.logrotate \
+	tools/etc/logrotate.d/frr \
 	redhat/frr.pam \
 	redhat/frr.spec \
 	\

README.md

@@ -59,7 +59,7 @@ lists:
 
 For chat, we currently use [Slack](https://frrouting.slack.com). You can join
 by clicking the "Slack" link under the
-[Participate](https://frrouting.org/#participate) section of our website.
+[Participate](https://frrouting.org/community) section of our website.
 
 
 Contributing

alpine/APKBUILD.in

@@ -10,15 +10,15 @@ 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
+    expat fakeroot flex fortify-headers gdbm git gmp 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
+    libltdl libressl libssh2 libstdc++ libtool libuuid
     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
+    ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre2
+    perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev
     squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev
-    py3-sphinx elfutils elfutils-dev"
+    py3-sphinx elfutils elfutils-dev libyang-dev"
 checkdepends="pytest py-setuptools"
 install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
@@ -46,8 +46,9 @@ build() {
 		--enable-multipath=64 \
 		--enable-vty-group=frrvty \
 		--enable-user=$_user \
-		--enable-group=$_user
-	make
+		--enable-group=$_user \
+		--enable-pcre2posix
+	make -j $(nproc)
 }
 
 check() {
@@ -60,7 +61,7 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir
+	install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir/daemons
 	install -d "$pkgdir"/etc/init.d
 	ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr
 }

babeld/.gitignore

@@ -5,3 +5,4 @@
 !Makefile
 !subdir.am
 !.gitignore
+*_clippy.c