*: Convert libzebra -> libfrr

The library libzebra that is installed with FRR will
conflict with Quagga.  So let's rename it to libfrr.

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

diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index 69c0504af45145f519ba3714b65cdb757b5719e7..b91d23baf69ca66ea7b02446a312af62650a83f6 100644 (file)
--- a/bgpd/Makefile.am
+++ b/bgpd/Makefile.am
@@ -91,11 +91,11 @@ noinst_HEADERS = \
        $(BGP_VNC_RFAPI_HD) 
 
 bgpd_SOURCES = bgp_main.c
-bgpd_LDADD = libbgp.a  $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ @LIBM@
+bgpd_LDADD = libbgp.a  $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ @LIBM@
 bgpd_LDFLAGS = $(BGP_VNC_RFP_LD_FLAGS)
 
 bgp_btoa_SOURCES = bgp_btoa.c
-bgp_btoa_LDADD = libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libzebra.la @LIBCAP@ @LIBM@
+bgp_btoa_LDADD = libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ @LIBM@
 bgp_btoa_LDFLAGS = $(BGP_VNC_RFP_LD_FLAGS)
 
 examplesdir = $(exampledir)

diff --git a/bgpd/rfp-example/rfptest/Makefile.am b/bgpd/rfp-example/rfptest/Makefile.am
index a1001e4ef1b951c4fbb38f523a6fb7ebf65ea6e4..f5db852dbb0781cca1753a217721b113bf9858be 100644 (file)
--- a/bgpd/rfp-example/rfptest/Makefile.am
+++ b/bgpd/rfp-example/rfptest/Makefile.am
@@ -48,5 +48,5 @@ sbin_PROGRAMS = $(RFPTEST_BIN)
 
 examplesdir = $(exampledir)
  
-rfptest_LDADD = $(top_builddir)/lib/libzebra.la $(BGP_VNC_RFP_LIB)
+rfptest_LDADD = $(top_builddir)/lib/libfrr.la $(BGP_VNC_RFP_LIB)
 dist_examples_DATA = 

diff --git a/configure.ac b/configure.ac
index da22962577f5598872293c0604e8d14aa6aaa07f..cd88e30c7841f95bda0b8215300a285c9e63c83a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1611,7 +1611,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
          doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile
          pimd/Makefile
          tests/bgpd.tests/Makefile
-         tests/libzebra.tests/Makefile
+         tests/libfrr.tests/Makefile
          redhat/Makefile
          tools/Makefile
          cumulus/Makefile

diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides
index 42a51b5e69282bb3b2e418e5cb688abe804898c2..027fc2a1d695af1418d83c18e40de8b773ab4116 100644 (file)
--- a/debian/frr.lintian-overrides
+++ b/debian/frr.lintian-overrides
@@ -1,4 +1,4 @@
 frr: non-dev-pkg-with-shlib-symlink usr/lib/libospfapiclient.so.0.0.0 usr/lib/libospfapiclient.so
 frr: non-dev-pkg-with-shlib-symlink usr/lib/libospf.so.0.0.0 usr/lib/libospf.so
-frr: non-dev-pkg-with-shlib-symlink usr/lib/libzebra.so.0.0.0 usr/lib/libzebra.so
-frr: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libzebra0
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr.so.0.0.0 usr/lib/libfrr.so
+frr: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libfrr0

diff --git a/isisd/Makefile.am b/isisd/Makefile.am
index 05f96c38071da0cbd00d85c6964a5b04fff9b138..334107a2a0d433055fc24c68b511bd23d782e1ee 100644 (file)
--- a/isisd/Makefile.am
+++ b/isisd/Makefile.am
@@ -32,7 +32,7 @@ isisd_SOURCES = \
        isis_main.c $(libisis_a_SOURCES) \
        isis_bpf.c isis_dlpi.c isis_pfpacket.c
 
-isisd_LDADD = ../lib/libzebra.la @LIBCAP@
+isisd_LDADD = ../lib/libfrr.la @LIBCAP@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = isisd.conf.sample

diff --git a/ldpd/Makefile.am b/ldpd/Makefile.am
index 1f4d910192b2d1bf35ff4a7a7a7e66c864eb0131..bf3147d5798b6e656247de6b13f1bffdd9cf585c 100644 (file)
--- a/ldpd/Makefile.am
+++ b/ldpd/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = \
        control.h lde.h ldpd.h ldpe.h ldp.h log.h ldp_debug.h ldp_vty.h
 
 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 --git a/lib/Makefile.am b/lib/Makefile.am
