diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-11-28 17:43:20 +0100 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 13:54:59 +0100 |
commit | a6f79ca57f0b4b296f67c2d063fd85a627b611b8 (patch) | |
tree | e8164505077da6b3039d598b6b22b6a893dfccd6 /proto/ospf/dbdes.c | |
parent | 574b2324275d3292e98a8e329f791eb5c799f7f2 (diff) |
Timers: Revert temporary names and remove old timer.h
Diffstat (limited to 'proto/ospf/dbdes.c')
-rw-r--r-- | proto/ospf/dbdes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/proto/ospf/dbdes.c b/proto/ospf/dbdes.c index 270259a7..f211935f 100644 --- a/proto/ospf/dbdes.c +++ b/proto/ospf/dbdes.c @@ -279,8 +279,8 @@ ospf_process_dbdes(struct ospf_proto *p, struct ospf_packet *pkt, struct ospf_ne req->lsa = lsa; req->lsa_body = LSA_BODY_DUMMY; - if (!tm2_active(n->lsrq_timer)) - tm2_start(n->lsrq_timer, 0); + if (!tm_active(n->lsrq_timer)) + tm_start(n->lsrq_timer, 0); } } @@ -366,7 +366,7 @@ ospf_receive_dbdes(struct ospf_packet *pkt, struct ospf_iface *ifa, n->options = rcv_options; n->myimms &= ~DBDES_MS; n->imms = rcv_imms; - tm2_stop(n->dbdes_timer); + tm_stop(n->dbdes_timer); ospf_neigh_sm(n, INM_NEGDONE); ospf_send_dbdes(p, n); break; @@ -422,13 +422,13 @@ ospf_receive_dbdes(struct ospf_packet *pkt, struct ospf_iface *ifa, if (!(n->myimms & DBDES_M) && !(n->imms & DBDES_M)) { - tm2_stop(n->dbdes_timer); + tm_stop(n->dbdes_timer); ospf_neigh_sm(n, INM_EXDONE); break; } ospf_send_dbdes(p, n); - tm2_start(n->dbdes_timer, n->ifa->rxmtint S); + tm_start(n->dbdes_timer, n->ifa->rxmtint S); } else { |