commit - 04e3345d9c84c27f06fa0c736448c1c858172b99
commit + eac7a4237ef12ce112175e5eb9ba4679a19853ca
blob - e9994688ec888a3fab9bafba2e88f57403f1647e
blob + 75a0a158017e477d4ad54244b51d7589907c0393
--- thingsctl/parser.c
+++ thingsctl/parser.c
NOTOKEN,
ENDTOKEN,
CLIENTNAME,
+ SOCKETNAME,
THINGNAME,
KEYWORD
};
static const struct token t_main[];
static const struct token t_show[];
static const struct token t_client_name[];
+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_main[] = {
{KEYWORD, "reload", RELOAD, NULL},
{KEYWORD, "list", LIST, t_list},
{KEYWORD, "show", SHOW, t_show},
{KEYWORD, "log", NONE, t_log},
- {KEYWORD, "kill", KILL_CLIENT, t_client_name},
+ {KEYWORD, "kill", NONE, t_kill_name},
{ENDTOKEN, "", NONE, NULL}
};
static const struct token t_show[] = {
{KEYWORD, "parent", SHOW_PARENT, NULL},
{KEYWORD, "control", SHOW_CONTROL, NULL},
- {KEYWORD, "thing", SHOW_PACKETS, t_thing_name},
+ {KEYWORD, "client", NONE, t_client_name},
+ {KEYWORD, "socket", NONE, t_socket_name},
+ {KEYWORD, "thing", NONE, t_thing_name},
{ENDTOKEN, "", NONE, NULL}
};
};
static const struct token t_client_name[] = {
- {CLIENTNAME, "", NONE, NULL},
+ {CLIENTNAME, "", LIST_CLIENTS, NULL},
{ENDTOKEN, "", NONE, NULL}
};
+static const struct token t_kill_name[] = {
+ {CLIENTNAME, "", KILL_CLIENT, NULL},
+ {ENDTOKEN, "", NONE, NULL}
+};
+
+static const struct token t_socket_name[] = {
+ {SOCKETNAME, "", LIST_SOCKETS, 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 *);
break;
case THINGNAME:
case CLIENTNAME:
+ case SOCKETNAME:
if (!match && word != NULL && strlen(word) > 0) {
memset(res->name, 0,
sizeof(res->name));
case THINGNAME:
fprintf(stderr, " <thing_name>\n");
break;
+ case SOCKETNAME:
+ fprintf(stderr, " <socket_name>\n");
+ break;
case CLIENTNAME:
fprintf(stderr, " <client_name>\n");
break;
blob - 293dcfd3719603d8f6004d52d3764f78f9f28230
blob + 97f97b38314f41b86205e14f26763efd3fbbe3bf
--- thingsctl/thingsctl.c
+++ thingsctl/thingsctl.c
break;
case LIST_CLIENTS:
imsg_compose(ibuf, IMSG_GET_INFO_CLIENTS_REQUEST, 0,
- 0, -1, NULL, 0);
+ 0, -1, res->name, sizeof(res->name));
break;
case LIST_SOCKETS:
imsg_compose(ibuf, IMSG_GET_INFO_SOCKETS_REQUEST, 0,
- 0, -1, NULL, 0);
+ 0, -1, res->name, sizeof(res->name));
break;
case LIST_THINGS:
imsg_compose(ibuf, IMSG_GET_INFO_THINGS_REQUEST, 0,
done = show_control_msg(&imsg);
break;
case SHOW_PACKETS:
- done = 1;
break;
case SHOW_PARENT:
done = show_parent_msg(&imsg);
blob - 39ee502f264439054a6584d7c3fc9bff18ad956b
blob + b030785bec560fb269b9d6b7aac51335babf3068
--- thingsd/client.c
+++ thingsd/client.c
memcpy(filter, imsg->data, sizeof(filter));
TAILQ_FOREACH(client, thingsd_env->clients, entry) {
- /* if (filter[0] == '\0' || memcmp(filter, */
- /* client->name, sizeof(filter)) == 0) { */
+ if (filter[0] == '\0' || memcmp(filter,
+ client->name, sizeof(filter)) == 0) {
n = strlcpy(nci.name, client->name,
sizeof(nci.name));
sizeof(nci)) == -1)
return;
- /* } */
+ }
}
if (proc_compose_imsg(ps, PROC_CONTROL, -1,
blob - 3140454b9eed4292dc449f062cdb5091dc7b7a36
blob + 35c7f47666d2a74f462981519b04839c968b5d57
--- thingsd/sockets.c
+++ thingsd/sockets.c
memcpy(filter, imsg->data, sizeof(filter));
TAILQ_FOREACH(socket, thingsd_env->sockets, entry) {
- /* if (filter[0] == '\0' || memcmp(filter, */
- /* socket->name, sizeof(filter)) == 0) { */
+ if (filter[0] == '\0' || memcmp(filter,
+ socket->name, sizeof(filter)) == 0) {
n = strlcpy(nsi.name, socket->name,
sizeof(nsi.name));
sizeof(nsi)) == -1)
return;
- /* } */
+ }
}
if (proc_compose_imsg(ps, PROC_CONTROL, -1,