diff options
| -rw-r--r-- | zebra/zserv.c | 8 | ||||
| -rw-r--r-- | zebra/zserv.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c index 625174e241..fa5299850c 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -109,6 +109,14 @@ static void zebra_client_free(struct zserv *client) assert(!client->t_read); assert(!client->t_write); + /* + * Ensure these have been nulled. This does not equate to the + * associated task(s) being scheduled or unscheduled on the client + * pthread's threadmaster. + */ + assert(!client->t_read); + assert(!client->t_write); + /* Close file descriptor. */ if (client->sock) { unsigned long nroutes; diff --git a/zebra/zserv.h b/zebra/zserv.h index f466545fc8..c64ed3c677 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -73,9 +73,6 @@ struct zserv { struct thread *t_read; struct thread *t_write; - /* Thread for delayed close. */ - struct thread *t_suicide; - /* default routing table this client munges */ int rtm_table; |