diff options
| -rw-r--r-- | usr.sbin/sasyncd/Makefile | 13 | ||||
| -rw-r--r-- | usr.sbin/sasyncd/carp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sasyncd/conf.y | 8 | ||||
| -rw-r--r-- | usr.sbin/sasyncd/net.c | 4 |
4 files changed, 21 insertions, 10 deletions
diff --git a/usr.sbin/sasyncd/Makefile b/usr.sbin/sasyncd/Makefile index 03c364e4f6e..03253fdd5dd 100644 --- a/usr.sbin/sasyncd/Makefile +++ b/usr.sbin/sasyncd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 2010/06/16 17:39:05 reyk Exp $ +# $Id: Makefile,v 1.7 2012/04/14 11:46:09 haesbaert Exp $ PROG= sasyncd SRCS= sasyncd.c carp.c conf.y log.c monitor.c net.c net_ctl.c pfkey.c timer.c @@ -9,6 +9,17 @@ CFLAGS= -O0 $(PIPE) $(DEBUG) .endif CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sbin/iked +CDIAGFLAGS= -Wall +CDIAGFLAGS+= -Werror +CDIAGFLAGS+= -Wpointer-arith +CDIAGFLAGS+= -Wuninitialized +CDIAGFLAGS+= -Wstrict-prototypes +CDIAGFLAGS+= -Wmissing-prototypes +CDIAGFLAGS+= -Wunused +CDIAGFLAGS+= -Wsign-compare +CDIAGFLAGS+= -Wbounded +CDIAGFLAGS+= -Wshadow + CLEANFILES= y.tab.h # ElectricFence diff --git a/usr.sbin/sasyncd/carp.c b/usr.sbin/sasyncd/carp.c index b89c3a53270..a56daeda475 100644 --- a/usr.sbin/sasyncd/carp.c +++ b/usr.sbin/sasyncd/carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: carp.c,v 1.12 2010/06/29 21:25:37 kjell Exp $ */ +/* $OpenBSD: carp.c,v 1.13 2012/04/14 11:46:09 haesbaert Exp $ */ /* * Copyright (c) 2005 Håkan Olsson. All rights reserved. @@ -197,11 +197,11 @@ carp_read(void) char msg[2048]; struct rt_msghdr *rtm = (struct rt_msghdr *)&msg; struct if_msghdr ifm; - int len; + ssize_t len; len = read(cfgstate.route_socket, msg, sizeof(msg)); - if (len < sizeof(struct rt_msghdr) || + if (len < (ssize_t)sizeof(struct rt_msghdr) || rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) return; diff --git a/usr.sbin/sasyncd/conf.y b/usr.sbin/sasyncd/conf.y index 947bb6891c5..6950a20f495 100644 --- a/usr.sbin/sasyncd/conf.y +++ b/usr.sbin/sasyncd/conf.y @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.y,v 1.15 2010/06/16 17:39:05 reyk Exp $ */ +/* $OpenBSD: conf.y,v 1.16 2012/04/14 11:46:09 haesbaert Exp $ */ /* * Copyright (c) 2005 Håkan Olsson. All rights reserved. @@ -171,15 +171,15 @@ setting : INTERFACE STRING | PEER STRING { struct syncpeer *peer; - int dup = 0; + int duplicate = 0; for (peer = LIST_FIRST(&cfgstate.peerlist); peer; peer = LIST_NEXT(peer, link)) if (strcmp($2, peer->name) == 0) { - dup++; + duplicate++; break; } - if (dup) + if (duplicate) free($2); else { peer = (struct syncpeer *)calloc(1, diff --git a/usr.sbin/sasyncd/net.c b/usr.sbin/sasyncd/net.c index 4bd32b73662..d64998e724d 100644 --- a/usr.sbin/sasyncd/net.c +++ b/usr.sbin/sasyncd/net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net.c,v 1.16 2010/06/29 18:10:04 kjell Exp $ */ +/* $OpenBSD: net.c,v 1.17 2012/04/14 11:46:09 haesbaert Exp $ */ /* * Copyright (c) 2005 Håkan Olsson. All rights reserved. @@ -363,7 +363,7 @@ net_queue(struct syncpeer *p0, u_int32_t msgtype, u_int8_t *buf, u_int32_t len) } /* Get random IV */ - for (i = 0; i <= sizeof iv - sizeof v; i += sizeof v) { + for (i = 0; (size_t)i <= sizeof iv - sizeof v; i += sizeof v) { v = arc4random(); memcpy(&iv[i], &v, sizeof v); } |