diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2013-06-01 19:28:56 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2013-06-01 19:28:56 +0000 |
| commit | 0d280fd51bac4c2dbd825217f2df566e4074a5fd (patch) | |
| tree | a44b2224392f45aa1486add1aef31f534d1cd203 /usr.sbin/ldpd/neighbor.c | |
| parent | 0d6f6e84ba46d7cbfb788d215270ca2e88568678 (diff) | |
The keepalive timeout should be configured on a global basis and not per
interface.
Remove the iface pointer from the 'nbr' structure because it's not
needed anymore.
Diff from Renato Westphal
Diffstat (limited to 'usr.sbin/ldpd/neighbor.c')
| -rw-r--r-- | usr.sbin/ldpd/neighbor.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/ldpd/neighbor.c b/usr.sbin/ldpd/neighbor.c index 64d0bb2005f..cb0a70409f4 100644 --- a/usr.sbin/ldpd/neighbor.c +++ b/usr.sbin/ldpd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.31 2013/06/01 18:47:07 claudio Exp $ */ +/* $OpenBSD: neighbor.c,v 1.32 2013/06/01 19:28:55 claudio Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -233,7 +233,7 @@ nbr_fsm(struct nbr *nbr, enum nbr_event event) } struct nbr * -nbr_new(u_int32_t nbr_id, struct iface *iface, struct in_addr a) +nbr_new(u_int32_t nbr_id, struct in_addr a) { struct nbr *nbr; @@ -244,7 +244,6 @@ nbr_new(u_int32_t nbr_id, struct iface *iface, struct in_addr a) nbr->state = NBR_STA_DOWN; nbr->id.s_addr = nbr_id; - nbr->iface = iface; nbr->addr = a; /* get next unused peerid */ @@ -661,12 +660,9 @@ nbr_to_ctl(struct nbr *nbr) static struct ctl_nbr nctl; struct timeval tv, now, res; - memcpy(nctl.name, nbr->iface->name, sizeof(nctl.name)); memcpy(&nctl.id, &nbr->id, sizeof(nctl.id)); memcpy(&nctl.addr, &nbr->addr, sizeof(nctl.addr)); - nctl.nbr_state = nbr->state; - nctl.iface_state = nbr->iface->state; gettimeofday(&now, NULL); if (evtimer_pending(&nbr->inactivity_timer, &tv)) { |