index 72395068137f86669e2d180ceaaff10353450917..f393836cc081889ee33c05fdb72d649ddf00deea 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,10 +5,10 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \
 AM_CFLAGS = $(WERROR)
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 
-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 \
        sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \
@@ -24,7 +24,7 @@ libzebra_la_SOURCES = \
 
 BUILT_SOURCES = route_types.h gitversion.h
 
-libzebra_la_LIBADD = @LIBCAP@
+libfrr_la_LIBADD = @LIBCAP@
 
 pkginclude_HEADERS = \
        buffer.h checksum.h command.h filter.h getopt.h hash.h \

diff --git a/lib/linklist.h b/lib/linklist.h
index e99e50f4fa8f975cd53eef0567c18d7d0096d6b0..052025a86c316d2ec3cce811bc920dbd426bc684 100644 (file)
--- a/lib/linklist.h
+++ b/lib/linklist.h
@@ -137,7 +137,7 @@ extern void list_add_list (struct list *, struct list *);
 
 /* Deprecated: 20050406 */
 #if !defined(QUAGGA_NO_DEPRECATED_INTERFACES)
-#warning "Using deprecated libzebra interfaces"
+#warning "Using deprecated libfrr interfaces"
 #define LISTNODE_ADD(L,N) LISTNODE_ATTACH(L,N)
 #define LISTNODE_DELETE(L,N) LISTNODE_DETACH(L,N)
 #define nextnode(X) ((X) = (X)->next)

diff --git a/lib/memory.c b/lib/memory.c
index f17915486c1fa2034394c99f01b26fc870b55c08..45aaf7d79748c907c6d3a41b0290b370c1e06b57 100644 (file)
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -23,7 +23,7 @@
 static struct memgroup *mg_first = NULL;
 struct memgroup **mg_insert = &mg_first;
 
-DEFINE_MGROUP(LIB, "libzebra")
+DEFINE_MGROUP(LIB, "libfrr")
 DEFINE_MTYPE(LIB, TMP, "Temporary memory")
 
 static inline void

diff --git a/lib/thread.h b/lib/thread.h
index e41e96dec21023cf4fb4966465bbf431f6bbe16d..3440a929993db912a632ece23797d5147f2d9a5a 100644 (file)
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -242,7 +242,7 @@ extern unsigned long timeval_elapsed (struct timeval a, struct timeval b);
 /* 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;

diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am
index 7551503dae169df4acdaf30fa173c8c46b40ca0f..06fc7a30afe969ed453a4754163bcd7bdd510de7 100644 (file)
--- a/ospf6d/Makefile.am
+++ b/ospf6d/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS = \
 ospf6d_SOURCES = \
        ospf6_main.c $(libospf6_a_SOURCES)
 
-ospf6d_LDADD = ../lib/libzebra.la @LIBCAP@
+ospf6d_LDADD = ../lib/libfrr.la @LIBCAP@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = ospf6d.conf.sample

diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
index 1fca431a10175ea6f5112f46add537211a8f4af4..003918ffc720a3d9fa84ddb3f909618c10ee4162 100644 (file)
--- a/ospfclient/Makefile.am
+++ b/ospfclient/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = $(WERROR)
 
 lib_LTLIBRARIES = libospfapiclient.la
 libospfapiclient_la_LDFLAGS = -version-info 0:0:0
-libospfapiclient_la_LIBADD = ../ospfd/libospf.la ../lib/libzebra.la
+libospfapiclient_la_LIBADD = ../ospfd/libospf.la ../lib/libfrr.la
 
 sbin_PROGRAMS = ospfclient
 
@@ -21,7 +21,7 @@ ospfclient_SOURCES = \
        ospfclient.c
 
 ospfclient_LDADD = libospfapiclient.la \
-       ../ospfd/libospf.la ../lib/libzebra.la @LIBCAP@
+       ../ospfd/libospf.la ../lib/libfrr.la @LIBCAP@
 
 ospfclient_CFLAGS = $(AM_CFLAGS)
 ospfclient_LDFLAGS = $(AM_LDFLAGS)

diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c
index 1716ebeca7b30ad2ee6a083ee3454a4799864834..9a77a64cc418523d5f5d5eccde098c4345008513 100644 (file)
--- a/ospfclient/ospfclient.c
+++ b/ospfclient/ospfclient.c
@@ -52,7 +52,7 @@ struct zebra_privs_t ospfd_privs =
 };
 
 /* The following includes are specific to this application. For
-   example it uses threads from libzebra, however your application is
+   example it uses threads from libfrr, however your application is
    free to use any thread library (like pthreads). */
 
 #include "ospfd/ospf_dump.h" /* for ospf_lsa_header_dump */

diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 62db350c5bcf1666cf5457ddabb816d236902c25..23c69b6f8f0e9ef84b000bfdc20e03df45a6e56c 100644 (file)
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -7,7 +7,7 @@ INSTALL_SDATA=@INSTALL@ -m 600
 
 lib_LTLIBRARIES = libospf.la
 libospf_la_LDFLAGS = -version-info 0:0:0
-libospf_la_LIBADD = ../lib/libzebra.la
+libospf_la_LIBADD = ../lib/libfrr.la
 
 sbin_PROGRAMS = ospfd
 
@@ -33,7 +33,7 @@ noinst_HEADERS = \
 
 ospfd_SOURCES = ospf_main.c
 
-ospfd_LDADD = libospf.la ../lib/libzebra.la @LIBCAP@ @LIBM@
+ospfd_LDADD = libospf.la ../lib/libfrr.la @LIBCAP@ @LIBM@
 
 EXTRA_DIST = OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
 

diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index bc28aa1e929a24ba47eb19be0f28b088436ddcb4..14c4a76ac9b0aa27f4b2ade2714d42ea000d9d2c 100644 (file)
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -72,8 +72,8 @@ pimd_SOURCES = \
 test_igmpv3_join_SOURCES = \
        test_igmpv3_join.c
 
-pimd_LDADD = ../lib/libzebra.la @LIBCAP@
-test_igmpv3_join_LDADD = ../lib/libzebra.la
+pimd_LDADD = ../lib/libfrr.la @LIBCAP@
+test_igmpv3_join_LDADD = ../lib/libfrr.la
 
 examplesdir = $(exampledir)
 dist_examples_DATA = pimd.conf.sample

diff --git a/pimd/TODO b/pimd/TODO
index 4c0f183100486c4bb0e0fa26df2fd05a314c6f59..57d2a17b5f6b58183f679012fdfb798df93dd773 100644 (file)
--- a/pimd/TODO
+++ b/pimd/TODO
@@ -144,7 +144,7 @@ T22 DONE IGMP must be protected against adding looped MFC entries
     created by both source and receiver attached to the same
     interface.
 
-T23 DONE libzebra crash after zclient_lookup_nexthop.
+T23 DONE libfrr crash after zclient_lookup_nexthop.
     See mailing list post:
     http://lists.nongnu.org/archive/html/qpimd-users/2009-04/msg00008.html
 

diff --git a/ripd/Makefile.am b/ripd/Makefile.am
index e7073a79026b24b300c1e8ffe63a50e0d19964ce..7967ff1535767e3d9ca6a3862f58fa19558785b9 100644 (file)
--- a/ripd/Makefile.am
+++ b/ripd/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = \
 ripd_SOURCES = \
        rip_main.c $(librip_a_SOURCES)
 
-ripd_LDADD = ../lib/libzebra.la @LIBCAP@
+ripd_LDADD = ../lib/libfrr.la @LIBCAP@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = ripd.conf.sample

diff --git a/ripngd/Makefile.am b/ripngd/Makefile.am
index c08e58a90c66cff03506396e6bbf974c06f6e8ad..3a4be999a72a76262fefcb9cad7b962b4fd0cd52 100644 (file)
--- a/ripngd/Makefile.am
+++ b/ripngd/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = \
 ripngd_SOURCES = \
        ripng_main.c $(libripng_a_SOURCES)
 
-ripngd_LDADD = ../lib/libzebra.la @LIBCAP@
+ripngd_LDADD = ../lib/libfrr.la @LIBCAP@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = ripngd.conf.sample

diff --git a/solaris/prototype.dev.in b/solaris/prototype.dev.in
index dd3ae399aeb35473cbcdc529391e31128dd6bac1..8bc3b3156ae0172df9884ad6c1a2a9eb151b0c49 100644 (file)
--- a/solaris/prototype.dev.in
+++ b/solaris/prototype.dev.in
@@ -1,8 +1,8 @@
 i pkginfo=$abs_builddir/pkginfo.dev.full
 i depend=$abs_builddir/depend.dev
 i copying=$abs_top_srcdir/COPYING
