commit 70809b211dc08a9445d8b506250eee995c56fd80 from: Tracey Emery date: Thu Apr 25 15:05:02 2019 UTC Only allow one instance of `thingsctl show thing` commit - 34170b731eb234084c4c80a747f689b95b599a4e commit + 70809b211dc08a9445d8b506250eee995c56fd80 blob - dbeddbea4eeb35e02a631d545e6ffa6fb2c4efbb blob + 82966ef15600330361586a06d0defd30ed401bd5 --- thingsd/control.c +++ thingsd/control.c @@ -174,7 +174,6 @@ control_close(int fd) { 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 - d33dcc01d427a70a20c7fa6761b2003bc2df2088 blob + de4a9d2507deb0ad5ef5190fda71b4841addd6ee --- thingsd/things.c +++ thingsd/things.c @@ -161,6 +161,8 @@ thgs_dispatch_main(int fd, short event, void *bula) switch (imsg.hdr.type) { case IMSG_SHOW_PKTS: + if (ctl_pkt->exists) + return; TAILQ_FOREACH(thg, &pthgsd->thgs, entry) { if (strncmp(thg->name, imsg.data, sizeof(imsg.data)) == 0) {