summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
Diffstat (limited to 'pimd')
-rw-r--r--pimd/Makefile.am4
-rw-r--r--pimd/pim_cmd.c8
-rw-r--r--pimd/pim_igmpv3.c3
-rw-r--r--pimd/pim_int.c1
-rw-r--r--pimd/pim_pim.c3
-rw-r--r--pimd/pim_ssmpingd.c5
-rw-r--r--pimd/pim_zebra.c2
7 files changed, 16 insertions, 10 deletions
diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index f13debd9..b82613a8 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -34,12 +34,12 @@ PIM_DEFS += -DPIM_ZCLIENT_DEBUG
PIM_DEFS += -DPIM_ENFORCE_LOOPFREE_MFC
#PIM_DEFS += -DPIM_UNEXPECTED_KERNEL_UPCALL
-AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" $(PIM_DEFS)
INSTALL_SDATA=@INSTALL@ -m 600
LIBS = @LIBS@
-AM_CFLAGS = $(PICFLAGS)
+AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
noinst_LIBRARIES = libpim.a
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 6b2ac664..13812cd8 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -2031,8 +2031,8 @@ static void show_multicast_interfaces(struct vty *vty)
if (ioctl(qpim_mroute_socket_fd, SIOCGETVIFCNT, &vreq)) {
int e = errno;
vty_out(vty,
- "ioctl(SIOCGETVIFCNT=%d) failure for interface %s vif_index=%d: errno=%d: %s%s",
- SIOCGETVIFCNT,
+ "ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s%s",
+ (unsigned long)SIOCGETVIFCNT,
ifp->name,
pim_ifp->mroute_vif_index,
e,
@@ -2225,8 +2225,8 @@ static void show_mroute_count(struct vty *vty)
if (ioctl(qpim_mroute_socket_fd, SIOCGETSGCNT, &sgreq)) {
int e = errno;
vty_out(vty,
- "ioctl(SIOCGETSGCNT=%d) failure for (S,G)=(%s,%s): errno=%d: %s%s",
- SIOCGETSGCNT,
+ "ioctl(SIOCGETSGCNT=%lu) failure for (S,G)=(%s,%s): errno=%d: %s%s",
+ (unsigned long)SIOCGETSGCNT,
source_str,
group_str,
e,
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 3baddbfa..3657f2f9 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -1680,7 +1680,8 @@ void pim_igmp_send_membership_query(struct igmp_group *group,
#endif
tolen = sizeof(to);
- sent = sendto(fd, query_buf, msg_size, MSG_DONTWAIT, &to, tolen);
+ sent = sendto(fd, query_buf, msg_size, MSG_DONTWAIT,
+ (struct sockaddr *)&to, tolen);
if (sent != (ssize_t) msg_size) {
int e = errno;
char dst_str[100];
diff --git a/pimd/pim_int.c b/pimd/pim_int.c
index 2ff1a116..0bdd772f 100644
--- a/pimd/pim_int.c
+++ b/pimd/pim_int.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include "pim_int.h"
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index f6f4c953..f8ac650d 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -476,7 +476,8 @@ int pim_msg_send(int fd,
pim_pkt_dump(__PRETTY_FUNCTION__, pim_msg, pim_msg_size);
}
- sent = sendto(fd, pim_msg, pim_msg_size, MSG_DONTWAIT, &to, tolen);
+ sent = sendto(fd, pim_msg, pim_msg_size, MSG_DONTWAIT,
+ (struct sockaddr *)&to, tolen);
if (sent != (ssize_t) pim_msg_size) {
int e = errno;
char dst_str[100];
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index fd1eac06..82e0722a 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -96,7 +96,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
sockaddr.sin_addr = addr;
sockaddr.sin_port = htons(port);
- if (bind(fd, &sockaddr, sizeof(sockaddr))) {
+ if (bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr))) {
char addr_str[100];
pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
zlog_warn("%s: bind(fd=%d,addr=%s,port=%d,len=%zu) failure: errno=%d: %s",
@@ -222,7 +222,8 @@ static void ssmpingd_sendto(struct ssmpingd_sock *ss,
socklen_t tolen = sizeof(to);
int sent;
- sent = sendto(ss->sock_fd, buf, len, MSG_DONTWAIT, &to, tolen);
+ sent = sendto(ss->sock_fd, buf, len, MSG_DONTWAIT,
+ (struct sockaddr *)&to, tolen);
if (sent != len) {
int e = errno;
char to_str[100];
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 6f241d59..129cbe4f 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -51,6 +51,7 @@ static int del_oif(struct channel_oil *channel_oil,
struct interface *oif,
uint32_t proto_mask);
+#if 0
static void zclient_broken(struct zclient *zclient)
{
struct listnode *ifnode;
@@ -65,6 +66,7 @@ static void zclient_broken(struct zclient *zclient)
/* upon return, zclient will discard connected addresses */
}
+#endif
/* Router-id update message from zebra. */
static int pim_router_id_update_zebra(int command, struct zclient *zclient,