Commit Diff


commit - 350902854b1847f1c19e3690e200acdb44d46c9a
commit + 3668869eac0eb1676f0f695fb6767dece4cd65b4
blob - 48b06133f16e921c35a6b1d8232ae92b4c721f41
blob + 08883bde1fd5eec74bb68b3a2f7203791ab11650
--- thingsd/client.c	
+++ thingsd/client.c	
@@ -31,8 +31,7 @@
 #include "proc.h"
 #include "thingsd.h"
 
-extern void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t,
-    void *);
+void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *);
 
 void
 client_conn(int fd, short event, void *arg)
blob - 647134e7b2793091f4d9b22b76bffaf21e8b4e92
blob + bf516a27d3bc9900d2410be5664e922ae3d9f967
--- thingsd/things.c	
+++ thingsd/things.c	
@@ -215,7 +215,14 @@ things_reset(void)
 	struct thing		*thing, *tthing;
 	struct socket		*sock, *tsock;
 	struct client		*client, *tclient;
+	struct packet_client	*packet_client, *tpacket_client;
 
+	/* clean up packet clients */
+	TAILQ_FOREACH_SAFE(packet_client, thingsd_env->packet_clients, entry,
+	    tpacket_client) {
+		TAILQ_REMOVE(thingsd_env->packet_clients, packet_client, entry);
+	}
+
 	/* clean up clients */
 	TAILQ_FOREACH_SAFE(client, thingsd_env->clients, entry, tclient) {
 		close(client->fd);
@@ -246,8 +253,16 @@ things_shutdown(void)
 	struct thing		*thing, *tthing;
 	struct socket		*sock, *tsock;
 	struct client		*client, *tclient;
-	struct dead_thing	*dead_thing, *dead_tthing;
+	struct dead_thing	*dead_thing, *tdead_thing;
+	struct packet_client	*packet_client, *tpacket_client;
 
+	/* clean up packet clients */
+	TAILQ_FOREACH_SAFE(packet_client, thingsd_env->packet_clients, entry,
+	    tpacket_client) {
+		TAILQ_REMOVE(thingsd_env->packet_clients, packet_client, entry);
+		free(packet_client);
+	}
+
 	/* clean up things */
 	TAILQ_FOREACH_SAFE(thing, thingsd_env->things, entry, tthing) {
 		close(thing->fd);
@@ -257,7 +272,7 @@ things_shutdown(void)
 
 	/* clean up dead things */
 	TAILQ_FOREACH_SAFE(dead_thing,
-	    thingsd_env->dead_things->dead_things_list, entry, dead_tthing) {
+	    thingsd_env->dead_things->dead_things_list, entry, tdead_thing) {
 		TAILQ_REMOVE(thingsd_env->dead_things->dead_things_list,
 		    dead_thing, entry);
 		free(dead_thing);