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

isisd: Fix read beyond end of stream of ASLA Sub-TLV parsing (backport #13758) #13815

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 20, 2023

This is an automatic backport of pull request #13758 done by Mergify.
Cherry-pick of 2a9e082 has failed:

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

You are currently cherry-picking commit 2a9e0824a.
  (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:   isisd/isis_tlvs.c

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.com

Fixes a crash associated with attempting to read beyond the end of the
stream when parsing ASLA Sub-TLV.

```
Program received signal SIGABRT, Aborted.
__GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50
50	../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
    subtlv_len=13 '\r') at isisd/isis_tlvs.c:1473
    at isisd/isis_tlvs.c:3264
    context=<optimized out>, mtid=<optimized out>) at isisd/isis_tlvs.c:6078
    indent=4) at isisd/isis_tlvs.c:6142
    avail_len=<optimized out>, context=<optimized out>) at isisd/isis_tlvs.c:7032
    at isisd/isis_tlvs.c:7054
(gdb)
```

Caught by fuzzer.

Signed-off-by: Carmine Scarpitta <carmine.scarpitta@uniroma2.it>
(cherry picked from commit 2a9e082)

# Conflicts:
#	isisd/isis_tlvs.c
Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

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

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

FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function 'pack_item_ext_subtlvs':
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function 'unpack_item_ext_subtlv_asla':
isisd/isis_tlvs.c:842:15: error: 'ASLA_APP_IDENTIFIER_BIT_LENGTH' undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: 'ISIS_SUBSUBTLV_HDR_SIZE' undeclared (first use in this function); did you mean 'ISIS_SUBTLV_HDR_SIZE'?
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-12407/artifact/U18I386BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

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

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:3: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

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

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-12407/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

Ubuntu 18.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/U18ARM8BUILD/config.status/config.status

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-12407/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
OpenBSD 7 amd64 build: Failed (click for details) OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/CI011BUILD/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10251: isisd/isis_tlvs.o] Error 1
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
<<<<<<< HEAD
Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/REDHAT8/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

Redhat 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/REDHAT8/config.log/config.log.gz

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-12407/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-12407/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/DEB10BUILD/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-12407/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-12407/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-12407/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function)
FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function 'pack_item_ext_subtlvs':
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function 'unpack_item_ext_subtlv_asla':
isisd/isis_tlvs.c:842:15: error: 'ASLA_APP_IDENTIFIER_BIT_LENGTH' undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: 'ISIS_SUBSUBTLV_HDR_SIZE' undeclared (first use in this function); did you mean 'ISIS_SUBTLV_HDR_SIZE'?
isisd/isis_tlvs.c:851:3: error: implicit declaration of function 'TLV_SIZE_MISMATCH' [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:
Ubuntu 22.04 amd64 build: Failed (click for details) Ubuntu 22.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/U22AMD64BUILD/config.log/config.log.gz

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

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:22: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:22: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:26: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:17: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/U22AMD64BUILD/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-12407/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-12407/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-12407/artifact/CI021BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function)
Ubuntu 18.04 amd64 build: Failed (click for details) Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/artifact/U1804AMD64/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:3: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/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-12407/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
Redhat 9 amd64 build: Failed (click for details) Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/RH9BUILD/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:22: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:22: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:26: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:17: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

Redhat 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/RH9BUILD/config.log/config.log.gz

Warnings Generated during build:

Checkout code: Successful with additional warnings
FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function 'pack_item_ext_subtlvs':
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function 'unpack_item_ext_subtlv_asla':
isisd/isis_tlvs.c:842:15: error: 'ASLA_APP_IDENTIFIER_BIT_LENGTH' undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: 'ISIS_SUBSUBTLV_HDR_SIZE' undeclared (first use in this function); did you mean 'ISIS_SUBTLV_HDR_SIZE'?
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-12407/artifact/U18I386BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

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

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:3: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

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

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-12407/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

Ubuntu 18.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/U18ARM8BUILD/config.status/config.status

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-12407/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
OpenBSD 7 amd64 build: Failed (click for details) OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/CI011BUILD/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10251: isisd/isis_tlvs.o] Error 1
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
<<<<<<< HEAD
Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/REDHAT8/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

Redhat 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/REDHAT8/config.log/config.log.gz

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-12407/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-12407/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/DEB10BUILD/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-12407/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-12407/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-12407/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function)
FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function 'pack_item_ext_subtlvs':
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function 'unpack_item_ext_subtlv_asla':
isisd/isis_tlvs.c:842:15: error: 'ASLA_APP_IDENTIFIER_BIT_LENGTH' undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: 'ISIS_SUBSUBTLV_HDR_SIZE' undeclared (first use in this function); did you mean 'ISIS_SUBTLV_HDR_SIZE'?
isisd/isis_tlvs.c:851:3: error: implicit declaration of function 'TLV_SIZE_MISMATCH' [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:
Ubuntu 22.04 amd64 build: Failed (click for details) Ubuntu 22.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/U22AMD64BUILD/config.log/config.log.gz

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

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:22: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:22: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:26: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:17: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/U22AMD64BUILD/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-12407/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-12407/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-12407/artifact/CI021BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function)
Ubuntu 18.04 amd64 build: Failed (click for details) Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/artifact/U1804AMD64/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:3: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/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-12407/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-12407/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-12407/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.12407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.12407/frr-source/doc/user/nexthop_groups.rst
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:15: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:15: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:19: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
Redhat 9 amd64 build: Failed (click for details) Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/RH9BUILD/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.12407/frr-source'
isisd/isis_tlvs.c: In function pack_item_ext_subtlvs:
isisd/isis_tlvs.c:822:1: error: version control conflict marker in file
isisd/isis_tlvs.c: In function unpack_item_ext_subtlv_asla:
isisd/isis_tlvs.c:842:22: error: ASLA_APP_IDENTIFIER_BIT_LENGTH undeclared (first use in this function)
isisd/isis_tlvs.c:842:22: note: each undeclared identifier is reported only once for each function it appears in
isisd/isis_tlvs.c:850:26: error: ISIS_SUBSUBTLV_HDR_SIZE undeclared (first use in this function); did you mean ISIS_SUBTLV_HDR_SIZE?
isisd/isis_tlvs.c:851:17: error: implicit declaration of function TLV_SIZE_MISMATCH [-Werror=implicit-function-declaration]
In file included from isisd/isis_tlvs.c:32:

Redhat 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12407/artifact/RH9BUILD/config.log/config.log.gz

Report for isis_tlvs.c | 16 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #822: FILE: /tmp/f1-1748100/isis_tlvs.c:822:
< ERROR: spaces required around that '==' (ctx:ExO)
< #823: FILE: /tmp/f1-1748100/isis_tlvs.c:823:
< ERROR: spaces required around that '==' (ctx:OxO)
< #823: FILE: /tmp/f1-1748100/isis_tlvs.c:823:
< ERROR: spaces required around that '==' (ctx:OxO)
< #823: FILE: /tmp/f1-1748100/isis_tlvs.c:823:
< ERROR: spaces required around that '=' (ctx:OxE)
< #823: FILE: /tmp/f1-1748100/isis_tlvs.c:823:
< WARNING: space prohibited between function name and open parenthesis '('
< #1045: FILE: /tmp/f1-1748100/isis_tlvs.c:1045:
< ERROR: spaces required around that '>' (ctx:OxW)
< #1045: FILE: /tmp/f1-1748100/isis_tlvs.c:1045:
< ERROR: spaces required around that ':' (ctx:VxW)
< #1045: FILE: /tmp/f1-1748100/isis_tlvs.c:1045:

@ton31337 ton31337 closed this Jun 20, 2023
@ton31337 ton31337 deleted the mergify/bp/stable/8.5/pr-13758 branch June 20, 2023 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants