diff options
Diffstat (limited to 'proto/ospf')
| -rw-r--r-- | proto/ospf/iface.c | 4 | ||||
| -rw-r--r-- | proto/ospf/neighbor.c | 2 | ||||
| -rw-r--r-- | proto/ospf/ospf.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 98d48aa1..d1f9365e 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -715,9 +715,9 @@ ospf_iface_change_timer(timer *tm, uint val) if (!tm) return; - tm->recurrent = val; + tm->recurrent = val S; - if (tm->expires) + if (tm_active(tm)) tm_start(tm, val); } diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c index b68ba6f4..64165e46 100644 --- a/proto/ospf/neighbor.c +++ b/proto/ospf/neighbor.c @@ -654,7 +654,7 @@ ospf_sh_neigh_info(struct ospf_neighbor *n) char etime[6]; int exp, sec, min; - exp = n->inactim->expires - now; + exp = tm_remains(n->inactim); sec = exp % 60; min = exp / 60; if (min > 59) diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 7ce6698e..a9081ed0 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -676,7 +676,7 @@ ospf_reconfigure(struct proto *P, struct proto_config *CF) p->asbr = new->asbr; p->ecmp = new->ecmp; p->tick = new->tick; - p->disp_timer->recurrent = p->tick; + p->disp_timer->recurrent = p->tick S; tm_start(p->disp_timer, 1); /* Mark all areas and ifaces */ |