summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #262 from donaldsharp/pim_jp_fixesfrr-3.0-branchpointJafar Al-Gharaibeh2017-03-082-20/+47
|\
| * pimd: Don't double include SourceDonald Sharp2017-03-081-5/+14
| * pimd: Fix various ifdown/ifup scenarios w/ J/P AggDonald Sharp2017-03-082-15/+33
* | Merge pull request #261 from opensourcerouting/lib_cleanupDonald Sharp2017-03-0873-2174/+1188
|\ \
| * | *: fix some option descriptions and make -e workDavid Lamparter2017-03-083-10/+11
| * | lib: time: remove leftover declarationsDavid Lamparter2017-03-081-5/+0
| * | lib: hide away logging internalsDavid Lamparter2017-03-0813-41/+78
| * | lib: remove remaining struct zlog * argsDavid Lamparter2017-03-0820-68/+56
| * | lib: simplify protocol/log namingDavid Lamparter2017-03-0818-88/+38
| * | lib: ditch struct zlog * argument on zlog/vzlog()David Lamparter2017-03-086-24/+19
| * | *: get rid of zlog(*, LOG_LEVEL, ...)David Lamparter2017-03-0823-160/+142
| * | *: add frr_run()David Lamparter2017-03-0812-114/+40
| * | *: add frr_config_fork()David Lamparter2017-03-0822-667/+220
| * | *: centralize more into frr_init()David Lamparter2017-03-0712-34/+12
| * | *: add frr_init() infrastructureDavid Lamparter2017-03-0730-1118/+727
|/ /
* | Merge pull request #257 from opensourcerouting/nhrpdDonald Sharp2017-03-0756-18/+8120
|\ \ | |/ |/|
| * build: only default-enable nhrpd on LinuxDavid Lamparter2017-03-071-4/+9
| * cumulus, tools: Allow nhrpd to be brought upDonald Sharp2017-03-073-1/+3
| * distro/redhat: package nhrpdTimo Teräs2017-03-071-4/+28
| * nhrpd: workaround old kernel vs. glibc definition conflicsTimo Teräs2017-03-071-1/+2
| * doc: add initial nhrpd documentationTimo Teräs2017-03-078-1/+262
| * nhrpd: include headers in dist tarballDavid Lamparter2017-03-071-0/+12
| * nhrpd: change VTY port 2612->2610David Lamparter2017-03-071-1/+1
| * nhrpd: adapt to API changesDavid Lamparter2017-03-0712-115/+133
| * nhrpd: implement next hop resolution protocolTimo Teräs2017-03-0745-12/+7791
* | Merge pull request #254 from donaldsharp/shutdown3Donald Sharp2017-03-078-17/+204
|\ \
| * | bgpd: Only send data if we have something to sendDonald Sharp2017-03-071-6/+12
| * | bgpd: Add json output for last Notification messageDonald Sharp2017-03-071-0/+14
| * | bgpd: TX shutdown messageDavid Lamparter2017-03-073-12/+94
| * | bgpd: RX shutdown message in "show bgp neighbor"David Lamparter2017-03-075-5/+59
| * | lib: add zlog_sanitize functionDavid Lamparter2017-03-072-0/+31
* | | Merge branch 'frr/pull/250' ("bgpd, zebra: Add ifindex to NEXTHOP_TYPE_IPV4")David Lamparter2017-03-072-0/+4
|\ \ \
| * | | bgpd, zebra: Add ifindex to NEXTHOP_TYPE_IPV6Donald Sharp2017-03-062-0/+2
| * | | bgpd, zebra: Add ifindex to NEXTHOP_TYPE_IPV4Donald Sharp2017-03-062-0/+2
* | | | Merge branch 'frr/pull/243' ("Pim jp agg")David Lamparter2017-03-0721-215/+740
|\ \ \ \ | |_|_|/ |/| | |
| * | | pimd: Add copyright Information to pim_jp_agg.[ch]Donald Sharp2017-03-072-0/+40
| * | | pimd: Join/Prune AggregationDonald Sharp2017-03-0220-215/+698
| * | | pimd: Track oil list totals a bit better.Donald Sharp2017-03-021-0/+2
| |/ /
* | | Merge branch 'frr/pull/255' ("vtysh: Fix cli help string to have only 1 menti...David Lamparter2017-03-071-1/+0
|\ \ \
| * | | vtysh: Fix cli help string to have only 1 mention of vty_socketDonald Sharp2017-03-071-1/+0
| | |/ | |/|
* | | Merge branch 'frr/pull/246' ("Pim command cleanup")David Lamparter2017-03-076-159/+69
|\ \ \
| * | | pimd: Fix 'show ip pim state' commandDonald Sharp2017-03-021-2/+2
| * | | pimd: Hide 'ip multicast-routing' commandDonald Sharp2017-03-026-131/+34
| * | | pimd: Turn on igmp when igmp commands are enteredDonald Sharp2017-03-021-26/+33
| | |/ | |/|
* | | Merge branch 'frr/pull/240' ("lib, bgpd: clean up headers")David Lamparter2017-03-0711-9/+6
|\ \ \
| * | | bgpd: remove unnecessary #include "vty.h"Quentin Young2017-03-028-8/+0
| * | | bgpd: add vty.h to bgpd.hQuentin Young2017-03-021-0/+1
| * | | lib: add stream.h, vty.h, zebra.h to plist.hQuentin Young2017-03-022-1/+5
| |/ /
* | | Merge branch 'frr/pull/236' ("tools: frr-reload.py needs to treat "mpls" as a...David Lamparter2017-03-071-0/+2
|\ \ \
| * | | tools: frr-reload.py needs to treat "no " as a single line contextDaniel Walton2017-03-031-0/+1