ripd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripngd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

pimd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospfd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospf6d: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

isisd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: fix vrf argv index numbers

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: compress multiple whitespaces in command string

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: fix hosed CMD_RANGE_STR

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

convert <1-255> to (1-255), ()s to <>s, etc

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

tools: argv_translator convert <1-255> to (1-255), ()s to <>s, etc

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Change {json} to [json]

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: undo <> -> () change I made yesterday

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

tools: alias_destroyer re_install_element None check

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ALIAS removal for bgp, ospf, pim, isis, rip, ripng, lib and zebra

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

tools: added alias_destroyer.py

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: argv update for distribute.c and ns.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

isisd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: argv update for filter.c, if_rmap.c keychain.c and plist.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospf6d: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

pimd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripngd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: argv update for routemap.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: argv update for if.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: argv update for thread.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: argv fixes, XFREE -> free, rm decl in matcher

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: distribute.c, smux.c, vty.c grammar refactor

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

zebra: argv update for all but zebra_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospfd: argv update for all but ospf_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: Remove last remnants of NUMBER_TKN...again

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Revert "lib: Get thread.c to compile"

This reverts commit 9c5f6b578e9c8df1186a89cee51c02348beb480a.

Revert "lib, zebra: Fixup if.c to work in the new regime"

This reverts commit 2511cb40e6b0e88620f26b3506b2a454a773c93d.

Revert "lib: Fix vty.c to compile with new parser"

This reverts commit c1ad0838e8de8184f6122b13472a60dbca009aa7.

Revert "lib: Fixup ns.c"

This reverts commit 5720e4ff9518275b23c28a3107a46d833eb387fa.

Revert "lib: Fixup plist.c"

This reverts commit c65a0fe1c664b5438a13aa1d756c121ff2fb7a80.

Revert "lib: Fixup more files"

This reverts commit f68cec764abf50b35945b907a2e005bc50c50831.

Revert "zebra: Fixup to use the new parser"

This reverts commit 5c94274ff77b7ba53a27ed68eb4b0bcdafba47b2.

Revert "pimd: Convert to the new way of working"

This reverts commit 0564b02e432cba04f1245a5df77c2cf2893b51a3.

Revert "ripd: Fixup code to work under new way"

This reverts commit 224a3ed809ae23539cd49b85ada8516cb0b0a762.

Revert "isisd: Make work under new regime"

This reverts commit 38c249987301aac93bebc0cb7b51784d5827c066.

bgpd: more bgp_vty.c parser conversion

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: argv update for all but bgp_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Added argv_translator.py

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
To use this run:
../tools/argv_translator.py bgp_route.c

It will update the argv[] instances with the corrent index and adds
'->arg'

isisd: Make work under new regime

ripd: Fixup code to work under new way

pimd: Convert to the new way of working

zebra: Fixup to use the new parser

lib: Fixup json code to use struct cmd_token

lib: Fixup more files

Merge branch 'vtysh-grammar' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into vtysh-grammar

lib: Remove NUMBER_TKN leftovers

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Use listnode_add_before for prepending nodes

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Update copyright headers

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Fixup plist.c

lib: Fixup ns.c

lib: Fix vty.c to compile with new parser

lib, zebra: Fixup if.c to work in the new regime

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Get thread.c to compile

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Merge remote-tracking branch 'origin/cmaster-next' into vtysh-grammar

Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/.gitignore
lib/command.c
lib/command.h

bgpd: Additional Show Commands

These commands were ported forward from these
commits:
f9b6c39 bgpd: Add back old forms of 'show <afi> <safi>' for compatibility
bf1ae6c bgpd: drop machineparse / random "show" improvements
651b402 bgpd: encap show commands
35c3686 bgpd: VPNv6 show commands
135ca15 bgpd: cleanup vty bgp_node_afi/safi utils

This is the first drop of those commits.  The files have
changed too much and the diffs to extensive to try to do it
in one piece.  Break it up into smaller code chunks.

Original Code:
Signed-off-by: Lou Berger <lberger@labn.net>
Forward Port:
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Add #define str for JavaScript help string

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

ospfd: Do not print warning on new interface

The new TE functions will always print out a warning
that TE has not been configured on an interface.  This
should be a debug not a warn.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

bgpd: Revert --enable-bgp-standalone

Reverts the --enable-bgp-standalone and makes it so that you
need to use --enable-cumulus to get the cumulus behavior.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Initial refactor pass on CLI backend

Shotgun commit:
* Remove shim sources from Makefile.am
* Move new types to command.c / command.h
* Rewrite command.c / command.h
* Refactor shim types to real types in matcher
  and parser
* Initial refactor pass on vty.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

vtysh: work around gcc bug #69981

The memtypes changes break gcc -O0 build (none of the other optimisation
levels are affected, *any* of -Og, -Os, -O1, etc. make this go away).
Unfortunately, the option supposed to control this doesn't actually work
(-fno-keep-static-const; that not working is the actual gcc bug).

The workaround is to avoid DECLARE_MTYPE statements when their paired
DEFINE_MTYPE isn't linked in.  Thankfully, that's only a problem in a
single place in vtysh where bgp_memory.h gets chain-included.
(vtysh.c -> bgp_vty.h -> bgpd.h -> bgp_memory.h)

So, this just breaks the chain at bgp_vty.h.

