summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5839 from donaldsharp/upstream_mergeRuss White2020-03-0922-268/+812
|\
| * doc: Add missing mlag documentationDonald Sharp2020-03-061-0/+17
| * pimd: re-eval flow activity on kat expiryAnuradha Karuppiah2020-03-061-33/+55
| * pimd: mute termination device on the origination mroute on type modsAnuradha Karuppiah2020-03-061-0/+6
| * pimd: Allow LHR in a AA situation to join upstreamDonald Sharp2020-03-061-1/+14
| * pimd: fix problem with oif being re-added during ifchannel delAnuradha Karuppiah2020-03-061-2/+6
| * pimd: logs to help debug leaked channel OIF problemsAnuradha Karuppiah2020-03-062-2/+23
| * lib, pimd, zebra: Provide some insurance against reading bad stream dataSatheesh Kumar K2020-03-064-41/+96
| * zebra: SO_PEERCRED is a getsockopt callDonald Sharp2020-03-061-5/+0
| * pimd: Use PIM EVPN MLAG Infra for syncing PIM MLAG EntriesSatheesh Kumar K2020-03-066-10/+158
| * pimd: run DF election only on (*, G) termination mroutesAnuradha Karuppiah2020-03-061-14/+15
| * pimd: Skip nexthop lookup for register source in some casesDonald Sharp2020-03-061-2/+11
| * pimd: Add accidently missed code during upstreaming processDonald Sharp2020-03-0612-146/+396
| * pimd: There is nothing to do with a WRVIFWHOLE for iifp of pimregDonald Sharp2020-03-061-10/+13
| * pimd: Put subdir.am into alphabetical orderDonald Sharp2020-03-061-2/+2
* | Merge pull request #5942 from patrasar/2438087Donald Sharp2020-03-091-4/+8
|\ \
| * | pimd: Display mroute uptime per (s,g) entrySarita Patra2020-03-091-4/+8
* | | Merge pull request #5919 from qlyoung/fix-vrrp-mvl-uafDonatas Abraitis2020-03-091-6/+50
|\ \ \
| * | | vrrpd: search all vr's for mvl_ifp to nullQuentin Young2020-03-051-32/+44
| * | | vrrpd: always null mvl_ifp ptr when mvl is deletedQuentin Young2020-03-051-8/+40
* | | | Merge pull request #5936 from rubenk/ldpd-fix-some-more-linking-issues-with-g...Donald Sharp2020-03-094-7/+3
|\ \ \ \
| * | | | ldpd: remove multiple definitions of thread_masterRuben Kerkhof2020-03-082-6/+0
| * | | | ldpd: fix another linking issue with GCC-10Ruben Kerkhof2020-03-082-1/+3
* | | | | Merge pull request #5922 from pguibert6WIND/nhrp_override_fixDonald Sharp2020-03-091-4/+0
|\ \ \ \ \
| * | | | | Revert "nhrpd: ignore zebra updates about our routes being deleted/added"Philippe Guibert2020-03-061-4/+0
* | | | | | Merge pull request #5935 from rubenk/tests-fix-linking-with-gcc10Donald Sharp2020-03-091-1/+1
|\ \ \ \ \ \
| * | | | | | tests: fix build with GCC 10Ruben Kerkhof2020-03-081-1/+1
* | | | | | | Merge pull request #5937 from ton31337/fix/sizeofDonald Sharp2020-03-0951-174/+174
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | *: Replace `sizeof something` to sizeof(something)Donatas Abraitis2020-03-0851-174/+174
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5934 from rubenk/ldpd-fix-linking-error-with-gcc-10Donald Sharp2020-03-082-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | ldpd: Fix linking error on Fedora Rawhide with GCC 10Ruben Kerkhof2020-03-082-1/+3
* | | | | | Merge pull request #5933 from rgirada/frr-staticDonald Sharp2020-03-083-0/+9
|\ \ \ \ \ \
| * | | | | | staticd: Fixing memory leak issuergirada2020-03-083-0/+9
* | | | | | | Merge pull request #5915 from donaldsharp/more_more_moreRuss White2020-03-083-12/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | *: Tell git to ignore gcov output filesDonald Sharp2020-03-061-0/+6
| * | | | | | zebra: nhg->nexthop is not NULLDonald Sharp2020-03-061-6/+0
| * | | | | | pimd: Prevent use after free from pim_mlag_up_peer_derefDonald Sharp2020-03-061-6/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5932 from rubenk/babeld-fix-build-on-rawhideDonald Sharp2020-03-081-1/+1
|\ \ \ \ \ \
| * | | | | | babeld: fix build on Fedora RawhideRuben Kerkhof2020-03-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #5931 from rubenk/vrrpd-fix-build-on-rawhideDonald Sharp2020-03-081-7/+7
|\ \ \ \ \ \
| * | | | | | vrrpd: fix build on Fedora RawhideRuben Kerkhof2020-03-071-7/+7
| |/ / / / /
* | | | | | Merge pull request #5929 from rubenk/remove-unused-variableDonald Sharp2020-03-081-1/+0
|\ \ \ \ \ \
| * | | | | | bgpd: remove unused variableRuben Kerkhof2020-03-071-1/+0
| |/ / / / /
* | | | | | Merge pull request #5930 from rubenk/fix-staticd-build-on-rawhideDonald Sharp2020-03-081-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | staticd: fix build on Fedora RawhideRuben Kerkhof2020-03-071-1/+1
| |/ / / /
* | | | | Merge pull request #5904 from donaldsharp/close_itDonatas Abraitis2020-03-071-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | vtysh: Fixup extract.pl to intentionally fail on errorDonald Sharp2020-03-041-1/+3
* | | | | Merge pull request #5924 from donaldsharp/more_funcRenato Westphal2020-03-0637-335/+300
|\ \ \ \ \
| * | | | | *: Finish off the __PRETTY_FUNCTION__ to __func__Donald Sharp2020-03-0637-335/+300
|/ / / / /
* | | | | Merge pull request #5920 from qlyoung/fix-srv6-repeated-attr-memleakDonatas Abraitis2020-03-061-3/+14
|\ \ \ \ \ | |_|/ / / |/| | | |