summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2004-06-04 17:45:35 +0200
committerOndrej Filip <feela@network.cz>2004-06-04 17:45:35 +0200
commit28de5133ecdcb5b45dc251123047164fbb940e50 (patch)
tree22c279156b3d4fd805649f40a36828fe18aa14f1
parentd03e8ce00b8fea374bbc06a4eb5254e911557e83 (diff)
downloadbird-28de5133ecdcb5b45dc251123047164fbb940e50.tar
bird-28de5133ecdcb5b45dc251123047164fbb940e50.zip
ackd_timer_hook moded to neighbor.c
-rw-r--r--proto/ospf/lsack.c7
-rw-r--r--proto/ospf/lsack.h1
-rw-r--r--proto/ospf/neighbor.c10
3 files changed, 8 insertions, 10 deletions
diff --git a/proto/ospf/lsack.c b/proto/ospf/lsack.c
index 4b5f3b9..47c7f6b 100644
--- a/proto/ospf/lsack.c
+++ b/proto/ospf/lsack.c
@@ -48,13 +48,6 @@ ospf_lsa_delay(struct ospf_neighbor *n,struct ospf_lsa_header *h,
}
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)
{
struct ospf_packet *op;
diff --git a/proto/ospf/lsack.h b/proto/ospf/lsack.h
index 5c4e5c4..55198a4 100644
--- 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 ceb7fc6..e533eb6 100644
--- 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);
+}
+