summaryrefslogtreecommitdiff
path: root/ospfd/ospf_nsm.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2013-01-11 21:46:18 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2013-01-11 21:46:22 +0100
commitb2e5bdbe10c4145f508fcf1486ffe29d5ce516f7 (patch)
treefae70e8c1580d99fee0c2a59d6bef831c4c9465c /ospfd/ospf_nsm.c
parenta16dcf7c11d80775b07a0fa6f3ac5527190fb486 (diff)
parente0630cb4d61557f956318a088f68f1fc4d261ef3 (diff)
Merge remote-tracking branch 'savannah/sf/ospfd'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospfd/ospf_nsm.c')
-rw-r--r--ospfd/ospf_nsm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index cbc31716..fe4ddf5b 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -72,14 +72,11 @@ ospf_inactivity_timer (struct thread *thread)
static int
ospf_db_desc_timer (struct thread *thread)
{
- struct ospf_interface *oi;
struct ospf_neighbor *nbr;
nbr = THREAD_ARG (thread);
nbr->t_db_desc = NULL;
- oi = nbr->oi;
-
if (IS_DEBUG_OSPF (nsm, NSM_TIMERS))
zlog (NULL, LOG_DEBUG, "NSM[%s:%s]: Timer (DD Retransmit timer expire)",
IF_NAME (nbr->oi), inet_ntoa (nbr->src));
@@ -643,7 +640,7 @@ nsm_notice_state_change (struct ospf_neighbor *nbr, int next_state, int event)
#endif
}
-void
+static void
nsm_change_state (struct ospf_neighbor *nbr, int state)
{
struct ospf_interface *oi = nbr->oi;
@@ -787,11 +784,9 @@ ospf_nsm_event (struct thread *thread)
int event;
int next_state;
struct ospf_neighbor *nbr;
- struct in_addr router_id;
nbr = THREAD_ARG (thread);
event = THREAD_VAL (thread);
- router_id = nbr->router_id;
if (IS_DEBUG_OSPF (nsm, NSM_EVENTS))
zlog_debug ("NSM[%s:%s]: %s (%s)", IF_NAME (nbr->oi),