ackd_timer_hook moded to neighbor.c

diff --git a/proto/ospf/lsack.c b/proto/ospf/lsack.c
index 4b5f3b918fae744db8f11f272ddcd8f48ae45ca5..47c7f6bc4500fc75d630026a9be8c43a07960ac8 100644 (file)
--- a/proto/ospf/lsack.c
+++ b/proto/ospf/lsack.c
@@ -47,13 +47,6 @@ ospf_lsa_delay(struct ospf_neighbor *n,struct ospf_lsa_header *h,
     ntohl(h->id), ntohl(h->rt),h->type);
 }
 
-void
-ackd_timer_hook(timer *t)
-{
-  struct ospf_neighbor *n=t->data;
-  if(!EMPTY_LIST(n->ackl)) ospf_lsack_delay_tx(n);
-}
-
 void
 ospf_lsack_delay_tx(struct ospf_neighbor *n)
 {

diff --git a/proto/ospf/lsack.h b/proto/ospf/lsack.h
index 5c4e5c4506e1e912bdf1799d0cbb7ff536720061..55198a4cde038e6d523a81c9bd96e581390677da 100644 (file)
--- a/proto/ospf/lsack.h
+++ b/proto/ospf/lsack.h
@@ -17,7 +17,6 @@ struct lsah_n {
 void ospf_lsack_direct_tx(struct ospf_neighbor *n,struct ospf_lsa_header *h);
 void ospf_lsack_rx(struct ospf_lsack_packet *ps, struct proto *p,
   struct ospf_iface *ifa, u16 size);
-void ackd_timer_hook(timer *t);
 void ospf_lsack_delay_tx(struct ospf_neighbor *n);
 void ospf_lsa_delay(struct ospf_neighbor *n,struct ospf_lsa_header *h,
   struct proto *p);

diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index ceb7fc686aea8070377dc7e7deb2c6653e17c3cb..e533eb68ec356fc3b32f006bc4956061f4eb4ca2 100644 (file)
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -25,8 +25,7 @@ const char *ospf_inm[]={ "hello received", "neighbor start", "2-way received",
 
 void neighbor_timer_hook(timer *timer);
 void rxmt_timer_hook(timer *timer);
-
-
+void ackd_timer_hook(timer *t);
 
 struct ospf_neighbor *
 ospf_neighbor_new(struct ospf_iface *ifa)
@@ -608,3 +607,10 @@ rxmt_timer_hook(timer *timer)
   }
 }
 
+void
+ackd_timer_hook(timer *t)
+{
+  struct ospf_neighbor *n=t->data;
+  if(!EMPTY_LIST(n->ackl)) ospf_lsack_delay_tx(n);
+}
+