commit - 4f212699d9d2b85631ab0b56d99e97f44986c2ae
commit + 34170b731eb234084c4c80a747f689b95b599a4e
blob - c022d9075f7874d94609d69e59ac2907baecb3c5
blob + baa56d9b42416df38e2f6602c44d72fdf7e68c5f
--- thingsd/events.c
+++ thingsd/events.c
bufferevent_write(clt->bev, pkt, len);
}
}
+ send_ctl_pkt(thg->name, pkt, len);
}
}
blob - f51860fec680ada4f3f0c87990bb7fc888f74b87
blob + 5e0d899f9f92ee4007fccefa5bc9f97ffbd8b28e
--- thingsd/sockets.c
+++ thingsd/sockets.c
struct thg *thg = NULL, *tthg;
struct clt *clt;
size_t len;
- int fd = bev->ev_read.ev_fd, pchk, snm;
+ int fd = bev->ev_read.ev_fd;
size_t n;
char *pkt;
TAILQ_FOREACH(tthg, &pthgsd->thgs, entry) {
if (tthg->fd == fd) {
thg = tthg;
- break;
+ thg->evb = EVBUFFER_INPUT(bev);
+ len = EVBUFFER_LENGTH(thg->evb);
+
+ if ((pkt = calloc(len, sizeof(*pkt))) == NULL)
+ return;
+
+ evbuffer_remove(thg->evb, pkt, len);
+ TAILQ_FOREACH(clt, &pthgsd->clts, entry) {
+ for (n = 0; n < clt->le; n++) {
+ if (strcmp(clt->sub_names[n], thg->name)
+ == 0)
+ bufferevent_write(clt->bev, pkt,
+ len);
+ }
+ }
+ send_ctl_pkt(thg->name, pkt, len);
+ free(pkt);
}
}
- thg->evb = EVBUFFER_INPUT(bev);
- len = EVBUFFER_LENGTH(thg->evb);
- if ((pkt = calloc(len, sizeof(*pkt))) == NULL)
- return;
- /* send pkt to control socket */
- pchk = kill(ctl_pkt->cpid, 0);
- if (pchk == -1 && errno > 1) {
- ctl_pkt->exists = false;
- ctl_pkt->cpid = -1;
- ctl_pkt->name = NULL;
- }
- if (ctl_pkt->name != NULL)
- snm = strcmp(thg->name, ctl_pkt->name);
- if (ctl_pkt->exists && snm == 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_pkt->exists == false)
- evbuffer_remove(thg->evb, pkt, len);
- /* write to clients */
- TAILQ_FOREACH(clt, &pthgsd->clts, entry) {
- for (n = 0; n < clt->le; n++) {
- if (strcmp(clt->sub_names[n], thg->name) == 0)
- bufferevent_write(clt->bev, pkt, len);
- }
- }
- free(pkt);
}
void
blob - 1dd553d4c787681053c340ffc9fb2d44af2f0a76
blob + d33dcc01d427a70a20c7fa6761b2003bc2df2088
--- thingsd/things.c
+++ thingsd/things.c
comp_sock->tls = psock->tls;
return(comp_sock);
};
+
+void
+send_ctl_pkt(char *name, char *pkt, int len)
+{
+ int pchk, snm;
+
+ /* send pkt to control socket */
+ pchk = kill(ctl_pkt->cpid, 0);
+ if (pchk == -1 && errno > 1) {
+ ctl_pkt->exists = false;
+ ctl_pkt->cpid = -1;
+ ctl_pkt->name = NULL;
+ }
+ if (ctl_pkt->name != NULL)
+ snm = strcmp(name, ctl_pkt->name);
+ if (ctl_pkt->exists && snm == 0) {
+ thgs_imsg_compose_main(IMSG_SHOW_PKTS, ctl_pkt->pid,
+ pkt, len);
+ }
+}
blob - d59b67155318c6acf0d42cd75cd1ba9c101674ed
blob + d6f665f799fbc2a4ccf8a64ed6a1bf5501fd9c34
--- thingsd/thingsd.h
+++ thingsd/thingsd.h
int imsg_compose_event(struct imsgev *, uint16_t,
uint32_t, pid_t, int, void *, uint16_t);
-/* thgs.c */
+/* things.c */
void thgs_main(int, int, char*);
void add_reconn(struct thg *);
struct dthg *new_dthg(struct thg *);
int thgs_imsg_compose_main(int, pid_t, void *,
uint16_t);
+void send_ctl_pkt(char *, char *, int);
/* parse.y */
struct thg *new_thg(char *);