commit ad7498b763dad1a24a8c3a93e3660d9e8ac37ee6 from: Tracey Emery date: Sat Jul 25 20:48:57 2020 UTC slight refactor to prepare for multiple clients to get echo'd packets if multiple clients try to connect at this point, there is majour breakage, so one iteration of thingsctl echo thing at a time commit - 5a75c71e3a8a283865a9adfb1c4c7de1d127f3ed commit + ad7498b763dad1a24a8c3a93e3660d9e8ac37ee6 blob - 1b5b678182ce5cf3dd34712005b3d8a0933aa9e0 blob + 487ca7426dacce2de0293ff44cc89fb8fdc15237 --- thingsd/events.c +++ thingsd/events.c @@ -60,13 +60,13 @@ udp_event(int fd, short event, void *arg) } } - if (env->control_pkt.exists) { - if (strlen(env->control_pkt.name) != 0) + if (env->packet_client_count > 0) { + if (strlen(env->packet_client.name) != 0) if ((snm = strcmp(thing->name, - env->control_pkt.name)) == 0) - send_control_pkt( - &env->control_pkt.ps, - &env->control_pkt.imsg, + env->packet_client.name)) == 0) + send_to_packet_client( + &env->packet_client.ps, + &env->packet_client.imsg, thing->name, pkt, len); } blob - 6a3c4d731daa364a01b6be929065f165c476a45d blob + 1659b589fad2b4425cefd9d9d324106ecdb2868d --- thingsd/sockets.c +++ thingsd/sockets.c @@ -440,13 +440,13 @@ socket_rd(struct bufferevent *bev, void *arg) } } - if (env->control_pkt.exists) { - if (strlen(env->control_pkt.name) != 0) + if (env->packet_client_count > 0) { + if (strlen(env->packet_client.name) != 0) if ((snm = strcmp(thing->name, - env->control_pkt.name)) == 0) - send_control_pkt( - &env->control_pkt.ps, - &env->control_pkt.imsg, + env->packet_client.name)) == 0) + send_to_packet_client( + &env->packet_client.ps, + &env->packet_client.imsg, thing->name, pkt, len); } blob - 6a2a6d1d54586009b1ffa269e886a96e2dd09c40 blob + 438f208897464a23bb4f8f36bb5f6f3fe64c741b --- thingsd/things.c +++ thingsd/things.c @@ -287,21 +287,23 @@ things_shutdown(void) 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; + /* if (thingsd_env->packet_client.exists) */ + /* return; */ + thingsd_env->packet_client_count++; + + + thingsd_env->packet_client.ps = *ps; + thingsd_env->packet_client.imsg = *imsg; + memcpy(thingsd_env->packet_client.name, imsg->data, + sizeof(thingsd_env->packet_client.name)); } void things_stop_pkt(void) { - /* memset(thingsd_env->thing_pkt.name, 0, */ - /* sizeof(thingsd_env->thing_pkt.name)); */ - thingsd_env->thing_pkt.exists = false; + /* memset(thingsd_env->packet_client.name, 0, */ + /* sizeof(thingsd_env->packet_client.name)); */ + thingsd_env->packet_client_count--; } void @@ -492,7 +494,7 @@ do_reconn(void) TAILQ_FOREACH_SAFE(dead_thing, thingsd_env->dead_things->dead_things_list, entry, tdead_thing) { TAILQ_FOREACH(thing, thingsd_env->things, entry) { - if (strcmp(thing->name, dead_thing->name) == 0 && + if (strcmp(thing->name, dead_thing->name) == 0 && thing->exists) { TAILQ_REMOVE(thingsd_env->dead_things-> dead_things_list, @@ -511,8 +513,8 @@ do_reconn(void) } void -send_thing_pkt(struct privsep *ps, struct imsg *imsg, char *name, char *pkt, - int len) +send_to_packet_client(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) blob - aa032eaa2d4ad6a46db69f50b8ff1958cf34f6e2 blob + b2a23ef1fbd313f922e4d11d4b8d23716d1a5d55 --- thingsd/thingsd.h +++ thingsd/thingsd.h @@ -208,20 +208,18 @@ struct dead_things { volatile sig_atomic_t run; }; -struct thing_pkt { - TAILQ_ENTRY(thing_pkt) entry; +struct packet_client { + TAILQ_ENTRY(packet_client) entry; struct privsep ps; struct imsg imsg; char name[THINGSD_MAXNAME]; - bool exists; }; -TAILQ_HEAD(controlpacketlist, thing_pkt); +TAILQ_HEAD(packetclientlist, packet_client); struct thingsd { struct thinglist *things; struct clientlist *clients; struct socketlist *sockets; - struct thingpktlist *control struct privsep thingsd_ps; const char *thingsd_conffile; @@ -249,7 +247,12 @@ struct thingsd { struct event things_evsigquit; struct event things_evsigterm; struct event things_evsigint; - struct thing_pkt thing_pkt; + + /* control packets */ + struct packetclientlist *packet_clients; + int packet_client_count; + /* XXX: kill this when converted to multiple packet clients */ + struct packet_client packet_client; }; extern struct thingsd *thingsd_env; @@ -301,7 +304,8 @@ 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); +void send_to_packet_client(struct privsep *, struct imsg *, char *, char *, + int); /* control.c */ int config_init(struct thingsd *);