commit - 2565c02406e3121608633eb50fb75c03b617ca43
commit + 5a75c71e3a8a283865a9adfb1c4c7de1d127f3ed
blob - 75a0a158017e477d4ad54244b51d7589907c0393
blob + 22a2e411f40c066e961c8c972579b1b260cb9994
--- thingsctl/parser.c
+++ thingsctl/parser.c
static const struct token t_kill_name[];
static const struct token t_thing_name[];
static const struct token t_socket_name[];
+static const struct token t_pkt_thing[];
static const struct token t_main[] = {
- {KEYWORD, "reload", RELOAD, NULL},
+ {KEYWORD, "echo", SHOW_PACKETS, t_pkt_thing},
+ {KEYWORD, "kill", NONE, t_kill_name},
{KEYWORD, "list", LIST, t_list},
- {KEYWORD, "show", SHOW, t_show},
{KEYWORD, "log", NONE, t_log},
- {KEYWORD, "kill", NONE, t_kill_name},
+ {KEYWORD, "reload", RELOAD, NULL},
+ {KEYWORD, "show", SHOW, t_show},
{ENDTOKEN, "", NONE, NULL}
};
static const struct token t_log[] = {
+ {KEYWORD, "brief", LOG_BRIEF, NULL},
{KEYWORD, "debug", LOG_DEBUG, NULL},
{KEYWORD, "verbose", LOG_VERBOSE, NULL},
- {KEYWORD, "brief", LOG_BRIEF, NULL},
{ENDTOKEN, "", NONE, NULL}
};
static const struct token t_list[] = {
{KEYWORD, "clients", LIST_CLIENTS, NULL},
- {KEYWORD, "things", LIST_THINGS, NULL},
{KEYWORD, "sockets", LIST_SOCKETS, NULL},
+ {KEYWORD, "things", LIST_THINGS, NULL},
{ENDTOKEN, "", NONE, NULL}
};
static const struct token t_show[] = {
- {KEYWORD, "parent", SHOW_PARENT, NULL},
- {KEYWORD, "control", SHOW_CONTROL, NULL},
{KEYWORD, "client", NONE, t_client_name},
+ {KEYWORD, "control", SHOW_CONTROL, NULL},
+ {KEYWORD, "parent", SHOW_PARENT, NULL},
{KEYWORD, "socket", NONE, t_socket_name},
{KEYWORD, "thing", NONE, t_thing_name},
{ENDTOKEN, "", NONE, NULL}
{ENDTOKEN, "", NONE, NULL}
};
+static const struct token t_pkt_thing[] = {
+ {THINGNAME, "", NONE, NULL},
+ {ENDTOKEN, "", NONE, NULL}
+};
+
static const struct token *match_token(const char *, const struct token *,
struct parse_result *);
static void show_valid_args(const struct token *);
blob - 95c5eb620625000f4901e4c1f75483ce08616a11
blob + 4a71ae5857fad0e1bae5314e2de781e9dedeaa45
--- thingsctl/parser.h
+++ thingsctl/parser.h
struct parse_result {
enum actions action;
- char name[THINGSD_MAXTHINGNAME];
+ char name[THINGSD_MAXNAME];
};
struct parse_result *parse(int, char *[]);
blob - 72849ec34061d0765726769b9718deae9105a785
blob + 6c20a6a5fdae73708b6be52e071567afac3895e2
--- thingsctl/thingsctl.c
+++ thingsctl/thingsctl.c
int done = 0;
int n, verbose = 0;
int ch, v = 0;
- char *sockname;
+ char *sockname, *ctl_pkt = NULL;
sockname = THINGSD_SOCKET;
while ((ch = getopt(argc, argv, "s:")) != -1) {
0, -1, NULL, 0);
break;
case SHOW_PACKETS:
- /* imsg_compose(ibuf, IMSG_GET_INFO_PARENT_REQUEST, 0, */
- /* 0, -1, NULL, 0); */
+ imsg_compose(ibuf, IMSG_SHOW_PACKETS_REQUEST, 0,
+ 0, -1, res->name, sizeof(res->name));
break;
case SHOW_PARENT:
imsg_compose(ibuf, IMSG_GET_INFO_PARENT_REQUEST, 0,
done = show_control_msg(&imsg);
break;
case SHOW_PACKETS:
+ if (imsg.hdr.type ==
+ IMSG_SHOW_PACKETS_END_DATA) {
+ done = 1;
+ break;
+ }
+ if ((ctl_pkt = calloc(IMSG_DATA_SIZE(&imsg),
+ sizeof(*ctl_pkt))) == NULL)
+ errx(1, "calloc ctl_pkt");
+ if ((ctl_pkt = strndup(imsg.data,
+ IMSG_DATA_SIZE(&imsg))) == NULL) {
+ free(ctl_pkt);
+ break;
+ }
+ printf("%s\n", ctl_pkt);
+ free(ctl_pkt);
+ ctl_pkt = NULL;
break;
case SHOW_PARENT:
done = show_parent_msg(&imsg);
}
printf("\n");
close(ctl_sock);
+ free(ctl_pkt);
free(ibuf);
return (0);
printf(" (%d).\n", npi->verbose);
break;
case IMSG_GET_INFO_PARENT_END_DATA:
- case IMSG_CTL_END:
return (1);
default:
break;
printf(" (%d).\n", nci->verbose);
break;
case IMSG_GET_INFO_CONTROL_END_DATA:
- case IMSG_CTL_END:
return (1);
default:
break;
break;
case IMSG_GET_INFO_THINGS_END_DATA:
- case IMSG_CTL_END:
return (1);
default:
break;
printf("\tSubscriptions:\t\t%zu\n", nci->subs);
break;
case IMSG_GET_INFO_CLIENTS_END_DATA:
- case IMSG_CTL_END:
return (1);
default:
break;
printf("\tMax Clients:\t\t%zu\n", nsi->max_clients);
break;
case IMSG_GET_INFO_SOCKETS_END_DATA:
- case IMSG_CTL_END:
return (1);
default:
break;
blob - b030785bec560fb269b9d6b7aac51335babf3068
blob + 48b06133f16e921c35a6b1d8232ae92b4c721f41
--- thingsd/client.c
+++ thingsd/client.c
void
clients_show_info(struct privsep *ps, struct imsg *imsg)
{
- char filter[THINGSD_MAXTHINGNAME];
+ char filter[THINGSD_MAXNAME];
struct client *client, nci;
size_t n;
blob - c3171e64eba9b219637c50e2c1f4dd3ea060cbc2
blob + 2cc33c7f16dee7afcad5891c3342222604926026
--- thingsd/control.c
+++ thingsd/control.c
struct ctl_connlist ctl_conns;
+int show_ctl, show_fd;
+
struct ctl_conn *control_connbyfd(int);
void control_accept(int, short, void *);
-void control_close(int, struct control_sock *);
+void control_close(struct privsep *, struct imsg *, int,
+ struct control_sock *);
void control_dispatch_imsg(int, short, void *);
int control_dispatch_parent(int, struct privsep_proc *, struct imsg *);
void control_imsg_forward(struct imsg *);
void control_run(struct privsep *, struct privsep_proc *, void *);
static struct privsep_proc procs[] = {
- { "parent", PROC_PARENT, control_dispatch_parent }
+ { "parent", PROC_PARENT, control_dispatch_parent },
};
void
struct ctl_conn *c;
switch (imsg->hdr.type) {
+ case IMSG_SHOW_PACKETS_DATA:
+ case IMSG_SHOW_PACKETS_END_DATA:
case IMSG_GET_INFO_PARENT_DATA:
case IMSG_GET_INFO_PARENT_END_DATA:
case IMSG_GET_INFO_THINGS_DATA:
}
void
-control_close(int fd, struct control_sock *cs)
+control_close(struct privsep *ps, struct imsg *imsg, int fd,
+ struct control_sock *cs)
{
struct ctl_conn *c;
return;
}
+ if (fd == show_fd) {
+ show_ctl = 0;
+ if (proc_compose_imsg(ps, PROC_PARENT, -1,
+ IMSG_SHOW_PACKETS_END_DATA, 0, -1,
+ NULL, 0) == -1)
+ log_warn("shit");
+ }
+
msgbuf_clear(&c->iev.ibuf.w);
TAILQ_REMOVE(&ctl_conns, c, entry);
if (event & EV_READ) {
if (((n = imsg_read(&c->iev.ibuf)) == -1 && errno != EAGAIN) ||
n == 0) {
- control_close(fd, cs);
+ control_close(ps, &imsg, fd, cs);
return;
}
}
if (event & EV_WRITE) {
if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
- control_close(fd, cs);
+ control_close(ps, &imsg, fd, cs);
return;
}
}
for (;;) {
if ((n = imsg_get(&c->iev.ibuf, &imsg)) == -1) {
- control_close(fd, cs);
+ control_close(ps, &imsg, fd, cs);
return;
}
break;
switch (imsg.hdr.type) {
+ case IMSG_SHOW_PACKETS_REQUEST:
+ show_ctl = 1;
+ show_fd = fd;
case IMSG_KILL_CLIENT:
case IMSG_GET_INFO_PARENT_REQUEST:
case IMSG_GET_INFO_THINGS_REQUEST:
&nci, sizeof(struct thingsd_control_info));
break;
case IMSG_KILL_CLIENT:
+ case IMSG_SHOW_PACKETS_REQUEST:
case IMSG_GET_INFO_PARENT_REQUEST:
case IMSG_GET_INFO_THINGS_REQUEST:
case IMSG_GET_INFO_CLIENTS_REQUEST:
if (proc_compose_imsg(ps, PROC_PARENT, -1,
imsg.hdr.type, imsg.hdr.peerid, -1,
imsg.data, IMSG_DATA_SIZE(&imsg)) == -1) {
- control_close(fd, cs);
+ control_close(ps, &imsg, fd, cs);
return;
}
break;
default:
log_debug("%s: error handling imsg %d",
__func__, imsg.hdr.type);
- control_close(fd, cs);
+ control_close(ps, &imsg, fd, cs);
break;
}
imsg_free(&imsg);
imsg_compose_event(&c->iev, IMSG_CTL_FAIL,
0, 0, -1, &ret, sizeof(ret));
imsg_flush(&c->iev.ibuf);
- control_close(fd, cs);
+ control_close(ps, &imsg, fd, cs);
}
void
blob - 72e91a8c775939b263982ab28c8ac4b207685385
blob + 1b5b678182ce5cf3dd34712005b3d8a0933aa9e0
--- thingsd/events.c
+++ thingsd/events.c
struct thing *thing = NULL, *tthing;
struct client *client;
char pkt[PKT_BUFF];
- int len;
+ int len, snm;
size_t n;
socklen_t *addrlen = NULL;
struct sockaddr *addr = NULL;
len);
}
}
+
+ if (env->control_pkt.exists) {
+ if (strlen(env->control_pkt.name) != 0)
+ if ((snm = strcmp(thing->name,
+ env->control_pkt.name)) == 0)
+ send_control_pkt(
+ &env->control_pkt.ps,
+ &env->control_pkt.imsg,
+ thing->name, pkt, len);
+ }
+
}
}
blob - 52a08897c70d3e3cfff206e3676af69e50330dc8
blob + 07d7c1ce586a14ed9fcca6d2471daea1d64f9f4f
--- thingsd/proc.h
+++ thingsd/proc.h
IMSG_CTL_OK,
IMSG_CTL_FAIL,
IMSG_CTL_VERBOSE,
- IMSG_CTL_END,
IMSG_CTL_NOTIFY,
IMSG_CTL_RESET,
IMSG_CTL_PROCFD,
blob - 35c7f47666d2a74f462981519b04839c968b5d57
blob + 6a3c4d731daa364a01b6be929065f165c476a45d
--- thingsd/sockets.c
+++ thingsd/sockets.c
struct thing *thing = NULL, *tthing;
struct client *client;
size_t len;
- int fd = bev->ev_read.ev_fd;
+ int fd = bev->ev_read.ev_fd, snm;
size_t n;
char *pkt = NULL;
}
}
+ if (env->control_pkt.exists) {
+ if (strlen(env->control_pkt.name) != 0)
+ if ((snm = strcmp(thing->name,
+ env->control_pkt.name)) == 0)
+ send_control_pkt(
+ &env->control_pkt.ps,
+ &env->control_pkt.imsg,
+ thing->name, pkt, len);
+ }
+
free(pkt);
pkt = NULL;
}
}
+ free(pkt);
}
void
void
sockets_show_info(struct privsep *ps, struct imsg *imsg)
{
- char filter[THINGSD_MAXTHINGNAME];
+ char filter[THINGSD_MAXNAME];
struct socket *socket, nsi;
size_t n;
blob - ee3366adb6d80c0dd57abbf3e79fae416ef8d6ea
blob + 6a2a6d1d54586009b1ffa269e886a96e2dd09c40
--- thingsd/things.c
+++ thingsd/things.c
config_getreset(thingsd_env, imsg);
break;
case IMSG_CTL_VERBOSE:
- log_info("%s", __func__);
IMSG_SIZE_CHECK(imsg, &verbose);
memcpy(&verbose, imsg->data, sizeof(verbose));
log_setverbose(verbose);
}
void
+things_echo_pkt(struct privsep *ps, struct imsg *imsg)
+{
+ if (thingsd_env->thing_pkt.exists)
+ return;
+ thingsd_env->thing_pkt.ps = *ps;
+ thingsd_env->thing_pkt.imsg = *imsg;
+ memcpy(thingsd_env->thing_pkt.name, imsg->data,
+ sizeof(thingsd_env->thing_pkt.name));
+ thingsd_env->thing_pkt.exists = true;
+}
+
+void
+things_stop_pkt(void)
+{
+ /* memset(thingsd_env->thing_pkt.name, 0, */
+ /* sizeof(thingsd_env->thing_pkt.name)); */
+ thingsd_env->thing_pkt.exists = false;
+}
+
+void
things_show_info(struct privsep *ps, struct imsg *imsg)
{
- char filter[THINGSD_MAXTHINGNAME];
+ char filter[THINGSD_MAXNAME];
struct thing *thing, nti;
switch (imsg->hdr.type) {
if (thingsd_env->dcount == 0)
thingsd_env->exists = false;
}
+
+void
+send_thing_pkt(struct privsep *ps, struct imsg *imsg, char *name, char *pkt,
+ int len)
+{
+ if (proc_compose_imsg(ps, PROC_CONTROL, -1,
+ IMSG_SHOW_PACKETS_DATA, imsg->hdr.peerid, -1, pkt, len) == -1)
+ return;
+}
blob - ed3b4fd458588303b1670eb16e0b97ef9fa255e7
blob + 358abdd780fc60ae01bb48174c06da381a3f8a60
--- thingsd/thingsd.c
+++ thingsd/thingsd.c
struct privsep *ps = p->p_ps;
int res = 0, cmd = 0, verbose;
unsigned int v = 0;
- char client_name[THINGSD_MAXTHINGNAME];
+ char client_name[THINGSD_MAXNAME];
struct client *client;
switch (imsg->hdr.type) {
+ case IMSG_SHOW_PACKETS_END_DATA:
+ things_stop_pkt();
+ break;
+ case IMSG_SHOW_PACKETS_REQUEST:
+ IMSG_SIZE_CHECK(imsg, &v);
+ if (imsg->data == NULL)
+ break;
+ things_echo_pkt(ps, imsg);
+ break;
case IMSG_KILL_CLIENT:
IMSG_SIZE_CHECK(imsg, &v);
if (imsg->data == NULL)
blob - 53870c81c9376caa219e01ab63dfed5fbc02deac
blob + aa032eaa2d4ad6a46db69f50b8ff1958cf34f6e2
--- thingsd/thingsd.h
+++ thingsd/thingsd.h
#define TLSFLAG_BITS "\10\01CA\02CRL\03OPTIONAL"
#define THINGSD_MAXTEXT 511
-#define THINGSD_MAXTHINGNAME 16
+#define THINGSD_MAXNAME 16
#define THINGS_NUMPROC 3
IMSG_GET_INFO_SOCKETS_DATA,
IMSG_GET_INFO_SOCKETS_END_DATA,
+ IMSG_SHOW_PACKETS_REQUEST,
+ IMSG_SHOW_PACKETS_DATA,
+ IMSG_SHOW_PACKETS_END_DATA,
+
IMSG_ADD_THING,
-
IMSG_KILL_CLIENT,
};
struct bufferevent *bev;
struct socket *socket;
bool subscribed;
- char name[THINGSD_MAXTEXT];
+ char name[THINGSD_MAXNAME];
char *sub_names[THINGSD_MAXTEXT];
int fd;
int port;
struct socket {
TAILQ_ENTRY(socket) entry;
struct event *ev;
- char name[THINGSD_MAXTEXT];
+ char name[THINGSD_MAXNAME];
int fd;
int port;
size_t client_cnt;
char iface[THINGSD_MAXTEXT];
char ipaddr[THINGSD_MAXTEXT];
- char name[THINGSD_MAXTHINGNAME];
+ char name[THINGSD_MAXNAME];
char parity[THINGSD_MAXTEXT];
char password[THINGSD_MAXTEXT];
char location[THINGSD_MAXTEXT];
volatile sig_atomic_t run;
};
+struct thing_pkt {
+ TAILQ_ENTRY(thing_pkt) entry;
+ struct privsep ps;
+ struct imsg imsg;
+ char name[THINGSD_MAXNAME];
+ bool exists;
+};
+TAILQ_HEAD(controlpacketlist, thing_pkt);
+
struct thingsd {
struct thinglist *things;
struct clientlist *clients;
struct socketlist *sockets;
+ struct thingpktlist *control
struct privsep thingsd_ps;
const char *thingsd_conffile;
struct event things_evsigquit;
struct event things_evsigterm;
struct event things_evsigint;
+ struct thing_pkt thing_pkt;
};
extern struct thingsd *thingsd_env;
void do_reconn(void);
void things_sighdlr(int, short, void *);
void things_show_info(struct privsep *, struct imsg *);
+void things_echo_pkt(struct privsep *, struct imsg *);
+void things_stop_pkt(void);
+void send_thing_pkt(struct privsep *, struct imsg *, char *, char *, int);
/* control.c */
int config_init(struct thingsd *);