commit - 1bbf387f0d6e13ba2316adeda688e5cdacda7663
commit + aab2fb210a56c912f01f2bcd18038e72ee6b2eb9
blob - 51a96299d621588c7c0c4137dc7334d014915cac
blob + 6d792c2e1953a128a33e1bcbaf51298edab3ef9a
--- thingsctl/thingsctl.c
+++ thingsctl/thingsctl.c
struct imsgbuf *ibuf;
- __dead void
+__dead void
usage(void)
{
extern char *__progname;
switch (res->action) {
case SHOW_PKTS:
+ if (imsg.hdr.type == IMSG_CTL_END) {
+ done = 1;
+ break;
+ }
printf("%s\n", (char *)imsg.data);
break;
case LIST_CLTS:
return;
printf("Client Name:\t\t\t%s\n", pclts->name);
-
printf("\tfd:\t\t\t%d\n", pclts->fd);
printf("\tPort:\t\t\t%d\n", pclts->port);
if (pclts->tls == true)
return;
printf("Thing Name:\t\t\t%s\n", pthgs->name);
-
switch(pthgs->type) {
case TCP:
printf("\tIP Addr:\t\t%s\n", pthgs->ipaddr);
blob - e80488d96a7455a2ec5df9e02ad897cd70ab5a1c
blob + 9799798752276fbd727a555a4a7619b8e80d049c
--- thingsd/client.c
+++ thingsd/client.c
void
clt_wr(struct bufferevent *bev, void *arg)
{
- /* nothing here */
}
void
*clt_chk(void *arg)
{
struct thgsd *pthgsd = (struct thgsd *)arg;
- void (*tfptr)(struct thgsd *);
+ void (*tfptr)(struct thgsd *);
tfptr = pthgsd->clt_fptr;
sleep(CLT_SUB_TIME);
blob - 8fefa3e034998cd78fb52075468b08a02692b1db
blob + fd2db3c864a9aa68fac6fe05ab190b0f72532f6d
--- thingsd/control.c
+++ thingsd/control.c
#define CONTROL_BACKLOG 5
-struct ctl_conn *control_connbyfd(int);
-struct ctl_conn *control_connbypid(pid_t);
-void control_close(int);
+struct ctl_conn *control_connbyfd(int);
+struct ctl_conn *control_connbypid(pid_t);
+void control_close(int);
+
int
control_init(char *path)
{
{
struct ctl_conn *c;
+ /* main_imsg_compose_thgs(IMSG_CTL_CONN, 0, false, 1); */
if ((c = control_connbyfd(fd)) == NULL) {
log_warnx("%s: fd %d: not found", __func__, fd);
return;
blob - af4a2ab3d598696eca7b47f898f6a99045657fa7
blob + e9916b2f4c78a0b6e3c37f8e6845888ad2631dc7
--- thingsd/control.h
+++ thingsd/control.h
#include "log.h"
-extern int main_imsg_compose_ctl(int, pid_t, void *,
- uint16_t);
-
struct {
struct event ev;
struct event evt;
blob - 645043028cad19390ca5169654f129174c216cde
blob + f20ec7c58ca591b753b6aa9531afd70a36d820c3
--- thingsd/sockets.c
+++ thingsd/sockets.c
extern struct dthgs *pdthgs;
extern struct ctl_pkt *ctl_pkt;
+extern bool ctl_conn;
void
create_socks(struct thgsd *pthgsd, bool reconn)
struct thg *thg = NULL, *tthg;
struct clt *clt;
size_t len;
- int fd = bev->ev_read.ev_fd, pid_chk;
- bool ctl = false;
+ int fd = bev->ev_read.ev_fd, pchk;
size_t n;
char *pkt;
if ((pkt = calloc(len, sizeof(*pkt))) == NULL)
return;
/* send pkt to control socket */
- if (ctl_pkt->exists) {
- pid_chk = kill(ctl_pkt->pid, 0);
- if (pid_chk == -1 && errno > 1) {
- ctl_pkt->exists = false;
- ctl_pkt->pid = -1;
- ctl = false;
- } else {
- ctl = true;
- evbuffer_remove(thg->evb, pkt, len);
- thgs_imsg_compose_main(IMSG_SHOW_PKTS, ctl_pkt->pid,
- pkt, len);
- }
+ pchk = kill(ctl_pkt->cpid, 0);
+ if (pchk == -1 && errno > 1) {
+ ctl_pkt->exists = false;
+ ctl_pkt->cpid = -1;
}
+ if (ctl_pkt->exists && strncmp(thg->name, ctl_pkt->name,
+ sizeof(*thg->name)) == 0) {
+ evbuffer_remove(thg->evb, pkt, len);
+ thgs_imsg_compose_main(IMSG_SHOW_PKTS, ctl_pkt->pid,
+ pkt, len);
+ }
if (thg->clt_cnt == 0) {
evbuffer_drain(thg->evb, len);
return;
- } else if (ctl == false)
+ } else if (ctl_pkt->exists == false)
evbuffer_remove(thg->evb, pkt, len);
/* write to clients */
TAILQ_FOREACH(clt, &pthgsd->clts, entry) {
blob - a9b00ef119f46bba1642067a5e82a089dbcd16b1
blob + 5f3837cdc3cfffe1644a9c5b3ea7c6e5feff7ad3
--- thingsd/things.c
+++ thingsd/things.c
}
ctl_pkt->exists = false;
- ctl_pkt->pid = -1;
+ ctl_pkt->pid = getppid();
+ ctl_pkt->cpid = -1;
pthgsd->thgs_eb = event_init();
}
event_base_loopexit(pthgsd->thgs_eb, &eb_timeout);
event_base_dispatch(pthgsd->thgs_eb);
+ if (getppid() == 1)
+ break;
}
thgs_shutdown(pdthgs);
thgs_dispatch_main(int fd, short event, void *bula)
{
struct clt *clt;
+ struct thg *thg;
struct imsg imsg;
struct imsgev *iev = bula;
struct imsgbuf *ibuf = &iev->ibuf;
enum thgs_list_type type;
int n, shut = 0, verbose;
+ bool tchk = true;
if (event & EV_READ) {
if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
switch (imsg.hdr.type) {
case IMSG_SHOW_PKTS:
- ctl_pkt->exists = true;
- ctl_pkt->pid = imsg.hdr.pid;
+ TAILQ_FOREACH(thg, &pthgsd->thgs, entry) {
+ if (strncmp(thg->name, imsg.data,
+ sizeof(imsg.data)) == 0) {
+ if ((ctl_pkt->name =
+ strdup(imsg.data)) == NULL)
+ break;
+ ctl_pkt->exists = true;
+ ctl_pkt->cpid = imsg.hdr.pid;
+ tchk = false;
+ break;
+ }
+ }
+ if (tchk)
+ thgs_imsg_compose_main(IMSG_CTL_END,
+ ctl_pkt->pid, NULL, 0);
break;
case IMSG_KILL_CLT:
TAILQ_FOREACH(clt, &pthgsd->clts, entry) {
if ((comp_thg = calloc(1, sizeof(*comp_thg))) == NULL)
fatalx("no com_thg calloc");
+
comp_thg->exists = pthg->exists;
comp_thg->hw_ctl = pthg->hw_ctl;
comp_thg->persist = pthg->persist;
comp_thg->stop_bits = pthg->stop_bits;
comp_thg->type = pthg->type;
comp_thg->clt_cnt = pthg->clt_cnt;
-
comp_thg->tls = pthg->tls;
if (pthg->tls_cert_file != NULL)
blob - eb3834703637466f36b38f03cc92875f96aacfae
blob + da249ad2fd297fb2c4f96a7521f79a0892249fba
--- thingsd/thingsd.c
+++ thingsd/thingsd.c
log_setverbose(1);
saved_argv0 = argv[0];
+
if (saved_argv0 == NULL)
saved_argv0 = "thingsd";
}
argc -= optind;
+
if (argc > 0)
usage();
-
if (thgs_chld)
thgs_main(debug, verbose, thgs_sock);
-
if (geteuid())
fatalx("need root privileges");
-
if ((control_fd = control_init(thgs_sock)) == -1)
fatalx("thgs_sock failed");
+
control_state.fd = control_fd;
log_init(debug, LOG_DAEMON);
/* setup thgs child pipe */
if ((iev_thgs = malloc(sizeof(struct imsgev))) == NULL)
fatalx("iev_thgs malloc");
+
imsg_init(&iev_thgs->ibuf, pipe_thgs[0]);
iev_thgs->handler = main_dispatch_thgs;
if (getpwnam(TH_USER) == NULL)
log_info("running as root. %s user not found", TH_USER);
-
if (pledge("stdio unix recvfd", NULL) == -1)
fatal("pledge");
blob - c6e88142fe474ba243cdb66177f4fddb10bed162
blob + 5925a57ae551fc6887da87dca3eaa348d2e09eca
--- thingsd/thingsd.h
+++ thingsd/thingsd.h
};
struct ctl_pkt {
+ pid_t pid;
+ pid_t cpid;
+ char *name;
bool exists;
- uint32_t pid;
};
int control_init(char *);