summaryrefslogtreecommitdiffstats
path: root/zebra/testrib.conf (unfollow)
Commit message (Collapse)AuthorFilesLines
2017-03-15lib, pimd, zebra: Convert if_lookup_exact_address to VRF onlyDonald Sharp5-15/+8
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-15lib, ospfd, pimd: Convert to using VRF based interface creationDonald Sharp5-15/+8
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-15*: Remove non-vrf based ifindex lookupDonald Sharp23-45/+40
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-10pimd: display reg-state and join-state info in the pim_upstream outputanuradhak1-4/+45
Changed the state field in the "sh ip pim upstream" output to include register and join state info as a comma separated value. Register info is supressed if reg-state=NoInfo. Sample output: ============= root@fhr:/home/cumulus# net show pim upstream Iif Source Group State Uptime JoinTimer RSTimer KATimer RefCnt swp1 33.1.1.1 239.1.1.2 J,RegP 00:00:18 --:--:-- 00:00:44 00:03:24 2 root@fhr:/home/cumulus# root@rp:/home/cumulus# net show pim upstream Iif Source Group State Uptime JoinTimer RSTimer KATimer RefCnt lo * 239.1.1.2 J 00:02:08 00:00:52 --:--:-- --:--:-- 1 swp1 33.1.1.1 239.1.1.2 J 00:00:16 00:00:11 --:--:-- 00:03:26 1 root@rp:/home/cumulus# Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com> Ticket: CM-14700 Testing Done: pim-smoke
2017-03-10pimd: simplify pim upstream state transitionsanuradhak3-26/+5
This is another follow-up change to the reg-state and up-join-state separation. The upstream join state machine can now respond to JoinDesired macro changes independent of router role. I have also dropped the PRUNE state from the upstream-join-state enumeration. RFC4601 only defines JOINED and NOTJOINED states. And PRUNE can really be replace by NOTJOINED. Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com> Ticket: CM-14700 Testing Done: Register state machine in FHR only, combined FHR-RP and FHR-RP-LHR/all-in-one setups. Also ran pim-smoke.
2017-03-10pimd: add new/distinct enumeration for pim register stateanuradhak5-40/+42
With the separation of register-state and upstream-join-state we no longer need an enumeration that covers both states. This commit includes the following - 1. Defined new enumeration for reg state (this 1:1 with RFC4601). 2. Dropped JOIN_PENDING enum value from upstream join state. RFC4601 only define two values NOT_JOINED and JOINED for this state. Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com> Ticket: CM-14700 Testing Done: Verified register setup manually and ran pim-smoke
2017-03-10pimd: Separate the register and upstream join states on the FHRanuradhak6-14/+54
On the FHR upstream-join-state is not particularly relevant as we don't need to send upstream JPs for the SG. So that field was being overloaded with the register-state. However some of the events that triggered changes to the JoinDesired macro were accidentally overwriting the state with join info (instead of treating it as register info) confusing the register state machine. To make the PIM RFC macros' implemention simple I have separated out the register-state. And upstream->state now solely describes the upstream-join-state independent of the role of the PIM router. Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com> Ticket: CM-14700 Testing Done: verified pim-register state-machine with separate and combined FHR/RP routers. Also ran pim-smoke.
2017-03-10debian: Allow building the .deb to know about new dependencyDonald Sharp1-2/+2
libc-ares-dev and libc-ares2 are now dependencies to build nhrpd Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-10lib: Fix missed codeDonald Sharp1-1/+2
When converting to new format we missed some code. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-10merge: pre-revert inapplicable changesDavid Lamparter2-5/+11
The following changes do not apply on master because the code has changed: - "vtysh: fix completion" reverts commit 09e61a383facd3c9e3e52162e98302c7cba15ecc. - "Revert "lib: Fix tab completions memleak, memory stats corruption"" reverts commit 4dcee34bd603645e53f8a8265dd263a85422b63d. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-10zebra: Fix specific prefix handlingDonald Sharp1-4/+1
Suppose we are handling the process_workq and either a new static route is installed or a Routing Protocol installs a new route. We will call evaluate_rnh with a specific prefix. We might have a situation where we clear the NHC flag prematurely. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-09lib: handle case specifc types, protect against double free (issue #144)Lou Berger1-0/+2
Signed-off-by: Lou Berger <lberger@labn.net> [DL: dropped changes except the two NULL assignments] Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-09Revert "lib: Fix tab completions memleak, memory stats corruption"David Lamparter1-10/+4
This reverts commit 039dc61292de5f3ed5f46316b1940ab6bb184c3f. The patch actually made the situation worse since the return value from cmd_complete_command_real() was now inconsistently allocated from different memory stat pools. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-09Lowercase frr.confMartín Beauchamp12-30/+30
2017-03-09zebra: Notify all nexthops that we've changedDonald Sharp1-7/+36
Zebra when it was scanning the tree would unset NEXTHOPS_CHANGED after the first notification. If the route we are notifying because of covers multiple interesting nexthops then we would be unable to know that we need to notify for that one as well because of the flag removal. Ticket: CM-15157 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-08pimd: fix clang warningDavid Lamparter1-1/+1
pimd/pim_sock.c:178:13: error: implicit conversion from 'int' to 'char' changes value from 148 to -108 [-Werror,-Wconstant-conversion] ra[0] = 148; Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08watchfrr: make min/max restart interval longoptsDavid Lamparter1-7/+10
-m/-M seem to be seldomly used... ... and I kindof need/want -M for module loading. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08*: fix some user-visible Quagga remnantsDavid Lamparter5-9/+4
(Note: the allow_delete thing is called "zebra" on the commandline because that's the clearest context there, while it is called "FRR" in the CLI because that's considerably less confusing in a vtysh env.) Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08isisd: remove reload-by-reexecDavid Lamparter1-38/+1
This is a quite horrible mechanism... Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08ospfd: remove unused usage() functionDavid Lamparter1-15/+0
... forgot this one in the previous patchset. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08pimd: Don't double include SourceDonald Sharp1-5/+14
When we are adding to a J/P Agg list, don't double add the source. Ticket: CM-15189 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-08pimd: Fix various ifdown/ifup scenarios w/ J/P AggDonald Sharp2-15/+33
There exists situations where we may have cleaned not properly cleaned up the various J/P aggregation lists. This commit fixes those issues. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-08*: fix some option descriptions and make -e workDavid Lamparter3-10/+11
There were some typos in command line help, also the "e:" spec was missing for getopt in zebra/bgpd (even before the refactor). Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08lib: time: remove leftover declarationsDavid Lamparter1-5/+0
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08lib: hide away logging internalsDavid Lamparter13-41/+78
... no need to have struct zlog generally-exposed. A few files get to include log_int.h because they use zlog/vzlog. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08lib: remove remaining struct zlog * argsDavid Lamparter20-68/+56
These don't serve any purpose either. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08lib: simplify protocol/log namingDavid Lamparter18-88/+38
The protocols enum serves no purpose other than adding potential for bugs and making it complicated to add a new protocol... nuke. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08lib: ditch struct zlog * argument on zlog/vzlog()David Lamparter6-24/+19
It's completely useless... Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08*: get rid of zlog(*, LOG_LEVEL, ...)David Lamparter23-160/+142
Result of running the following Coccinelle patch + fixups: <<EOF /* long-forms: zlog(NULL, <level>, ...) * => zlog_level(...) */ @@ expression list args; @@ - zlog(NULL, LOG_DEBUG, args) + zlog_debug(args) @@ expression list args; @@ - zlog(NULL, LOG_NOTICE, args) + zlog_notice(args) @@ expression list args; @@ - zlog(NULL, LOG_INFO, args) + zlog_info(args) @@ expression list args; @@ - zlog(NULL, LOG_WARNING, args) + zlog_warn(args) @@ expression list args; @@ - zlog(NULL, LOG_ERR, args) + zlog_err(args) /* long-forms: zlog(base->log, <level>, ...) * => zlog_level(...) */ @@ expression base; expression list args; @@ - zlog(base->log, LOG_DEBUG, args) + zlog_debug(args) @@ expression base; expression list args; @@ - zlog(base->log, LOG_NOTICE, args) + zlog_notice(args) @@ expression base; expression list args; @@ - zlog(base->log, LOG_INFO, args) + zlog_info(args) @@ expression base; expression list args; @@ - zlog(base->log, LOG_WARNING, args) + zlog_warn(args) @@ expression base; expression list args; @@ - zlog(base->log, LOG_ERR, args) + zlog_err(args) EOF Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08*: add frr_run()David Lamparter12-114/+40
Contains the fetch-and-run-thread logic, and vty startup (which is the last thing happening before entering the main loop). Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-08*: add frr_config_fork()David Lamparter22-667/+220
Centralise read_config/daemonize/dryrun/pidfile/vty_serv into libfrr. This also makes multi-instance pid/config handling available as part of the library. It's only wired up in ospfd, but the code is in lib/. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07*: centralize more into frr_init()David Lamparter12-34/+12
Move CLI/VTY/Memory accounting init into frr_* Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07*: add frr_init() infrastructureDavid Lamparter30-1118/+727
Start centralising startup & option parsing into the library. FRR_DAEMON_INFO is a bit weird, but it will become useful later (e.g. for killing the ZLOG_* enum, and having the daemon name available) Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07vtysh: fix completionDavid Lamparter1-1/+1
The return value from cmd_complete_command is a VECTOR_INDEX, not TMP. Use the appropriate vector_only_index_free(). Fixes #223. Reported-by: https://github.com/k0ste Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07build: only default-enable nhrpd on LinuxDavid Lamparter1-4/+9
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07cumulus, tools: Allow nhrpd to be brought upDonald Sharp3-1/+3
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-07pimd: Add copyright Information to pim_jp_agg.[ch]Donald Sharp2-0/+40
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-07distro/redhat: package nhrpdTimo Teräs1-4/+28
Signed-off-by: Timo Teräs <timo.teras@iki.fi> [DL: adapted for FRR, changed port number 2612->2610] Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07nhrpd: workaround old kernel vs. glibc definition conflicsTimo Teräs1-1/+2
fixes https://bugzilla.quagga.net/show_bug.cgi?id=908 With kernel-headers-3.10.0 we have: In file included from netlink_gre.c:15:0: /usr/include/linux/ipv6.h:19:8: error: redefinition of 'struct in6_pktinfo' struct in6_pktinfo { ^ In file included from netlink_gre.c:10:0: /usr/include/netinet/in.h:536:8: note: originally defined here struct in6_pktinfo ^ In file included from netlink_gre.c:15:0: /usr/include/linux/ipv6.h:24:8: error: redefinition of 'struct ip6_mtuinfo' struct ip6_mtuinfo { ^ In file included from netlink_gre.c:10:0: /usr/include/netinet/in.h:543:8: note: originally defined here struct ip6_mtuinfo So instead of libc's netinet/in.h include kernel's linux/in.h and the add sys/socket.h for struct sockaddr since it does not seem to be defined in kernel headers. Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07doc: add initial nhrpd documentationTimo Teräs8-1/+262
[DL: resolved renaming & conflicts] Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07nhrpd: include headers in dist tarballDavid Lamparter1-0/+12
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07nhrpd: change VTY port 2612->2610David Lamparter1-1/+1
2612 is already in use for ldpd. (Change to SERVICES file resolved in rebasing) Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07nhrpd: adapt to API changesDavid Lamparter12-115/+133
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07nhrpd: implement next hop resolution protocolTimo Teräs45-12/+7791
This provides DMVPN support and integrates to strongSwan. Please read README.nhrpd and README.kernel for more details. [DL: cherry-picked from dafa05e65fe4b3b3ed5525443f554215ba14f42c] [DL: merge partially resolved, this commit will not build.] Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-07bgpd: Clean up bfd memory *before* deleting the peerDonald Sharp1-2/+2
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-07vtysh: Fix cli help string to have only 1 mention of vty_socketDonald Sharp1-1/+0
When you run 'vtysh -h' the option '--vty_socket' is listed twice. Fixes issue #253 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-07bgpd: Only send data if we have something to sendDonald Sharp1-6/+12
When shutting down, only send with data if we have something to send. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-07bgpd: Add json output for last Notification messageDonald Sharp1-0/+14
When we send a shutdown message, add json support to let us see it there too. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-07bgpd: TX shutdown messageDavid Lamparter3-12/+94
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-03-07bgpd: RX shutdown message in "show bgp neighbor"David Lamparter5-5/+59
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 22:47:11 +0100