commit - ee9f1af746de7385ad3eb4d1b6c2b9cf4a27f46f
commit + 93b81d99dabea5307036e5b13900c08bc729e1c6
blob - 19ea691bed03c5db59054ffaa6fdc29719bd0316
blob + a40c09dda44befaa03d7710d8d7f65e749ad3469
--- thingsd/client.c
+++ thingsd/client.c
size_t n;
TAILQ_FOREACH_SAFE(clt, &pthgsd->clts, entry, tclt) {
- if (clt == pclt) {
- close(clt->fd);
+ if (clt->fd == pclt->fd) {
if (clt->tls)
tls_free(clt->tls_ctx);
free(clt->ev);
log_debug("%s: client disconnected", __func__);
else
log_info("client disconnected: %s", clt->name);
- TAILQ_REMOVE(&pthgsd->clts, clt, entry);
if (clt->bev != NULL)
bufferevent_free(clt->bev);
- free(clt);
+ close(clt->fd);
+ TAILQ_REMOVE(&pthgsd->clts, clt, entry);
break;
}
}
+ free(clt);
}
void
TAILQ_FOREACH(clt, &pthgsd->clts, entry) {
if (clt->subscribed == false) {
- if ((ctime - clt->join_time) >= CLT_SUB_TIME)
+ if ((ctime - clt->join_time) >= CLT_SUB_TIME) {
clt_del(pthgsd, clt);
- break;
+ break;
+ }
}
}
}