Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BGP default-originate with route-map fixes (backport #9586) #9626

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 16, 2021

This is an automatic backport of pull request #9586 done by Mergify.
Cherry-pick of c212584 has failed:

On branch mergify/bp/stable/7.5/pr-9586
Your branch is up to date with 'origin/stable/7.5'.

You are currently cherry-picking commit c21258471.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   lib/routemap.c
	both modified:   lib/routemap.h

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of bf844ba has failed:

On branch mergify/bp/stable/7.5/pr-9586
Your branch is ahead of 'origin/stable/7.5' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bf844bac6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgp_updgrp_adv.c

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 68d4b72 has failed:

On branch mergify/bp/stable/7.5/pr-9586
Your branch is ahead of 'origin/stable/7.5' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 68d4b72ff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/topotests/bgp_default-route_route-map_match_set/test_bgp_default-originate_route-map_match_set.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Sometimes it's needed to match by fields of one object but set fields of
another object. The following commit is an example.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit c212584)

# Conflicts:
#	lib/routemap.c
#	lib/routemap.h
When processing a route-map for default-originate, we actually want to
match by attributes in routes from the RIB, but set attributes in the
newly originated route. Currently, it's not the case. Instead, we
construct a dummy path combining attributes from both routes, and we end
up with multiple problems:
- match by as-path doesn't work
- communities from the matched RIB route are copied to the newly
  originated route
- we corrupt the RIB routes

To fix the issue, we should use the new route-map API that allows using
separate match/set objects.

Fixes #9584.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit bf844ba)

# Conflicts:
#	bgpd/bgp_updgrp_adv.c
We allocate an as-path using bgp_attr_default_set and should free it
before exiting the function.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit ab79867)
Make sure that we don't set communities from a random RIB route when
originating the default route.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit 68d4b72)

# Conflicts:
#	tests/topotests/bgp_default-route_route-map_match_set/test_bgp_default-originate_route-map_match_set.py
@mergify mergify bot added the conflicts label Sep 16, 2021
@frrbot frrbot bot added bgp bugfix libfrr tests Topotests, make check, etc labels Sep 16, 2021
@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 16, 2021

🛑 Basic BGPD CI results: FAILURE

Results table
_ _
Result FAILURE git merge/9626 f3ce8b6 frr.github Build
Date 09/16/2021
Start 06:58:52
Finish 06:59:10
Run-Time 00:18
Total
Pass
Fail
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-09-16-06:58:52.txt
Log make-2021-09-16-06:58:52.out.bz2
Memory

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Failed

Ubuntu 16.04 amd64 build: Failed (click for details) Ubuntu 16.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI014BUILD/config.log/config.log.gz Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI014BUILD/config.status/config.status

