Commit Diff


commit - ad7498b763dad1a24a8c3a93e3660d9e8ac37ee6
commit + 47c9f5f0b2b3086e00efc35ad9451dcaadc24e7e
blob - 1425dd6c1c3755bbcbe5cc83e417b5116bc8794a
blob + 28b7bbb98735131a022c655a7a274115314a240f
--- thingsd/config.c	
+++ thingsd/config.c	
@@ -72,10 +72,14 @@ config_init(struct thingsd *env)
 		    sizeof(*env->dead_things->dead_things_list));
 		if (env->dead_things->dead_things_list == NULL)
 			return (-1);
+		env->packet_clients = calloc(1, sizeof(*env->packet_clients));
+		if (env->packet_clients == NULL)
+			return (-1);
 		TAILQ_INIT(env->things);
 		TAILQ_INIT(env->sockets);
 		TAILQ_INIT(env->clients);
 		TAILQ_INIT(env->dead_things->dead_things_list);
+		TAILQ_INIT(env->packet_clients);
 	}
 	return (0);
 }
blob - 2cc33c7f16dee7afcad5891c3342222604926026
blob + 6e0725ae6c10055e095a96cd200120a61bb8993e
--- thingsd/control.c	
+++ thingsd/control.c	
@@ -43,8 +43,6 @@
 
 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(struct privsep *, struct imsg *, int,
@@ -276,13 +274,10 @@ control_close(struct privsep *ps, struct imsg *imsg, i
 		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");
-	}
+	if (proc_compose_imsg(ps, PROC_PARENT, -1,
+	    IMSG_SHOW_PACKETS_END_DATA, 0, -1,
+	    &fd, sizeof(fd)) == -1)
+		log_warn("fd not sent to parent to close");
 
 	msgbuf_clear(&c->iev.ibuf.w);
 	TAILQ_REMOVE(&ctl_conns, c, entry);
@@ -347,8 +342,6 @@ control_dispatch_imsg(int fd, short event, void *arg)
 
 		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:
@@ -380,12 +373,9 @@ control_dispatch_imsg(int fd, short event, void *arg)
 			c->flags |= CTL_CONN_NOTIFY;
 			break;
 		case IMSG_CTL_VERBOSE:
-			log_info("%s", __func__);
 			IMSG_SIZE_CHECK(&imsg, &v);
-
 			memcpy(&v, imsg.data, sizeof(v));
 			log_setverbose(v);
-
 			proc_forward_imsg(ps, &imsg, PROC_PARENT, -1);
 			break;
 		case IMSG_GET_INFO_CONTROL_REQUEST:
blob - 487ca7426dacce2de0293ff44cc89fb8fdc15237
blob + d741d2a36d7bd88c792c0c20a638f121ace62d92
--- thingsd/events.c	
+++ thingsd/events.c	
@@ -33,7 +33,7 @@ udp_event(int fd, short event, void *arg)
 	struct thing		*thing = NULL, *tthing;
 	struct client		*client;
 	char			 pkt[PKT_BUFF];
-	int			 len, snm;
+	int			 len;
 	size_t			 n;
 	socklen_t		*addrlen = NULL;
 	struct sockaddr		*addr = NULL;
@@ -60,15 +60,8 @@ udp_event(int fd, short event, void *arg)
 			}
 		}
 
-		if (env->packet_client_count > 0) {
-			if (strlen(env->packet_client.name) != 0)
-				if ((snm = strcmp(thing->name,
-				    env->packet_client.name)) == 0)
-					send_to_packet_client(
-					    &env->packet_client.ps,
-					    &env->packet_client.imsg,
-					    thing->name, pkt, len);
-		}
+		if (env->packet_client_count > 0)
+			send_to_packet_client(env, thing->name, pkt, len);
 
 	}
 }
blob - 1659b589fad2b4425cefd9d9d324106ecdb2868d
blob + 441381b4142211cab1b9091709c21b74e937ff07
--- thingsd/sockets.c	
+++ thingsd/sockets.c	
@@ -414,7 +414,7 @@ socket_rd(struct bufferevent *bev, void *arg)
 	struct thing		*thing = NULL, *tthing;
 	struct client		*client;
 	size_t			 len;
-	int			 fd = bev->ev_read.ev_fd, snm;
+	int			 fd = bev->ev_read.ev_fd;
 	size_t			 n;
 	char			*pkt = NULL;
 
@@ -440,15 +440,9 @@ socket_rd(struct bufferevent *bev, void *arg)
 				}
 			}
 
-			if (env->packet_client_count > 0) {
-				if (strlen(env->packet_client.name) != 0)
-					if ((snm = strcmp(thing->name,
-					    env->packet_client.name)) == 0)
-						send_to_packet_client(
-						    &env->packet_client.ps,
-						    &env->packet_client.imsg,
-						    thing->name, pkt, len);
-			}
+			if (env->packet_client_count > 0)
+				send_to_packet_client(env, thing->name, pkt,
+				    len);
 
 			free(pkt);
 			pkt = NULL;
