Tests: 3200 passed
Duration: 98 minutes
Changes: Who: Jafar Al-Gharaibeh <>
Why: Merge pull request #1227 from qlyoung/pim-cli-npd
pimd: fix some null pointer derefs in cli
Tests: 1 of 1323 failed
Duration: 924 minutes
Changes: Who: David Lamparter
Why: Merge pull request #713 from qlyoung/fix-zebra-dbz-3.0
Fix zebra div by zero

Who: David Lamparter
Why: Merge branch "frr/pull/964" into stable/3.0
This accidentally ended up merged to master... *derp*

Signed-off-by: David Lamparter <>

Who: Christian Franke
Why: isisd: guard SPF warning by debug flag
Signed-off-by: Christian Franke <>

Who: Renato Westphal
Why: ldpd: fix missing label mappings
In some scenarios, it"s possible to send a Label Withdraw to a neighbor
and not receive a corresponding Label Release right away. This can happen
during reconvergence after a network failure or configuration change.

When this happens, the list of upstream mappings of a given FEC might
not be empty even after sending a Label Withdraw to all neighbors. This
situation holds until all neighbors either send a Label Release or are
torn down (e.g. keepalive timeout).

With that said, we shouldn"t check for "RB_EMPTY(&fn->upstream)"
in lde_kernel_update() because it can prevent ldpd from sending label
mappings in such circumstances. This check was introduced to avoid sending
the same label mapping more than once to the same neighbor, but we need
to remove this optimization for now until we find a better solution (which
probably involves refactoring the whole zebra<->ldpd communication).

While here, add a new debug message in lde_send_labelmapping() which
can aid in troubleshooting label problems in the future.

Signed-off-by: Renato Westphal <>

Who: Donald Sharp
Why: Merge pull request #920 from opensourcerouting/static-routes-ifindex-update-3.0
[3.0] fixup static routes" ifindexes when interfaces (dis)appear

Manual run by Martin Winter
Tests: 2724 passed
Duration: 48 minutes
Changes: Who: Donald Sharp
Why: Merge pull request #1222 from opensourcerouting/isis-spf-improvements
isisd: spf improvements
Custom build by Github Hook with revision master
Tests: 1323 passed
Duration: 920 minutes
Changes: Who: Jafar Al-Gharaibeh <>
Why: Merge pull request #461 from donaldsharp/poll_2.0
Poll 2.0

Who: Donald Sharp
Why: lib: Rename HAVE_POLL to prevent conflicting #defines
Rename HAVE_POLL to HAVE_POLL_CALL, when compiling with
snmp and poll enabled this was causing issues.

Signed-off-by: Donald Sharp <>

Who: David Lamparter
Why: pimd: fix clang warning
pimd/pim_sock.c:178:13: error: implicit conversion from
        "int" to "char" changes value from 148 to -108
    ra[0] = 148;

Signed-off-by: David Lamparter <>

Who: Sam Tannous <>
Why: Remove uncalled function causing compiler error
Ticket: CM-16086
Reviewed By: sharpd
Testing Done: Built debs and tested on hardnode

With snmp enabled, this function was causing compiler
errors since it was not being called.  Removed it.

Signed-off-by: Sam Tannous <>
Rebuilt by Martin Winter
TopoTest PullReq
Tests: 232 passed
Duration: 19 minutes
Changes: Who: Martin Winter
Why: Merge pull request #35 from opensourcerouting/skip-eigrp-distance-check
eigrp-topo1: Remove check for EIGRP distance

Who: Chirag Shah
Why: ospf6d: OSPFv3 interface bandwidth handling
if bandwidth is not set from Zebra  use speed as
   bandwidth for ospfv3 route cost.

Signed-off-by: Chirag Shah <>

Who: Nigel Kukard <>
Why: doc: Clarified the use of show bgp ipv4/ipv6 for communities
Signed-off-by: Nigel Kukard <>

Who: Daniel Walton <>
Why: zebra: api.vrf_id should be re->vrf_id
Signed-off-by: Daniel Walton <>
Reviewed-by:   Donald Sharp <>

This fixes route redistribution for VRFs

Who: Donald Sharp
Why: pimd: Add new "debug pim nht rp" command
All the rp debugs were a mish-mash of TRACE or ZEBRA,
but the reality they were all focused on handling NHT
issues associated with the RP"s.  So let"s create
a new debug "debug pim nht rp" if you are having
issues with RP"s.

Signed-off-by: Donald Sharp <>

Custom build by Github Hook with revision master
Tests: Testless build
Duration: 55 minutes
Changes: Who: Timo Teräs <>
Why: nhrpd: use hop count 1 for registration requests
Cisco has a bug that it rejects packets with zero hop count.
Use one to avoid potential forwarding of registration requests.
Tests: 2539 passed
Duration: 53 minutes
Changes: No changes
Rebuilt by Martin Winter
Tests: Testless build
Duration: 49 minutes
Changes: Who: smlng <>
Why: doc: fix link to trie implementation on doxygen mainpage
Tests: 2532 passed
Duration: 51 minutes
Changes: Who: Andreas Reuter <>
Why: Merge pull request #6 from ColinBS/feature/rtrlib
Build Quagga without SSH support of RTRlib

Who: Colin Sames <>
Why: Build Quagga without SSH support of RTRlib
If the RTRlib was compiled without SSH support, check certain blocks of code whether they
should be compiled or not. This is experimental and most certainly causes unexpected
behavior. Compiles without errors on Ubuntu 16.04.

Who: Colin Sames <>
Why: Merge branch "feature/rtrlib" of into feature/rtrlib