Make failed for Ubuntu 16.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI014BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
./lib/routemap.h:312:1: error: expected identifier or ( before >> token
Ubuntu 18.04 amd64 build: Failed (click for details) Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804AMD64/config.log/config.log.gz Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804AMD64/config.status/config.status

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 16.04 arm8 build: Failed (click for details) Ubuntu 16.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U16ARM8BUILD/config.status/config.status Ubuntu 16.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U16ARM8BUILD/config.log/config.log.gz

Make failed for Ubuntu 16.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
lib/routemap.h:312:1: error: expected identifier or ( before >> token
Ubuntu 18.04 i386 build: Failed (click for details)

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file

Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18I386BUILD/config.status/config.status
Ubuntu 18.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18I386BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details) CentOS 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI005BUILD/config.log/config.log.gz CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI005BUILD/config.status/config.status

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
./lib/routemap.h:312:1: error: expected identifier or ( before >> token
Ubuntu 18.04 arm7 build: Failed (click for details) Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM7BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
In file included from bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
NetBSD 8 amd64 build: Failed (click for details) NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI012BUILD/config.status/config.status

Make failed for NetBSD 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI012BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: expected identifier or '(' before '<<' token
 <<<<<<< HEAD
 ^
lib/routemap.h:305:1: error: expected identifier or '(' before '==' token
 =======
 ^
lib/routemap.h:312:1: error: expected identifier or '(' before '>>' token

NetBSD 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI012BUILD/config.log/config.log.gz

CentOS 8 amd64 build: Failed (click for details) CentOS 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CENTOS8BUILD/config.log/config.log.gz

Make failed for CentOS 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file

CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CENTOS8BUILD/config.status/config.status

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB11AMD64/config.log/config.log.gz

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
lib/routemap.h:305:1: error: version control conflict marker in file
lib/routemap.h:312:1: error: version control conflict marker in file
make[1]: *** [Makefile:7957: lib/filter.lo] Error 1
In file included from lib/filter_nb.c:32:
./lib/routemap.h:300:1: error: version control conflict marker in file
./lib/routemap.h:305:1: error: version control conflict marker in file

Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB11AMD64/config.status/config.status

FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/FBSD12AMD64/config.status/config.status

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 16.04 i386 build: Failed (click for details) Ubuntu 16.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1604I386/config.log/config.log.gz Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1604I386/config.status/config.status

Make failed for Ubuntu 16.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1604I386/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
./lib/routemap.h:312:1: error: expected identifier or ( before >> token
OpenBSD 6 amd64 build: Failed (click for details) OpenBSD 6 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI011BUILD/config.status/config.status

Make failed for OpenBSD 6 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI011BUILD/ErrorLog/log_make.txt)

In file included from vtysh/../bgpd/bgpd.h:37:
vtysh/../lib/routemap.h:300:1:   CC       lib/clippy-vector.o
error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
In file included from bgpd/bgp_evpn_mh.c:33:
In file included from vtysh/../bgpd/bgpd.h:37:
vtysh/../lib/routemap.h:300:1: error: version control conflict marker in file
Fedora 29 amd64 build: Failed (click for details) Fedora 29 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/F29BUILD/config.log/config.log.gz Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/F29BUILD/config.status/config.status

Make failed for Fedora 29 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 18.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file

Ubuntu 18.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM8BUILD/config.log/config.log.gz
Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM8BUILD/config.status/config.status

Debian 9 amd64 build: Failed (click for details) Debian 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI021BUILD/config.log/config.log.gz Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI021BUILD/config.status/config.status

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file
FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI009BUILD/config.status/config.status

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
lib/routemap.h:305:1: error: version control conflict marker in file
lib/routemap.h:312:1: error: version control conflict marker in file
gmake[1]: *** [Makefile:7956: lib/filter.lo] Error 1
In file included from lib/filter_nb.c:32:
./lib/routemap.h:300:1: error: version control conflict marker in file
./lib/routemap.h:305:1: error: version control conflict marker in file
Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB10BUILD/config.status/config.status

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB10BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U2004AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
lib/routemap.c:2382:45: error: macro "route_map_apply" passed 4 arguments, but takes just 3
 2382 |        route_map_object_t type, void *object)
In file included from lib/routemap.c:28:
lib/routemap.h:310: note: macro "route_map_apply" defined here
lib/routemap.c:2540:14: error: macro "route_map_apply" passed 4 arguments, but takes just 3
 2540 |        object);
In file included from lib/routemap.c:28:

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U2004AMD64BUILD/config.status/config.status

Ubuntu 18.04 ppc64le build: Failed (click for details) Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804PPC64LEBUILD/config.log/config.log.gz Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804PPC64LEBUILD/config.status/config.status

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 16.04 arm7 build: Failed (click for details)

