From 4f0f2c0f4e8acdf8221e07eeeeb621c492144b1a Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 12 Apr 2017 09:10:10 -0700
Subject: [PATCH] lightningd/gossip: use msg_queue instead of open-coded queue.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 lightningd/gossip/gossip.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lightningd/gossip/gossip.c b/lightningd/gossip/gossip.c
index 872b8f8a3..fc387005a 100644
--- a/lightningd/gossip/gossip.c
+++ b/lightningd/gossip/gossip.c
@@ -64,7 +64,10 @@ struct peer {
 
 	/* High water mark for the staggered broadcast */
 	u64 broadcast_index;
-	u8 **msg_out;
+
+	/* Message queue for outgoing. */
+	struct msg_queue peer_out;
+
 	/* Is it time to continue the staggered broadcast? */
 	bool gossip_sync;
 
@@ -99,7 +102,7 @@ static struct peer *setup_new_peer(struct daemon *daemon, const u8 *msg)
 	peer->daemon = daemon;
 	peer->error = NULL;
 	peer->local = true;
-	peer->msg_out = tal_arr(peer, u8*, 0);
+	msg_queue_init(&peer->peer_out, peer);
 	list_add_tail(&daemon->peers, &peer->list);
 	tal_add_destructor(peer, destroy_peer);
 	wake_pkt_out(peer);
@@ -239,7 +242,7 @@ static void wake_pkt_out(struct peer *peer)
 	new_reltimer(&peer->daemon->timers, peer, time_from_sec(30),
 		     wake_pkt_out, peer);
 	/* Notify the peer-write loop */
-	io_wake(peer);
+	io_wake(&peer->peer_out);
 	/* Notify the daemon_conn-write loop */
 	io_wake(&peer->owner_conn.out);
 }
@@ -256,7 +259,7 @@ static struct io_plan *peer_dump_gossip(struct io_conn *conn, struct peer *peer)
 	if (!next) {
 		/* Going to wake up in pkt_out since we mix time based and
 		 * message based wakeups */
-		return io_out_wait(conn, peer, pkt_out, peer);
+		return msg_queue_wait(conn, &peer->peer_out, pkt_out, peer);
 	} else {
 		/* Do not free the message after send, queue_broadcast takes
 		 * care of that */
@@ -269,21 +272,16 @@ static struct io_plan *pkt_out(struct io_conn *conn, struct peer *peer)
 {
 	assert(peer->local);
 	/* First we process queued packets, if any */
-	u8 *out;
-	size_t n = tal_count(peer->msg_out);
-	if (n > 0) {
-		out = peer->msg_out[0];
-		memmove(peer->msg_out, peer->msg_out + 1, (sizeof(*peer->msg_out)*(n-1)));
-		tal_resize(&peer->msg_out, n-1);
+	const u8 *out = msg_dequeue(&peer->peer_out);
+	if (out)
 		return peer_write_message(conn, &peer->pcs, take(out), pkt_out);
-	}
 
 	if (peer->gossip_sync && peer->local){
 		/* Send any queued up broadcast messages */
 		peer->gossip_sync = false;
 		return peer_dump_gossip(conn, peer);
 	} else {
-		return io_out_wait(conn, peer, pkt_out, peer);
+		return msg_queue_wait(conn, &peer->peer_out, pkt_out, peer);
 	}
 }