-f none @libdir@/libzebra.la=$DESTDIR/@libdir@/libzebra.la 0755 root bin
-f none @libdir@/libzebra.a=$DESTDIR/@libdir@/libzebra.a 0644 root bin
+f none @libdir@/libfrr.la=$DESTDIR/@libdir@/libfrr.la 0755 root bin
+f none @libdir@/libfrr.a=$DESTDIR/@libdir@/libfrr.a 0644 root bin
 f none @libdir@/libospf.la=$DESTDIR/@libdir@/libospf.la 0755 root bin
 f none @libdir@/libospf.a=$DESTDIR/@libdir@/libospf.a 0644 root bin
 f none @libdir@/libospfapiclient.la=$DESTDIR/@libdir@/libospfapiclient.la 0755 root bin

diff --git a/solaris/prototype.libs.in b/solaris/prototype.libs.in
index 71f4fd5cfc5880ac5a5df1194b6173269896408a..20aba05e499a61a9cf484e1fd9b5489e4b2982c7 100644 (file)
--- a/solaris/prototype.libs.in
+++ b/solaris/prototype.libs.in
@@ -2,9 +2,9 @@ i pkginfo=$abs_builddir/pkginfo.libs.full
 i depend=$abs_builddir/depend.libs
 i copying=$abs_top_srcdir/COPYING
 d none @libdir@=$DESTDIR/@libdir@ 0755 root bin
-s none @libdir@/libzebra.so.0=libzebra.so.0.0.0
-f none @libdir@/libzebra.so.0.0.0=$DESTDIR/@libdir@/libzebra.so.0.0.0 0755 root bin
-s none @libdir@/libzebra.so=libzebra.so.0.0.0
+s none @libdir@/libfrr.so.0=libfrr.so.0.0.0
+f none @libdir@/libfrr.so.0.0.0=$DESTDIR/@libdir@/libfrr.so.0.0.0 0755 root bin
+s none @libdir@/libfrr.so=libfrr.so.0.0.0
 s none @libdir@/libospf.so.0=libospf.so.0.0.0
 f none @libdir@/libospf.so.0.0.0=$DESTDIR/@libdir@/libospf.so.0.0.0 0755 root bin
 s none @libdir@/libospf.so=libospf.so.0.0.0

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 76280f7189da27472e7d78bda56c5846c329fb6d..442635fb790ac7081c153fe6061e211530bc8c7a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,14 @@
 AUTOMAKE_OPTIONS    = dejagnu
-DEJATOOL = libzebra
+DEJATOOL = libfrr
 
 SUBDIRS = \
        bgpd.tests \
-       libzebra.tests
+       libfrr.tests
 
 EXTRA_DIST = \
        config/unix.exp \
        lib/bgpd.exp \
-       lib/libzebra.exp \
+       lib/libfrr.exp \
        global-conf.exp \
        testcommands.in \
        testcommands.refout \
@@ -73,24 +73,24 @@ 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
 
-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@
+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@

diff --git a/tests/lib/libfrr.exp b/tests/lib/libfrr.exp
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/lib/libzebra.exp b/tests/lib/libzebra.exp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/libfrr.tests/Makefile.am b/tests/libfrr.tests/Makefile.am
new file mode 100644 (file)
index 0000000..4b74e2d
--- /dev/null
+++ b/tests/libfrr.tests/Makefile.am
@@ -0,0 +1,6 @@
+EXTRA_DIST = \
+       tabletest.exp \
+       test-timer-correctness.exp \
+       testcommands.exp \
+       testcli.exp \
+       testnexthopiter.exp

diff --git a/tests/libfrr.tests/tabletest.exp b/tests/libfrr.tests/tabletest.exp
new file mode 100644 (file)
index 0000000..7496994
--- /dev/null
+++ b/tests/libfrr.tests/tabletest.exp
@@ -0,0 +1,9 @@
+set timeout 10
+set testprefix "tabletest "
+set aborted 0
+
+spawn sh -c "exec ./tabletest 2>/dev/null"
+
+for {set i 0} {$i <  6} {incr i 1} { onesimple "cmp $i" "Verifying cmp"; }
+for {set i 0} {$i < 11} {incr i 1} { onesimple "succ $i" "Verifying successor"; }
+onesimple "pause" "Verified pausing"