Make failed for Ubuntu 16.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI101BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
lib/routemap.h:312:1: error: expected identifier or ( before >> token

Ubuntu 16.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI101BUILD/config.log/config.log.gz
Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI101BUILD/config.status/config.status

Warnings Generated during build:

Checkout code: Successful with additional warnings
Ubuntu 16.04 amd64 build: Failed (click for details) Ubuntu 16.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI014BUILD/config.log/config.log.gz Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI014BUILD/config.status/config.status

Make failed for Ubuntu 16.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI014BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
./lib/routemap.h:312:1: error: expected identifier or ( before >> token
Ubuntu 18.04 amd64 build: Failed (click for details) Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804AMD64/config.log/config.log.gz Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804AMD64/config.status/config.status

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 16.04 arm8 build: Failed (click for details) Ubuntu 16.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U16ARM8BUILD/config.status/config.status Ubuntu 16.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U16ARM8BUILD/config.log/config.log.gz

Make failed for Ubuntu 16.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
lib/routemap.h:312:1: error: expected identifier or ( before >> token
Ubuntu 18.04 i386 build: Failed (click for details)

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file

Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18I386BUILD/config.status/config.status
Ubuntu 18.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18I386BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details) CentOS 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI005BUILD/config.log/config.log.gz CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI005BUILD/config.status/config.status

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
./lib/routemap.h:312:1: error: expected identifier or ( before >> token
Ubuntu 18.04 arm7 build: Failed (click for details) Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM7BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
In file included from bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
NetBSD 8 amd64 build: Failed (click for details) NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI012BUILD/config.status/config.status

Make failed for NetBSD 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI012BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: expected identifier or '(' before '<<' token
 <<<<<<< HEAD
 ^
lib/routemap.h:305:1: error: expected identifier or '(' before '==' token
 =======
 ^
lib/routemap.h:312:1: error: expected identifier or '(' before '>>' token

NetBSD 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI012BUILD/config.log/config.log.gz

CentOS 8 amd64 build: Failed (click for details) CentOS 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CENTOS8BUILD/config.log/config.log.gz

Make failed for CentOS 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file

CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CENTOS8BUILD/config.status/config.status

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB11AMD64/config.log/config.log.gz

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
lib/routemap.h:305:1: error: version control conflict marker in file
lib/routemap.h:312:1: error: version control conflict marker in file
make[1]: *** [Makefile:7957: lib/filter.lo] Error 1
In file included from lib/filter_nb.c:32:
./lib/routemap.h:300:1: error: version control conflict marker in file
./lib/routemap.h:305:1: error: version control conflict marker in file

Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB11AMD64/config.status/config.status

FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/FBSD12AMD64/config.status/config.status

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 16.04 i386 build: Failed (click for details) Ubuntu 16.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1604I386/config.log/config.log.gz Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1604I386/config.status/config.status

Make failed for Ubuntu 16.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1604I386/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
./lib/routemap.h:312:1: error: expected identifier or ( before >> token
OpenBSD 6 amd64 build: Failed (click for details) OpenBSD 6 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI011BUILD/config.status/config.status

Make failed for OpenBSD 6 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI011BUILD/ErrorLog/log_make.txt)

In file included from vtysh/../bgpd/bgpd.h:37:
vtysh/../lib/routemap.h:300:1:   CC       lib/clippy-vector.o
error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
In file included from bgpd/bgp_evpn_mh.c:33:
In file included from vtysh/../bgpd/bgpd.h:37:
vtysh/../lib/routemap.h:300:1: error: version control conflict marker in file
Fedora 29 amd64 build: Failed (click for details) Fedora 29 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/F29BUILD/config.log/config.log.gz Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/F29BUILD/config.status/config.status

Make failed for Fedora 29 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 18.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file

Ubuntu 18.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM8BUILD/config.log/config.log.gz
Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U18ARM8BUILD/config.status/config.status

Debian 9 amd64 build: Failed (click for details) Debian 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI021BUILD/config.log/config.log.gz Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI021BUILD/config.status/config.status

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file
FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI009BUILD/config.status/config.status

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
lib/routemap.h:305:1: error: version control conflict marker in file
lib/routemap.h:312:1: error: version control conflict marker in file
gmake[1]: *** [Makefile:7956: lib/filter.lo] Error 1
In file included from lib/filter_nb.c:32:
./lib/routemap.h:300:1: error: version control conflict marker in file
./lib/routemap.h:305:1: error: version control conflict marker in file
Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB10BUILD/config.status/config.status

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:
lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
lib/routemap.h:312:1: error: version control conflict marker in file

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/DEB10BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U2004AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
lib/routemap.c:2382:45: error: macro "route_map_apply" passed 4 arguments, but takes just 3
 2382 |        route_map_object_t type, void *object)
In file included from lib/routemap.c:28:
lib/routemap.h:310: note: macro "route_map_apply" defined here
lib/routemap.c:2540:14: error: macro "route_map_apply" passed 4 arguments, but takes just 3
 2540 |        object);
In file included from lib/routemap.c:28:

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U2004AMD64BUILD/config.status/config.status

Ubuntu 18.04 ppc64le build: Failed (click for details) Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804PPC64LEBUILD/config.log/config.log.gz Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804PPC64LEBUILD/config.status/config.status

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from ./bgpd/bgpd.h:37:0,
./lib/routemap.h:300:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./lib/routemap.h:305:1: error: version control conflict marker in file
 =======
 ^~~~~~~
./lib/routemap.h:312:1: error: version control conflict marker in file
Ubuntu 16.04 arm7 build: Failed (click for details)

Make failed for Ubuntu 16.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI101BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.211/frr-source'
In file included from lib/filter.c:30:0:
lib/routemap.h:300:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
lib/routemap.h:305:1: error: expected identifier or ( before == token
 =======
 ^
lib/routemap.h:312:1: error: expected identifier or ( before >> token

Ubuntu 16.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI101BUILD/config.log/config.log.gz
Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-211/artifact/CI101BUILD/config.status/config.status

Report for bgp_updgrp_adv.c | 34 issues
===============================================
< WARNING: suspect code indent for conditional statements (24, 0)
< #783: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:783:
< ERROR: spaces required around that '<' (ctx:OxW)
< #785: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:785:
< ERROR: spaces required around that '==' (ctx:ExO)
< #791: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:791:
< ERROR: spaces required around that '==' (ctx:OxO)
< #791: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:791:
< ERROR: spaces required around that '==' (ctx:OxO)
< #791: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:791:
< ERROR: spaces required around that '=' (ctx:OxE)
< #791: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:791:
< WARNING: space prohibited between function name and open parenthesis '('
< #793: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:793:
< ERROR: spaces required around that '>' (ctx:OxW)
< #793: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:793:
< ERROR: spaces required around that ':' (ctx:VxW)
< #793: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:793:
< ERROR: spaces required around that '<' (ctx:OxW)
< #799: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:799:
< ERROR: spaces required around that '==' (ctx:ExO)
< #805: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:805:
< ERROR: spaces required around that '==' (ctx:OxO)
< #805: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:805:
< ERROR: spaces required around that '==' (ctx:OxO)
< #805: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:805:
< ERROR: spaces required around that '=' (ctx:OxE)
< #805: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:805:
< WARNING: space prohibited between function name and open parenthesis '('
< #810: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:810:
< ERROR: spaces required around that '>' (ctx:OxW)
< #810: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:810:
< ERROR: spaces required around that ':' (ctx:VxW)
< #810: FILE: /tmp/f1-22138/bgp_updgrp_adv.c:810:
Report for routemap.c | 94 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #2379: FILE: /tmp/f1-22138/routemap.c:2379:
< ERROR: spaces required around that '==' (ctx:ExO)
< #2383: FILE: /tmp/f1-22138/routemap.c:2383:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2383: FILE: /tmp/f1-22138/routemap.c:2383:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2383: FILE: /tmp/f1-22138/routemap.c:2383:
< ERROR: spaces required around that '=' (ctx:OxE)
< #2383: FILE: /tmp/f1-22138/routemap.c:2383:
< WARNING: line over 80 characters
< #2387: FILE: /tmp/f1-22138/routemap.c:2387:
< WARNING: space prohibited between function name and open parenthesis '('
< #2387: FILE: /tmp/f1-22138/routemap.c:2387:
< ERROR: spaces required around that '>' (ctx:OxW)
< #2387: FILE: /tmp/f1-22138/routemap.c:2387:
< ERROR: spaces required around that ':' (ctx:VxW)
< #2387: FILE: /tmp/f1-22138/routemap.c:2387:
< WARNING: suspect code indent for conditional statements (8, 0)
< #2413: FILE: /tmp/f1-22138/routemap.c:2413:
< ERROR: spaces required around that '<' (ctx:OxW)
< #2415: FILE: /tmp/f1-22138/routemap.c:2415:
< ERROR: spaces required around that '==' (ctx:ExO)
< #2417: FILE: /tmp/f1-22138/routemap.c:2417:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2417: FILE: /tmp/f1-22138/routemap.c:2417:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2417: FILE: /tmp/f1-22138/routemap.c:2417:
< ERROR: spaces required around that '=' (ctx:OxE)
< #2417: FILE: /tmp/f1-22138/routemap.c:2417:
< WARNING: line over 80 characters
< #2419: FILE: /tmp/f1-22138/routemap.c:2419:
< WARNING: space prohibited between function name and open parenthesis '('
< #2419: FILE: /tmp/f1-22138/routemap.c:2419:
< ERROR: spaces required around that '>' (ctx:OxW)
< #2419: FILE: /tmp/f1-22138/routemap.c:2419:
< ERROR: spaces required around that ':' (ctx:VxW)
< #2419: FILE: /tmp/f1-22138/routemap.c:2419:
< ERROR: spaces required around that '<' (ctx:OxW)
< #2455: FILE: /tmp/f1-22138/routemap.c:2455:
< ERROR: spaces required around that '==' (ctx:ExO)
< #2457: FILE: /tmp/f1-22138/routemap.c:2457:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2457: FILE: /tmp/f1-22138/routemap.c:2457:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2457: FILE: /tmp/f1-22138/routemap.c:2457:
< ERROR: spaces required around that '=' (ctx:OxE)
< #2457: FILE: /tmp/f1-22138/routemap.c:2457:
< WARNING: line over 80 characters
< #2459: FILE: /tmp/f1-22138/routemap.c:2459:
< WARNING: space prohibited between function name and open parenthesis '('
< #2459: FILE: /tmp/f1-22138/routemap.c:2459:
< ERROR: spaces required around that '>' (ctx:OxW)
< #2459: FILE: /tmp/f1-22138/routemap.c:2459:
< ERROR: spaces required around that ':' (ctx:VxW)
< #2459: FILE: /tmp/f1-22138/routemap.c:2459:
< WARNING: suspect code indent for conditional statements (32, 0)
< #2510: FILE: /tmp/f1-22138/routemap.c:2510:
< ERROR: spaces required around that '<' (ctx:OxW)
< #2518: FILE: /tmp/f1-22138/routemap.c:2518:
< ERROR: spaces required around that '==' (ctx:ExO)
< #2522: FILE: /tmp/f1-22138/routemap.c:2522:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2522: FILE: /tmp/f1-22138/routemap.c:2522:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2522: FILE: /tmp/f1-22138/routemap.c:2522:
< ERROR: spaces required around that '=' (ctx:OxE)
< #2522: FILE: /tmp/f1-22138/routemap.c:2522:
< WARNING: line over 80 characters
< #2525: FILE: /tmp/f1-22138/routemap.c:2525:
< WARNING: space prohibited between function name and open parenthesis '('
< #2525: FILE: /tmp/f1-22138/routemap.c:2525:
< ERROR: spaces required around that '>' (ctx:OxW)
< #2525: FILE: /tmp/f1-22138/routemap.c:2525:
< ERROR: spaces required around that ':' (ctx:VxW)
< #2525: FILE: /tmp/f1-22138/routemap.c:2525:
< ERROR: spaces required around that '<' (ctx:OxW)
< #2537: FILE: /tmp/f1-22138/routemap.c:2537:
< ERROR: spaces required around that '==' (ctx:ExO)
< #2541: FILE: /tmp/f1-22138/routemap.c:2541:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2541: FILE: /tmp/f1-22138/routemap.c:2541:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2541: FILE: /tmp/f1-22138/routemap.c:2541:
< ERROR: spaces required around that '=' (ctx:OxE)
< #2541: FILE: /tmp/f1-22138/routemap.c:2541:
< WARNING: line over 80 characters
< #2546: FILE: /tmp/f1-22138/routemap.c:2546:
< WARNING: space prohibited between function name and open parenthesis '('
< #2546: FILE: /tmp/f1-22138/routemap.c:2546:
< ERROR: spaces required around that '>' (ctx:OxW)
< #2546: FILE: /tmp/f1-22138/routemap.c:2546:
< ERROR: spaces required around that ':' (ctx:VxW)
< #2546: FILE: /tmp/f1-22138/routemap.c:2546:
Report for routemap.h | 18 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #300: FILE: /tmp/f1-22138/routemap.h:300:
< ERROR: spaces required around that '==' (ctx:ExO)
< #305: FILE: /tmp/f1-22138/routemap.h:305:
< ERROR: spaces required around that '==' (ctx:OxO)
< #305: FILE: /tmp/f1-22138/routemap.h:305:
< ERROR: spaces required around that '==' (ctx:OxO)
< #305: FILE: /tmp/f1-22138/routemap.h:305:
< ERROR: spaces required around that '=' (ctx:OxE)
< #305: FILE: /tmp/f1-22138/routemap.h:305:
< WARNING: line over 80 characters
< #312: FILE: /tmp/f1-22138/routemap.h:312:
< WARNING: space prohibited between function name and open parenthesis '('
< #312: FILE: /tmp/f1-22138/routemap.h:312:
< ERROR: spaces required around that '>' (ctx:OxW)
< #312: FILE: /tmp/f1-22138/routemap.h:312:
< ERROR: spaces required around that ':' (ctx:VxW)
< #312: FILE: /tmp/f1-22138/routemap.h:312:

@idryzhov idryzhov closed this Sep 20, 2021
@mergify mergify bot deleted the mergify/bp/stable/7.5/pr-9586 branch September 20, 2021 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants