diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2015-04-04 15:09:48 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2015-04-04 15:09:48 +0000 |
| commit | 06d3ec3581eb4cb29ccd0923aae49c1f1268ea59 (patch) | |
| tree | 4ab680a0006921c9735d12c87876e88383da479a /usr.sbin/ldpd | |
| parent | 7331cca069b783a108e1077c42835ea0f5eaed68 (diff) | |
Remove unused parameter from adj_new().
The adjacency holdtime is set in recv_hello().
OK claudio@
Diffstat (limited to 'usr.sbin/ldpd')
| -rw-r--r-- | usr.sbin/ldpd/adjacency.c | 5 | ||||
| -rw-r--r-- | usr.sbin/ldpd/hello.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldpe.h | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/usr.sbin/ldpd/adjacency.c b/usr.sbin/ldpd/adjacency.c index 07ac2e42fe0..39bdac7a371 100644 --- a/usr.sbin/ldpd/adjacency.c +++ b/usr.sbin/ldpd/adjacency.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adjacency.c,v 1.3 2013/10/15 20:21:24 renato Exp $ */ +/* $OpenBSD: adjacency.c,v 1.4 2015/04/04 15:09:47 renato Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -41,8 +41,7 @@ void tnbr_start_hello_timer(struct tnbr *); void tnbr_stop_hello_timer(struct tnbr *); struct adj * -adj_new(struct nbr *nbr, struct hello_source *source, u_int16_t holdtime, - struct in_addr addr) +adj_new(struct nbr *nbr, struct hello_source *source, struct in_addr addr) { struct adj *adj; diff --git a/usr.sbin/ldpd/hello.c b/usr.sbin/ldpd/hello.c index 9332aee667b..376f76f8d09 100644 --- a/usr.sbin/ldpd/hello.c +++ b/usr.sbin/ldpd/hello.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hello.c,v 1.24 2014/10/25 03:23:49 lteo Exp $ */ +/* $OpenBSD: hello.c,v 1.25 2015/04/04 15:09:47 renato Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -177,12 +177,12 @@ recv_hello(struct iface *iface, struct in_addr src, char *buf, u_int16_t len) if (!nbr) { /* create new adjacency and new neighbor */ nbr = nbr_new(lsr_id, transport_addr); - adj = adj_new(nbr, &source, holdtime, transport_addr); + adj = adj_new(nbr, &source, transport_addr); } else { adj = adj_find(nbr, &source); if (!adj) { /* create new adjacency for existing neighbor */ - adj = adj_new(nbr, &source, holdtime, transport_addr); + adj = adj_new(nbr, &source, transport_addr); if (nbr->addr.s_addr != transport_addr.s_addr) log_warnx("recv_hello: neighbor %s: multiple " diff --git a/usr.sbin/ldpd/ldpe.h b/usr.sbin/ldpd/ldpe.h index 567351919c9..65c98a4979d 100644 --- a/usr.sbin/ldpd/ldpe.h +++ b/usr.sbin/ldpd/ldpe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpe.h,v 1.34 2015/03/21 18:34:01 renato Exp $ */ +/* $OpenBSD: ldpe.h,v 1.35 2015/04/04 15:09:47 renato Exp $ */ /* * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org> @@ -158,8 +158,7 @@ int if_set_tos(int, int); int if_set_reuse(int, int); /* adjacency.c */ -struct adj *adj_new(struct nbr *, struct hello_source *, u_int16_t, - struct in_addr); +struct adj *adj_new(struct nbr *, struct hello_source *, struct in_addr); void adj_del(struct adj *); struct adj *adj_find(struct nbr *, struct hello_source *); void adj_start_itimer(struct adj *); |