blob - 438f208897464a23bb4f8f36bb5f6f3fe64c741b
blob + dbe8eccfd67314d4a604784e98e583b0cf5c6d13
--- thingsd/things.c	
+++ thingsd/things.c	
@@ -287,22 +287,41 @@ things_shutdown(void)
 void
 things_echo_pkt(struct privsep *ps, struct imsg *imsg)
 {
-	/* if (thingsd_env->packet_client.exists) */
-	/* 	return; */
+	struct packet_client	*packet_client;
+
+	packet_client = calloc(1, sizeof(*packet_client));
+	if (packet_client == NULL)
+		fatalx("no calloc packet_client");
+
 	thingsd_env->packet_client_count++;
 
+	packet_client->ps = *ps;
+	packet_client->imsg = *imsg;
+	memcpy(packet_client->name, imsg->data,  sizeof(packet_client->name));
 
-	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));
+	TAILQ_INSERT_TAIL(thingsd_env->packet_clients, packet_client, entry);
 }
 
 void
-things_stop_pkt(void)
+things_stop_pkt(struct privsep *ps, struct imsg *imsg)
 {
-	/* memset(thingsd_env->packet_client.name, 0, */
-	/*     sizeof(thingsd_env->packet_client.name)); */
+	struct packet_client	*packet_client, *tpacket_client;
+	uint32_t		 fd;
+
+	memcpy(&fd, imsg->data, sizeof(fd));
+
+	TAILQ_FOREACH_SAFE(packet_client, thingsd_env->packet_clients, entry,
+	    tpacket_client) {
+		if (fd == packet_client->imsg.hdr.peerid) {
+			TAILQ_REMOVE(thingsd_env->packet_clients,
+			    packet_client, entry);
+
+			free(packet_client);
+
+			return;
+		}
+	}
+
 	thingsd_env->packet_client_count--;
 }
 
@@ -450,7 +469,8 @@ struct dead_thing
 	struct dead_thing	*dead_thing;
 	size_t			 n;
 
-	if ((dead_thing = calloc(1, sizeof(*dead_thing))) == NULL)
+	dead_thing = calloc(1, sizeof(*dead_thing));
+	if (dead_thing == NULL)
 		fatalx("no calloc dead_thing");
 
 	log_debug("%s: adding detached thing, %s", __func__, thing->name);
@@ -494,7 +514,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,
@@ -513,10 +533,20 @@ do_reconn(void)
 }
 
 void
-send_to_packet_client(struct privsep *ps, struct imsg *imsg, char *name,
-    char *pkt, int len)
+send_to_packet_client(struct thingsd *env, 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;
-}
+	struct packet_client	*packet_client;
+	int			 snm;
+
+	TAILQ_FOREACH(packet_client, env->packet_clients, entry) {
+		if (strlen(packet_client->name) != 0)
+			if ((snm = strcmp(name, packet_client->name)) == 0)
+				if (proc_compose_imsg(&packet_client->ps,
+				    PROC_CONTROL, -1, IMSG_SHOW_PACKETS_DATA,
+				    packet_client->imsg.hdr.peerid, -1,
+				    pkt, len) == -1)
+				return;
+
+
+	}
+}
\ No newline at end of file
blob - 358abdd780fc60ae01bb48174c06da381a3f8a60
blob + 4672c5eac1d4554526a05d9bf7dde89b891c3bf8
--- thingsd/thingsd.c	
+++ thingsd/thingsd.c	
@@ -80,7 +80,10 @@ thingsd_dispatch_control(int fd, struct privsep_proc *
 
 	switch (imsg->hdr.type) {
 	case IMSG_SHOW_PACKETS_END_DATA:
-		things_stop_pkt();
+		IMSG_SIZE_CHECK(imsg, &v);
+		if (imsg->data == NULL)
+			break;
+		things_stop_pkt(ps, imsg);
 		break;
 	case IMSG_SHOW_PACKETS_REQUEST:
 		IMSG_SIZE_CHECK(imsg, &v);
@@ -121,7 +124,6 @@ thingsd_dispatch_control(int fd, struct privsep_proc *
 		thingsd_reload(v);
 		break;
 	case IMSG_CTL_VERBOSE:
-			log_info("%s", __func__);
 		IMSG_SIZE_CHECK(imsg, &verbose);
 		memcpy(&verbose, imsg->data, sizeof(verbose));
 		log_setverbose(verbose);
@@ -150,7 +152,6 @@ thingsd_dispatch_things(int fd, struct privsep_proc *p
 {
 	struct privsep		*ps = p->p_ps;
 
-	log_info("%s", __func__);
 	switch (imsg->hdr.type) {
 	case IMSG_ADD_THING:
 		proc_forward_imsg(ps, imsg, PROC_CONTROL, -1);
blob - b2a23ef1fbd313f922e4d11d4b8d23716d1a5d55
blob + a8da26e3d21a2f780fb4d3113e8f2e8e30db4109
--- thingsd/thingsd.h	
+++ thingsd/thingsd.h	
@@ -212,6 +212,7 @@ struct packet_client {
 	TAILQ_ENTRY(packet_client)	 entry;
 	struct privsep		 ps;
 	struct imsg		 imsg;
+	int			 fd;
 	char			 name[THINGSD_MAXNAME];
 };
 TAILQ_HEAD(packetclientlist, packet_client);
@@ -251,8 +252,6 @@ struct thingsd {
 	/* 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;
@@ -303,9 +302,8 @@ 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_to_packet_client(struct privsep *, struct imsg *, char *, char *,
-	    int);
+void	 things_stop_pkt(struct privsep *, struct imsg *);
+void	 send_to_packet_client(struct thingsd *, char *, char *, int);
 
 /* control.c */
 int	 config_init(struct thingsd *);