No other compiler (clang & icc tested) has exhibited this problem.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

lib: deregister memtypes on exit/unload

This is useful for DSO modules in order to get support for unloading
them dynamically.  It also runs on exit, which doesn't matter much.

At some future point, the code could be extended to check that
allocation counts are 0 on unloading a module.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

build: goodbye, gawk

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: clean/restore memory debugging functions

This adapts the dump-at-exit handler and removes the old leftover code.

(Note the text in log_memtype_stderr was actually incorrect as the only
caller in bgpd cleans up configuration before calling it, i.e. any
remaining allocations are missing-cleanup bugs.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>

*: split & distribute memtypes and stop (re|ab)using lib/ MTYPEs

This is a rather large mechanical commit that splits up the memory types
defined in lib/memtypes.c and distributes them into *_memory.[ch] files
in the individual daemons.

The zebra change is slightly annoying because there is no nice place to
put the #include "zebra_memory.h" statement.

bgpd, ospf6d, isisd and some tests were reusing MTYPEs defined in the
library for its own use.  This is bad practice and would break when the
memtype are made static.

Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
[CF: rebased for cmaster-next]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Christian Franke <chris@opensourcerouting.org>

lib: migrate to new memory-type handling

Move over to the new allocation counting added in the previous commit.

(This commit is mostly mechanical.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>

lib: add new extensible memory-type handling

This rewrites Quagga's memory per-type allocation counting, without
using a fixed global list of types.  Instead, source files can declare
memory types which get handled through constructor functions called by
the dynamic linker during startup.

Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
[DL: v3: forgot "nonnull" attribute on XFREE]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

lib: move memory.[ch] out of the way

The following commit will recreate memory.[ch].

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Allow nesting options in selectors

Options may now be nested in selectors as long
as they are not the first token in sequence.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Add edge removal to graph data structure

Ability to remove directed edge between two nodes.
Also ensures that adjacency vectors have no null entries.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

isisd, lib, vtysh: Allow extract.pl to fully work

The regular expression for finding DEFUN/ALIAS in
extract.pl looks for "DEFUN (" or "ALIAS (" if
the *.c file does not have this then it will just
silently ignore the cli.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

isisd, vtysh: Fix isis routemaps

Apparently extract.pl requires in it's regular expression
a space after the DEFUN or ALIAS before the opening (
or it completely skips the command.  Brilliant?

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

isisd: Remove duplicate "no debug isis lsp-gen"

The code for 'no debug isis lsp-gen' is in
isisd.c twice.  No need for this.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib, bgpd: Remove 'struct fifo' from lib/zebra.h

The 'struct fifo' and it's accompanying #defines do not
belong in lib/zebra.h.  Move them into their own header.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
(cherry picked from commit b0d02889624eaafa0984873dcd78c086418bdf13)

lib: Remove ZEBRA_INTERFACE_RENAME

Api in name only.  No code, so let's remove.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib, ospfd: Remove ospf specific #define from zebra.h

zebra.h should not know or care about ospf specific code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Fix afi mistake

When sending the received route in to be added to the rib,
actually use the correct Address family.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Refactor interface statistic calling

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib, zebra: Remove ZEBRA_IPV[4|6]_IMPORT_NEXTHOP

Zebra api that was never used.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
(cherry picked from commit 33361d3992c8bff66247b76e5adaf4b0de8217df)

lib, zebra: Remove unused zserv/zclient calls

ZEBRA_IPV4_NEXTHOP_LOOKUP and ZEBRA_IPV6_NEXTHOP_LOOKUP
were never used by any protocol.  Remove dead code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
(cherry picked from commit 22cd6214bf44863bfb5a34b40ab4abba3c5c4574)

lib: Make zebra messages types a enum

The #define nature of zebra message types makes
it stupidly difficult to add /remove message
types.  Switch to enum

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
(cherry picked from commit 0d63e3c7df981f5b50f27789672f30987911a8cd)

lib: Add support for selectors inside options

Selectors may be nested inside options [<like|so>].
Removed the ability to make multipart options [like|so].

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

zebra: Pass in vrf to rib_match_ipv4_multicast

Pass around the vrf_id to rib_match_ipv4_multicast
so that proper lookup can be maintained.  Not really
needed yet, but future fixing now.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Fix broken rib_match

rib_match is broken because the prefix is being
treated as a char * pointer instead of the
correct data type.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
(cherry picked from commit 8b5d6c95781b7c55faa957a2d3edf00c1ecb5c5a)

zebra: Refactor nexthop sending

When building a stream of nexthop information,
refactor the code that writes it to 1 function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: Fix memory leak in ipv6_prefix_match

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Update isis_te.[c,h] to newly RFC7810
  draft-ietf-isis-te-metric-extensions-11 has been published as RFC 7810

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
(cherry picked from commit b2d48d2838ef4813f4c7c7d0ce1d55dc25e3acf1)

ospfd: Fix malformed link TLV when LP_USE_BW is set

(cherry picked from commit 6e88e97786e1223e2b59a995ec330c1f49c55b26)

lib: Fix various memory leaks

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

doc: Get isisd.text included properly

When building from a 'make dist' allow
the proper distribution of the new
isisd.texi to build documentation properly.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Fix memory leak in matcher

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Move string completions out of command_match.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>