diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-09-02 00:53:59 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-09-02 00:53:59 +0100 |
| commit | 3690074a486cfada568975e287d9cbb9e687501f (patch) | |
| tree | f6394c1ab1ca8381e9a77acca84f03dc701d10b2 /lib/zclient.c | |
| parent | 3f515315d5b17e432453eef67d7ac9e27bc39461 (diff) | |
| download | quagga-3690074a486cfada568975e287d9cbb9e687501f.tar.bz2 quagga-3690074a486cfada568975e287d9cbb9e687501f.tar.xz | |
Merging of euro_ix branch into pipework.
Bring in fixes for bgp dumping with pthreaded BGP Engine.
Bring in new "show nexus xxx" command.
Fix removal of '~' prompt.
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index 6803aa4a..ff95b624 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -396,7 +396,7 @@ zclient_start (struct zclient *zclient) return 0; /* Check timer */ - if (zclient->qtr && zclient->qtr->active) + if (qtimer_is_active(zclient->qtr)) return 0; /* Make socket. */ @@ -1169,11 +1169,11 @@ zclient_event_r (enum event event, struct zclient *zclient) switch (event) { case ZLOOKUP_SCHEDULE: - if (!zclient->qtr->active) + if (!qtimer_is_active(zclient->qtr)) qtimer_set(zclient->qtr, qt_get_monotonic(), zlookup_connect_r) ; break; case ZCLIENT_SCHEDULE: - if (!zclient->qtr->active) + if (!qtimer_is_active(zclient->qtr)) qtimer_set(zclient->qtr, qt_get_monotonic(), zclient_connect_r) ; break; case ZCLIENT_CONNECT: @@ -1182,7 +1182,7 @@ zclient_event_r (enum event event, struct zclient *zclient) if (zclient_debug) zlog_debug ("zclient connect schedule interval is %d", zclient->fail < 3 ? 10 : 60); - if (!zclient->qtr->active) + if (!qtimer_is_active(zclient->qtr)) qtimer_set(zclient->qtr, qt_add_monotonic(QTIME(zclient->fail < 3 ? 10 : 60)), zclient_connect_r) ; break; |