diff --git a/tests/libfrr.tests/test-timer-correctness.exp b/tests/libfrr.tests/test-timer-correctness.exp
new file mode 100644 (file)
index 0000000..570150c
--- /dev/null
+++ b/tests/libfrr.tests/test-timer-correctness.exp
@@ -0,0 +1,7 @@
+set timeout 10
+set testprefix "test-timer-correctness"
+set aborted 0
+
+spawn sh -c "exec ./test-timer-correctness 2>/dev/null"
+
+onesimple "" "Expected output and actual output match."

diff --git a/tests/libfrr.tests/testcli.exp b/tests/libfrr.tests/testcli.exp
new file mode 100644 (file)
index 0000000..778bd0c
--- /dev/null
+++ b/tests/libfrr.tests/testcli.exp
@@ -0,0 +1,23 @@
+set timeout 30
+set test_name "testcli"
+
+spawn sh -c "./testcli < $env(srcdir)/testcli.in | diff -au $env(srcdir)/testcli.refout -"
+
+expect {
+       eof {
+       }
+       timeout {
+               exp_close
+               fail "$test_name: timeout"
+       }
+}
+
+catch wait result
+set os_error    [lindex $result 2]
+set exit_status [lindex $result 3]
+
+if { $os_error == 0 && $exit_status == 0 } {
+       pass "$test_name"
+} else {
+       fail "$test_name"
+}

diff --git a/tests/libfrr.tests/testcommands.exp b/tests/libfrr.tests/testcommands.exp
new file mode 100644 (file)
index 0000000..c5d5a00
--- /dev/null
+++ b/tests/libfrr.tests/testcommands.exp
@@ -0,0 +1,31 @@
+set timeout 30
+set test_name "testcommands"
+
+if {![info exists env(QUAGGA_TEST_COMMANDS)]} {
+       # sadly, the test randomly fails when configure parameters differ from
+       # what was used to create testcommands.refout.  this can be fixed by
+       # shipping a matching vtysh_cmd.c, which we'll add after 0.99.23
+       pass "$test_name"
+       return 0
+}
+
+spawn sh -c "./testcommands -e 0 < $env(srcdir)/testcommands.in | diff -au - $env(srcdir)/testcommands.refout"
+
+expect {
+       eof {
+       }
+       timeout {
+               exp_close
+               fail "$test_name: timeout"
+       }
+}
+
+catch wait result
+set os_error    [lindex $result 2]
+set exit_status [lindex $result 3]
+
+if { $os_error == 0 && $exit_status == 0 } {
+       pass "$test_name"
+} else {
+       fail "$test_name"
+}

diff --git a/tests/libfrr.tests/testnexthopiter.exp b/tests/libfrr.tests/testnexthopiter.exp
new file mode 100644 (file)
index 0000000..777b753
--- /dev/null
+++ b/tests/libfrr.tests/testnexthopiter.exp
@@ -0,0 +1,8 @@
+set timeout 10
+set testprefix "testnexthopiter "
+set aborted 0
+
+spawn sh -c "exec ./testnexthopiter 2>/dev/null"
+
+onesimple "simple" "Simple test passed."
+onesimple "prng" "PRNG test passed."

