diff options
Diffstat (limited to 'usr.sbin/ripd')
| -rw-r--r-- | usr.sbin/ripd/kroute.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ripd/rde.c | 7 | ||||
| -rw-r--r-- | usr.sbin/ripd/ripd.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/ripd/kroute.c b/usr.sbin/ripd/kroute.c index 619e885b21d..87579af8052 100644 --- a/usr.sbin/ripd/kroute.c +++ b/usr.sbin/ripd/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.25 2014/06/23 03:46:17 guenther Exp $ */ +/* $OpenBSD: kroute.c,v 1.26 2015/01/16 06:40:20 deraadt Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -17,7 +17,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/sysctl.h> diff --git a/usr.sbin/ripd/rde.c b/usr.sbin/ripd/rde.c index 6915add3d1c..79f033b1f88 100644 --- a/usr.sbin/ripd/rde.c +++ b/usr.sbin/ripd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.17 2014/07/12 20:16:38 krw Exp $ */ +/* $OpenBSD: rde.c,v 1.18 2015/01/16 06:40:20 deraadt Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -19,7 +19,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> /* for MIN() */ #include <sys/socket.h> #include <sys/queue.h> #include <netinet/in.h> @@ -39,6 +38,8 @@ #include "log.h" #include "rde.h" +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) + struct ripd_conf *rdeconf = NULL; struct imsgev *iev_ripe; struct imsgev *iev_main; @@ -401,7 +402,7 @@ rde_check_route(struct rip_route *e) if ((iface = if_find_index(e->ifindex)) == NULL) return (-1); - metric = MIN(INFINITY, e->metric + iface->cost); + metric = MINIMUM(INFINITY, e->metric + iface->cost); if ((rn = rt_find(e->address.s_addr, e->mask.s_addr)) == NULL) { if (metric >= INFINITY) diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c index 9ba92b91f81..f779aaf25eb 100644 --- a/usr.sbin/ripd/ripd.c +++ b/usr.sbin/ripd/ripd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ripd.c,v 1.23 2014/07/12 20:16:38 krw Exp $ */ +/* $OpenBSD: ripd.c,v 1.24 2015/01/16 06:40:20 deraadt Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -25,7 +25,6 @@ #include <sys/time.h> #include <sys/stat.h> #include <sys/wait.h> -#include <sys/param.h> #include <sys/sysctl.h> #include <netinet/in.h> |