From 7aa29f1364657b0d2451a0764f6f5d961ba4ebb9 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Wed, 2 Mar 2016 18:54:41 -0800
Subject: [PATCH] Apparently I missed receive when I switched to the new list
 impl.

---
 adsbus/receive.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/adsbus/receive.c b/adsbus/receive.c
index fb88725..bdde8a5 100644
--- a/adsbus/receive.c
+++ b/adsbus/receive.c
@@ -11,6 +11,7 @@
 #include "buf.h"
 #include "flow.h"
 #include "json.h"
+#include "list.h"
 #include "packet.h"
 #include "peer.h"
 #include "proto.h"
@@ -32,10 +33,9 @@ struct receive {
 	char parser_state[PARSER_STATE_LEN];
 	parser_wrapper parser_wrapper;
 	parser parser;
-	struct receive *prev;
-	struct receive *next;
+	struct list_head receive_list;
 };
-static struct receive *receive_head = NULL;
+static struct list_head receive_head = LIST_HEAD_INIT(receive_head);
 
 static void receive_new(int, void *, struct peer *);
 
@@ -97,14 +97,7 @@ static void receive_del(struct receive *receive) {
 	peer_count_in--;
 	peer_epoll_del((struct peer *) receive);
 	assert(!close(receive->peer.fd));
-	if (receive->prev) {
-		receive->prev->next = receive->next;
-	} else {
-		receive_head = receive->next;
-	}
-	if (receive->next) {
-		receive->next->prev = receive->prev;
-	}
+	list_del(&receive->receive_list);
 	peer_call(receive->on_close);
 	free(receive);
 }
@@ -152,20 +145,18 @@ static void receive_new(int fd, void __attribute__((unused)) *passthrough, struc
 	buf_init(&receive->buf);
 	memset(receive->parser_state, 0, PARSER_STATE_LEN);
 	receive->parser_wrapper = receive_autodetect_parse;
-	receive->prev = NULL;
-	receive->next = receive_head;
-	if (receive->next) {
-		receive->next->prev = receive;
-	}
-	receive_head = receive;
+
+	list_add(&receive->receive_list, &receive_head);
+
 	peer_epoll_add((struct peer *) receive, EPOLLIN);
 
 	fprintf(stderr, "R %s: New receive connection\n", receive->id);
 }
 
 void receive_cleanup() {
-	while (receive_head) {
-		receive_del(receive_head);
+	struct receive *iter, *next;
+	list_for_each_entry_safe(iter, next, &receive_head, receive_list) {
+		receive_del(iter);
 	}
 }