summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEverton Marques <everton.marques@gmail.com>2014-06-25 15:54:03 -0300
committerDavid Lamparter <equinox@opensourcerouting.org>2015-02-04 06:07:56 +0100
commitff57d3653efe4a1428147204b54cacf3651c4dd0 (patch)
tree0b9ae54ba0da0f9a0391830445751495a248f11b
parent829198800217fe321faa397d21e2d8f99fcaf0dd (diff)
downloadquagga-ff57d3653efe4a1428147204b54cacf3651c4dd0.tar.bz2
quagga-ff57d3653efe4a1428147204b54cacf3651c4dd0.tar.xz
pimd: Fixes to build against current quagga.
-rwxr-xr-xconfigure.ac1
-rw-r--r--doc/Makefile.am2
-rw-r--r--lib/zclient.c2
-rw-r--r--lib/zclient.h1
-rw-r--r--lib/zebra.h16
-rw-r--r--pimd/Makefile.am6
-rw-r--r--pimd/pim_main.c1
-rw-r--r--pimd/pim_signals.c5
8 files changed, 15 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 7696bd70..6632e543 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1369,6 +1369,7 @@ case "${enable_pimd}" in
"no" ) PIMD="";;
* ) ;;
esac
+AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd")
# XXX Perhaps auto-enable on Solaris, but that's messy for cross builds.
case "${enable_solaris}" in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8869c818..dfc5e402 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -61,6 +61,8 @@ quagga_TEXINFOS = appendix.texi babeld.texi basic.texi bgpd.texi filter.texi \
.dia.png:
$(DIATOPNG) "$@" $<
+man_MANS =
+
if PIMD
man_MANS += pimd.8
endif
diff --git a/lib/zclient.c b/lib/zclient.c
index 3b5477e9..709d9b98 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -148,7 +148,7 @@ zclient_reset (struct zclient *zclient)
#ifdef HAVE_TCP_ZEBRA
/* Make socket to zebra daemon. Return zebra socket. */
-static int
+int
zclient_socket(void)
{
int sock;
diff --git a/lib/zclient.h b/lib/zclient.h
index a660bbf1..b0b76444 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -132,6 +132,7 @@ extern void zclient_stop (struct zclient *);
extern void zclient_reset (struct zclient *);
extern void zclient_free (struct zclient *);
+extern int zclient_socket(void);
extern int zclient_socket_connect (struct zclient *);
extern void zclient_serv_path_set (char *path);
diff --git a/lib/zebra.h b/lib/zebra.h
index 67d714cf..57e591ff 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -435,20 +435,8 @@ struct in_pktinfo
*/
#define ZEBRA_HEADER_MARKER 255
-/* Zebra route's types. */
-#define ZEBRA_ROUTE_SYSTEM 0
-#define ZEBRA_ROUTE_KERNEL 1
-#define ZEBRA_ROUTE_CONNECT 2
-#define ZEBRA_ROUTE_STATIC 3
-#define ZEBRA_ROUTE_RIP 4
-#define ZEBRA_ROUTE_RIPNG 5
-#define ZEBRA_ROUTE_OSPF 6
-#define ZEBRA_ROUTE_OSPF6 7
-#define ZEBRA_ROUTE_ISIS 8
-#define ZEBRA_ROUTE_BGP 9
-#define ZEBRA_ROUTE_HSLS 10
-#define ZEBRA_ROUTE_PIM 11
-#define ZEBRA_ROUTE_MAX 12
+/* Zebra route's types are defined in route_types.h */
+#include "route_types.h"
/* Note: whenever a new route-type or zserv-command is added the
* corresponding {command,route}_types[] table in lib/log.c MUST be
diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index ef5cffa1..70c5096c 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -45,7 +45,11 @@ PIM_DEFS += -DPIM_GETTIME_USE_GETTIMEOFDAY
INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" $(PIM_DEFS)
INSTALL_SDATA=@INSTALL@ -m 600
-LIBS = @LIBS@
+LIBS = @LIBS@
+
+AM_CFLAGS = $(PICFLAGS)
+AM_LDFLAGS = $(PILDFLAGS)
+
noinst_LIBRARIES = libpim.a
sbin_PROGRAMS = pimd
bin_PROGRAMS = test_igmpv3_join
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 51e5e360..64d7787d 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -201,7 +201,6 @@ int main(int argc, char** argv, char** envp) {
memory_init();
access_list_init();
pim_init();
- sort_node();
/*
* reset zlog default, then will obey configuration file
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 1b146f6f..d1350b08 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -24,6 +24,7 @@
#include <zebra.h>
#include "sigevent.h"
+#include "memory.h"
#include "log.h"
#include "pim_signals.h"
@@ -58,7 +59,7 @@ static void pim_sigusr1()
zlog_rotate (NULL);
}
-struct quagga_signal_t pimd_signals[] =
+static struct quagga_signal_t pimd_signals[] =
{
{
.signal = SIGHUP,
@@ -80,6 +81,6 @@ struct quagga_signal_t pimd_signals[] =
void pim_signals_init()
{
- signal_init(master, Q_SIGC(pimd_signals), pimd_signals);
+ signal_init(master, array_size(pimd_signals), pimd_signals);
}