Merge remote-tracking branch 'origin/stable/2.0'

diff --cc bgpd/Makefile.am
Simple merge

diff --cc bgpd/bgp_nht.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc isisd/Makefile.am
Simple merge

diff --cc ldpd/Makefile.am
index 6dc7c077de861ccb62c5731f3350d6db942cfedd,bf3147d5798b6e656247de6b13f1bffdd9cf585c..42e54138aaa453a3dac83f0faa886a9f80790ebe
--- 1/ldpd/Makefile.am
--- 2/ldpd/Makefile.am
+++ b/ldpd/Makefile.am
@@@ -23,11 -20,8 +23,11 @@@ libldp_a_SOURCES = 
  noinst_HEADERS = \
        control.h lde.h ldpd.h ldpe.h ldp.h log.h ldp_debug.h ldp_vty.h
  
 +ldp_vty_cmds.c: $(srcdir)/ldp_vty.xml $(srcdir)/../tools/xml2cli.pl
 +      @PERL@ $(srcdir)/../tools/xml2cli.pl $(srcdir)/ldp_vty.xml > $@
 +
  ldpd_SOURCES = ldpd.c
- ldpd_LDADD = libldp.a ../lib/libzebra.la @LIBCAP@
+ ldpd_LDADD = libldp.a ../lib/libfrr.la @LIBCAP@
  
  examplesdir = $(exampledir)
  dist_examples_DATA = ldpd.conf.sample

diff --cc lib/Makefile.am
index b6de2c2cd6eb6c94d10770e85f5d15606c103537,f393836cc081889ee33c05fdb72d649ddf00deea..780d4bc1b8386bac505a67d52482648dacc34ebb
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -1,23 -1,16 +1,23 @@@
  ## Process this file with automake to produce Makefile.in.
  
 -AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \
 -            -DVTY_DEPRECATE_INDEX
 +AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
  AM_CFLAGS = $(WERROR)
  DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 +AM_YFLAGS = -d -Dapi.prefix=@BISON_OPENBRACE@cmd_yy@BISON_CLOSEBRACE@ @BISON_VERBOSE@
 +
 +command_lex.h: command_lex.c
 +      @if test ! -f $@; then rm -f command_lex.c; else :; fi
 +      @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) command_lex.c; else :; fi
 +command_parse.lo: command_lex.h
  
- lib_LTLIBRARIES = libzebra.la
- libzebra_la_LDFLAGS = -version-info 0:0:0 
+ lib_LTLIBRARIES = libfrr.la
+ libfrr_la_LDFLAGS = -version-info 0:0:0 
  
- libzebra_la_SOURCES = \
+ libfrr_la_SOURCES = \
        network.c pid_output.c getopt.c getopt1.c \
 -      checksum.c vector.c linklist.c vty.c command.c \
 +      checksum.c vector.c linklist.c vty.c \
 +      graph.c command_parse.y command_lex.l command_match.c \
 +      command.c \
        sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \
        filter.c routemap.c distribute.c stream.c log.c plist.c \
        zclient.c sockopt.c smux.c agentx.c snmp.c md5.c if_rmap.c keychain.c privs.c \
@@@ -31,15 -22,13 +31,15 @@@
        strlcpy.c \
        strlcat.c
  
 -BUILT_SOURCES = route_types.h gitversion.h
 +BUILT_SOURCES = route_types.h gitversion.h command_parse.h command_lex.h
  
- libzebra_la_LIBADD = @LIBCAP@
+ libfrr_la_LIBADD = @LIBCAP@
  
  pkginclude_HEADERS = \
 -      buffer.h checksum.h command.h filter.h getopt.h hash.h \
 +      buffer.h checksum.h filter.h getopt.h hash.h \
        if.h linklist.h log.h \
 +      graph.h command_match.h \
 +      command.h \
        memory.h network.h prefix.h routemap.h distribute.h sockunion.h \
        stream.h table.h thread.h vector.h version.h vty.h zebra.h \
        plist.h zclient.h sockopt.h smux.h md5.h if_rmap.h keychain.h \
@@@ -55,14 -42,8 +55,14 @@@
  noinst_HEADERS = \
        plist_int.h
  
- grammar_sandbox_LDADD = libzebra.la
 +noinst_PROGRAMS = grammar_sandbox
 +
 +grammar_sandbox_SOURCES = grammar_sandbox_main.c
++grammar_sandbox_LDADD = libfrr.la
 +
  EXTRA_DIST = \
        queue.h \
 +      command_lex.h \
        route_types.pl route_types.txt \
        gitversion.pl
  

diff --cc lib/memory.c
Simple merge

diff --cc lib/thread.c
Simple merge