diff --git a/tests/libfrr.tests/teststream.exp b/tests/libfrr.tests/teststream.exp
new file mode 100644 (file)
index 0000000..c977bb4
--- /dev/null
+++ b/tests/libfrr.tests/teststream.exp
@@ -0,0 +1,28 @@
+set timeout 10
+spawn sh -c "exec ./teststream 2>/dev/null"
+
+expect {
+       "endp: 15, readable: 15, writeable: 1009" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "0xef 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "endp: 15, readable: 15, writeable: 0" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "0xef 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "c: 0xef" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "w: 0xbeef" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "l: 0xdeadbeef" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+expect {
+       "q: 0xdeadbeefdeadbeef" { }
+       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
+pass "teststream"

diff --git a/tests/libzebra.tests/Makefile.am b/tests/libzebra.tests/Makefile.am
deleted file mode 100644 (file)
index 4b74e2d..0000000
--- a/tests/libzebra.tests/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = \
-       tabletest.exp \
-       test-timer-correctness.exp \
-       testcommands.exp \
-       testcli.exp \
-       testnexthopiter.exp

diff --git a/tests/libzebra.tests/tabletest.exp b/tests/libzebra.tests/tabletest.exp
deleted file mode 100644 (file)
index 7496994..0000000
--- a/tests/libzebra.tests/tabletest.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-set timeout 10
-set testprefix "tabletest "
-set aborted 0
-
-spawn sh -c "exec ./tabletest 2>/dev/null"
-
-for {set i 0} {$i <  6} {incr i 1} { onesimple "cmp $i" "Verifying cmp"; }
-for {set i 0} {$i < 11} {incr i 1} { onesimple "succ $i" "Verifying successor"; }
-onesimple "pause" "Verified pausing"

diff --git a/tests/libzebra.tests/test-timer-correctness.exp b/tests/libzebra.tests/test-timer-correctness.exp
deleted file mode 100644 (file)
index 570150c..0000000
--- a/tests/libzebra.tests/test-timer-correctness.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-set timeout 10
-set testprefix "test-timer-correctness"
-set aborted 0
-
-spawn sh -c "exec ./test-timer-correctness 2>/dev/null"
-
-onesimple "" "Expected output and actual output match."

diff --git a/tests/libzebra.tests/testcli.exp b/tests/libzebra.tests/testcli.exp
deleted file mode 100644 (file)
index 778bd0c..0000000
--- a/tests/libzebra.tests/testcli.exp
+++ /dev/null
@@ -1,23 +0,0 @@
-set timeout 30
-set test_name "testcli"
-
-spawn sh -c "./testcli < $env(srcdir)/testcli.in | diff -au $env(srcdir)/testcli.refout -"
-
-expect {
-       eof {
-       }
-       timeout {
-               exp_close
-               fail "$test_name: timeout"
-       }
-}
-
-catch wait result
-set os_error    [lindex $result 2]
-set exit_status [lindex $result 3]
-
-if { $os_error == 0 && $exit_status == 0 } {
-       pass "$test_name"
-} else {
-       fail "$test_name"
-}

diff --git a/tests/libzebra.tests/testcommands.exp b/tests/libzebra.tests/testcommands.exp
deleted file mode 100644 (file)
index c5d5a00..0000000
--- a/tests/libzebra.tests/testcommands.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-set timeout 30
-set test_name "testcommands"
-
-if {![info exists env(QUAGGA_TEST_COMMANDS)]} {
-       # sadly, the test randomly fails when configure parameters differ from
-       # what was used to create testcommands.refout.  this can be fixed by
-       # shipping a matching vtysh_cmd.c, which we'll add after 0.99.23
-       pass "$test_name"
-       return 0
-}
-
-spawn sh -c "./testcommands -e 0 < $env(srcdir)/testcommands.in | diff -au - $env(srcdir)/testcommands.refout"
-
-expect {
-       eof {
-       }
-       timeout {
-               exp_close
-               fail "$test_name: timeout"
-       }
-}
-
-catch wait result
-set os_error    [lindex $result 2]
-set exit_status [lindex $result 3]
-
-if { $os_error == 0 && $exit_status == 0 } {
-       pass "$test_name"
-} else {
-       fail "$test_name"
-}

diff --git a/tests/libzebra.tests/testnexthopiter.exp b/tests/libzebra.tests/testnexthopiter.exp
deleted file mode 100644 (file)
index 777b753..0000000
--- a/tests/libzebra.tests/testnexthopiter.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-set timeout 10
-set testprefix "testnexthopiter "
-set aborted 0
-
-spawn sh -c "exec ./testnexthopiter 2>/dev/null"
-
-onesimple "simple" "Simple test passed."
-onesimple "prng" "PRNG test passed."

diff --git a/tests/libzebra.tests/teststream.exp b/tests/libzebra.tests/teststream.exp
deleted file mode 100644 (file)
index c977bb4..0000000
--- a/tests/libzebra.tests/teststream.exp
+++ /dev/null
@@ -1,28 +0,0 @@
-set timeout 10
-spawn sh -c "exec ./teststream 2>/dev/null"
-
-expect {
-       "endp: 15, readable: 15, writeable: 1009" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "0xef 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "endp: 15, readable: 15, writeable: 0" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "0xef 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "c: 0xef" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "w: 0xbeef" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "l: 0xdeadbeef" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-expect {
-       "q: 0xdeadbeefdeadbeef" { }
-       eof { fail "teststream"; exit; } timeout { fail "teststream"; exit; } }
-pass "teststream"

diff --git a/tests/test-commands.c b/tests/test-commands.c
index b4613a567d010637a5f1cb31664f52d86b67b840..802002e861c454af5650ac7887b48243f28ef985 100644 (file)
--- a/tests/test-commands.c
+++ b/tests/test-commands.c
@@ -44,7 +44,7 @@ extern vector cmdvec;
 extern struct cmd_node vty_node;
 extern void test_init_cmd(void); /* provided in test-commands-defun.c */
 
-struct thread_master *master; /* dummy for libzebra*/
+struct thread_master *master; /* dummy for libfrr*/
 
 static vector test_cmds;
 static char test_buf[32768];

diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 090382b99beab5fd6cd95845e8d49708d06f3fe6..b85723aa05bdaca3a4940beb8f38f49bad4f6aaa 100644 (file)
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -30,7 +30,7 @@ vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c
 nodist_vtysh_SOURCES = vtysh_cmd.c
 CLEANFILES = vtysh_cmd.c
 noinst_HEADERS = vtysh.h vtysh_user.h
-vtysh_LDADD = ../lib/libzebra.la @LIBCAP@ @LIBREADLINE@
+vtysh_LDADD = ../lib/libfrr.la @LIBCAP@ @LIBREADLINE@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = vtysh.conf.sample

diff --git a/watchfrr/Makefile.am b/watchfrr/Makefile.am
index 51851b0165e1f810e419d18fe0262f9d9d7a8237..abe2266f20394d73c81f5ba8ee006b60ce3d1205 100644 (file)
--- a/watchfrr/Makefile.am
+++ b/watchfrr/Makefile.am
@@ -10,4 +10,4 @@ sbin_PROGRAMS = watchfrr
 noinst_HEADERS = watchfrr.h
 
 watchfrr_SOURCES = watchfrr.c watchfrr_vty.c
-watchfrr_LDADD = ../lib/libzebra.la @LIBCAP@
+watchfrr_LDADD = ../lib/libfrr.la @LIBCAP@

diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 903e2bbe91f727f65b9380efb6f49e5891ac9751..83f00252c8bf6b81cdc0ee37c372759c1d00a8ee 100644 (file)
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -62,7 +62,7 @@
 
 #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

diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index d1c160ade6f6b1cac94d14d0e5dac08e20882987..f6a056e3f0c4bc4a9ea602cccfbf30c5aeaccd46 100644 (file)
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -63,9 +63,9 @@ noinst_HEADERS = \
        zebra_ns.h zebra_vrf.h ioctl_solaris.h zebra_static.h zebra_mpls.h \
        kernel_netlink.h if_netlink.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)
 
@@ -78,7 +78,7 @@ EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c \
        zebra_mpls_netlink.c zebra_mpls_openbsd.c \
        GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB
 
-client : client_main.o ../lib/libzebra.la
+client : client_main.o ../lib/libfrr.la
        $(CC) -g -o client client_main.o ../liblzebra.la $(LIBS) $(LIB_IPV6)
 
 quaggaconfdir = $(sysconfdir)

diff --git a/zebra/main.c b/zebra/main.c
index a68e8adeb6a25a04be3d45aa5aac8dc8aad24d2b..79c9ea7023fedd568d76ea9ff3c6fb488a37a50e 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -63,7 +63,7 @@ pid_t pid;
 /* VTY Socket prefix */
 char vty_sock_path[MAXPATHLEN] = ZEBRA_VTYSH_PATH;
 
-/* Pacify zclient.o in libzebra, which expects this variable. */
+/* Pacify zclient.o in libfrr, which expects this variable. */
 struct thread_master *master;
 
 /* Route retain mode flag. */

diff --git a/zebra/test_main.c b/zebra/test_main.c
index 76ce92c370881e2e6b500e6c869947f16cb84b35..0f7e1a22becfe68a242efe3834a8df333ccaeb69 100644 (file)
--- a/zebra/test_main.c
+++ b/zebra/test_main.c
@@ -56,7 +56,7 @@ int allow_delete = 0;
 /* zebra_rib's workqueue hold time. Private export for use by test code only */
 extern int rib_process_hold_time;
 
-/* Pacify zclient.o in libzebra, which expects this variable. */
+/* Pacify zclient.o in libfrr, which expects this variable. */
 struct thread_master *master;
 
 /* Command line options. */