commit - 66ce95da6df0b7ce3dc1c481c22042d18f9642cf
commit + aef444344cbf3855431f59ccee76fce6fa4e0464
blob - a40c09dda44befaa03d7710d8d7f65e749ad3469
blob + f60515eb55a1d4c5f6432bf8d1aaf389e2fae6f9
--- thingsd/client.c
+++ thingsd/client.c
}
bufferevent_setwatermark(clt->bev, EV_READ, 0, BUFF);
bufferevent_enable(clt->bev, EV_READ);
- start_clt_chk(pthgsd);
return;
err:
log_debug("%s: client error", __func__);
if (clt->fd == pclt->fd) {
if (clt->tls)
tls_free(clt->tls_ctx);
- free(clt->ev);
for (n = 0; n < clt->le; n++)
TAILQ_FOREACH(thg, &pthgsd->thgs, entry)
if (strcmp(clt->sub_names[n],
bufferevent_free(clt->bev);
close(clt->fd);
TAILQ_REMOVE(&pthgsd->clts, clt, entry);
+ free(clt->ev);
+ free(clt->sub_names);
+ free(clt->name);
+ free(clt);
break;
}
}
- free(clt);
}
void
void (*tfptr)(struct thgsd *);
tfptr = pthgsd->clt_fptr;
- sleep(CLT_SUB_TIME);
- (void)(*tfptr)(pthgsd);
- return NULL;
+ while(1) {
+ sleep(CLT_SUB_CHK);
+ (void)(*tfptr)(pthgsd);
+ }
+ pthread_exit(NULL);
}
void
blob - ed331a7e51b479995b37fa7d6789a667a9e89c6e
blob + f5a9ab73674773ed85b2677618e9c1fd81a4bf74
--- thingsd/parse.y
+++ thingsd/parse.y
yyparse();
errors = file->errors;
popbuff();
+ free(file);
return (errors ? -1 : 0);
}
blob - dcc6f6c13389ecc70c6aef44110075ac0cee3c9e
blob + 7be727dae78c67ef2994810ec5ef9ae83d80ebab
--- thingsd/things.c
+++ thingsd/things.c
eb_timeout.tv_sec = EB_TIMEOUT;
eb_timeout.tv_usec = 0;
+ start_clt_chk(pthgsd);
while (pdthgs->run) {
if (pthgsd->exists) {
do_reconn();
blob - d6f665f799fbc2a4ccf8a64ed6a1bf5501fd9c34
blob + 9008ae693769ce93c836f1a45ba52857e341bd00
--- thingsd/thingsd.h
+++ thingsd/thingsd.h
#define MAX_RTRY 600
#define DEFAULT_BAUD 9600
#define CLT_SUB_TIME 5
+#define CLT_SUB_CHK 1
#define BUFF 1024
#define DTHG_CHK 2
#define EB_TIMEOUT 10