diff --cc lib/thread.h
index a0801e1ecdfad250330628bcd93635ffc57eacc2,3440a929993db912a632ece23797d5147f2d9a5a..49964e7743f6b87f115379fb85234bcd2b481504
--- 1/lib/thread.h
--- 2/lib/thread.h
+++ b/lib/thread.h
@@@ -243,9 -241,18 +243,9 @@@ extern int thread_should_yield (struct 
  /* set yield time for thread */
  extern void thread_set_yield_time (struct thread *, unsigned long);
  
- /* Internal libzebra exports */
+ /* Internal libfrr exports */
  extern void thread_getrusage (RUSAGE_T *);
 -extern struct cmd_element show_thread_cpu_cmd;
 -extern struct cmd_element clear_thread_cpu_cmd;
 -
 -/* replacements for the system gettimeofday(), clock_gettime() and
 - * time() functions, providing support for non-decrementing clock on
 - * all systems, and fully monotonic on /some/ systems.
 - */
 -extern int quagga_gettime (enum quagga_clkid, struct timeval *);
 -extern time_t quagga_monotime (void);
 +extern void thread_cmd_init (void);
  
  /* Returns elapsed real (wall clock) time. */
  extern unsigned long thread_consumed_time(RUSAGE_T *after, RUSAGE_T *before,

diff --cc ospf6d/ospf6_interface.c
Simple merge

diff --cc ospfd/ospf_dump.c
Simple merge

diff --cc ospfd/ospfd.c
Simple merge

diff --cc ospfd/ospfd.h
Simple merge

diff --cc pimd/Makefile.am
Simple merge

diff --cc ripd/ripd.c
Simple merge

diff --cc tests/Makefile.am
index fe33bc5e57bce264fc6c561d11c3e632378afbc0,442635fb790ac7081c153fe6061e211530bc8c7a..bee9feaf1ec19901a53850d6f09e72b75d512308
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -73,27 -72,25 +73,27 @@@ testnexthopiter_SOURCES = test-nexthop-
  testcommands_SOURCES = test-commands-defun.c test-commands.c prng.c
  test_timer_correctness_SOURCES = test-timer-correctness.c prng.c
  test_timer_performance_SOURCES = test-timer-performance.c prng.c
 +test_srcdest_table_SOURCES = test-srcdest-table.c prng.c
  
- testcli_LDADD = ../lib/libzebra.la @LIBCAP@
- testsig_LDADD = ../lib/libzebra.la @LIBCAP@
- testsegv_LDADD = ../lib/libzebra.la @LIBCAP@
- testbuffer_LDADD = ../lib/libzebra.la @LIBCAP@
- testmemory_LDADD = ../lib/libzebra.la @LIBCAP@
- testprivs_LDADD = ../lib/libzebra.la @LIBCAP@
- teststream_LDADD = ../lib/libzebra.la @LIBCAP@
- heavy_LDADD = ../lib/libzebra.la @LIBCAP@ -lm
- heavywq_LDADD = ../lib/libzebra.la @LIBCAP@ -lm
- heavythread_LDADD = ../lib/libzebra.la @LIBCAP@ -lm
- aspathtest_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ -lm
- testbgpcap_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ -lm
- ecommtest_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ -lm
- testbgpmpattr_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ -lm
- testchecksum_LDADD = ../lib/libzebra.la @LIBCAP@ 
- testbgpmpath_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ -lm
- tabletest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm
- testnexthopiter_LDADD = ../lib/libzebra.la @LIBCAP@
- testcommands_LDADD = ../lib/libzebra.la @LIBCAP@
- test_timer_correctness_LDADD = ../lib/libzebra.la @LIBCAP@
- test_timer_performance_LDADD = ../lib/libzebra.la @LIBCAP@
- test_srcdest_table_LDADD = ../lib/libzebra.la @LIBCAP@
+ testcli_LDADD = ../lib/libfrr.la @LIBCAP@
+ testsig_LDADD = ../lib/libfrr.la @LIBCAP@
+ testsegv_LDADD = ../lib/libfrr.la @LIBCAP@
+ testbuffer_LDADD = ../lib/libfrr.la @LIBCAP@
+ testmemory_LDADD = ../lib/libfrr.la @LIBCAP@
+ testprivs_LDADD = ../lib/libfrr.la @LIBCAP@
+ teststream_LDADD = ../lib/libfrr.la @LIBCAP@
+ heavy_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
+ heavywq_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
+ heavythread_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
+ aspathtest_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
+ testbgpcap_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
+ ecommtest_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
+ testbgpmpattr_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
+ testchecksum_LDADD = ../lib/libfrr.la @LIBCAP@ 
+ testbgpmpath_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
+ tabletest_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
+ testnexthopiter_LDADD = ../lib/libfrr.la @LIBCAP@
+ testcommands_LDADD = ../lib/libfrr.la @LIBCAP@
+ test_timer_correctness_LDADD = ../lib/libfrr.la @LIBCAP@
+ test_timer_performance_LDADD = ../lib/libfrr.la @LIBCAP@
++test_srcdest_table_LDADD = ../lib/libfrr.la @LIBCAP@

diff --cc tests/test-commands.c
Simple merge

diff --cc tools/Makefile.am
index c5e8fe9c712381a7881865265e916967fa83ecfb,2f1bfc0604b24064f078aa85c42632e0148066eb..b2d56170c14466df1a530718dc15a33f85b49521
--- 1/tools/Makefile.am
--- 2/tools/Makefile.am
+++ b/tools/Makefile.am
@@@ -1,14 -1,4 +1,14 @@@
- permutations_LDADD = ../lib/libzebra.la
 +AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
 +DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 +AM_CFLAGS = $(WERROR)
 +EXTRA_DIST =
 +
 +bin_PROGRAMS = permutations
 +permutations_SOURCES = permutations.c
++permutations_LDADD = ../lib/libfrr.la
 +
  sbin_SCRIPTS = frr-reload.py frr
  
 -EXTRA_DIST = frr.service frr-reload.py frr
 +EXTRA_DIST += frr.service frr-reload.py frr
  
 +EXTRA_DIST += xml2cli.pl

diff --cc vtysh/Makefile.am
Simple merge

diff --cc watchfrr/watchfrr.c
index 122d6db6d7ee303170152d0ea5745075d9e3a146,83f00252c8bf6b81cdc0ee37c372759c1d00a8ee..f61dd3858b82aad2da9ae22527221767dd21d3d1
--- 1/watchfrr/watchfrr.c
--- 2/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@@ -62,40 -62,44 +62,40 @@@
  
  #define PING_TOKEN    "PING"
  
- /* Needs to be global, referenced somewhere inside libzebra. */
+ /* Needs to be global, referenced somewhere inside libfrr. */
  struct thread_master *master;
  
 -typedef enum
 -{
 -  MODE_MONITOR = 0,
 -  MODE_GLOBAL_RESTART,
 -  MODE_SEPARATE_RESTART,
 -  MODE_PHASED_ZEBRA_RESTART,
 -  MODE_PHASED_ALL_RESTART
 +typedef enum {
 +      MODE_MONITOR = 0,
 +      MODE_GLOBAL_RESTART,
 +      MODE_SEPARATE_RESTART,
 +      MODE_PHASED_ZEBRA_RESTART,
 +      MODE_PHASED_ALL_RESTART
  } watch_mode_t;
  
 -static const char *mode_str[] =
 -{
 -  "monitor",
 -  "global restart",
 -  "individual daemon restart",
 -  "phased zebra restart",
 -  "phased global restart for any failure",
 +static const char *mode_str[] = {
 +      "monitor",
 +      "global restart",
 +      "individual daemon restart",
 +      "phased zebra restart",
 +      "phased global restart for any failure",
  };
  
 -typedef enum
 -{
 -  PHASE_NONE = 0,
 -  PHASE_STOPS_PENDING,
 -  PHASE_WAITING_DOWN,
 -  PHASE_ZEBRA_RESTART_PENDING,
 -  PHASE_WAITING_ZEBRA_UP
 +typedef enum {
 +      PHASE_NONE = 0,
 +      PHASE_STOPS_PENDING,
 +      PHASE_WAITING_DOWN,
 +      PHASE_ZEBRA_RESTART_PENDING,
 +      PHASE_WAITING_ZEBRA_UP
  } restart_phase_t;
  
 -static const char *phase_str[] =
 -{
 -  "None",
 -  "Stop jobs running",
 -  "Waiting for other daemons to come down",
 -  "Zebra restart job running",
 -  "Waiting for zebra to come up",
 -  "Start jobs running",
 +static const char *phase_str[] = {
 +      "None",
 +      "Stop jobs running",
 +      "Waiting for other daemons to come down",
 +      "Zebra restart job running",
 +      "Waiting for zebra to come up",
 +      "Start jobs running",
  };
  
  #define PHASE_TIMEOUT (3*gs.restart_timeout)

diff --cc zebra/Makefile.am
index 428090d4887c53e47f98e36b50bc65f3273c4569,f6a056e3f0c4bc4a9ea602cccfbf30c5aeaccd46..1910e7b80f0871e02df885870d70f1eff83bd71b
--- 1/zebra/Makefile.am
--- 2/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@@ -60,11 -61,11 +60,11 @@@ noinst_HEADERS = 
        rt_netlink.h zebra_fpm.h zebra_fpm_private.h zebra_rnh.h \
        zebra_ptm_redistribute.h zebra_ptm.h zebra_routemap.h \
        zebra_ns.h zebra_vrf.h ioctl_solaris.h zebra_static.h zebra_mpls.h \
 -      kernel_netlink.h if_netlink.h
 +      kernel_netlink.h if_netlink.h zebra_mroute.h
  
- zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(Q_FPM_PB_CLIENT_LDOPTS)
+ zebra_LDADD = $(otherobj) ../lib/libfrr.la $(LIBCAP) $(Q_FPM_PB_CLIENT_LDOPTS)
  
- testzebra_LDADD = ../lib/libzebra.la $(LIBCAP)
+ testzebra_LDADD = ../lib/libfrr.la $(LIBCAP)
  
  zebra_DEPENDENCIES = $(otherobj)
  

diff --cc zebra/test_main.c
Simple merge