aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 17:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: don't close conn until we've sent all the output packets.

Browse Source 
Otherwise we won't finish the conversation.  In fact, only the writer
side should ever close: we wake it if we want to close and it tests
peer->cond.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-01-22 06:45:28 +10:30
parent 8b666ea449
commit f3c5aa7634
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
daemon/peer.c
View File

@@ -149,8 +149,9 @@ static void state_single(struct peer *peer,
bitcoind_send_tx(peer->dstate, broadcast); bitcoind_send_tx(peer->dstate, broadcast);
} }
/* Start output if not running already; it will close conn. */
if (peer->cond == PEER_CLOSED) if (peer->cond == PEER_CLOSED)
io_close(peer->conn); io_wake(peer);
} }
static void try_command(struct peer *peer) static void try_command(struct peer *peer)
@@ -170,9 +171,6 @@ static void try_command(struct peer *peer)
if (peer->curr_cmd.cmd != INPUT_NONE) { if (peer->curr_cmd.cmd != INPUT_NONE) {
state_single(peer, peer->curr_cmd.cmd, state_single(peer, peer->curr_cmd.cmd,
&peer->curr_cmd.cmddata); &peer->curr_cmd.cmddata);
if (peer->cond == PEER_CLOSED)
io_close(peer->conn);
} }
} }
} }
@@ -209,8 +207,12 @@ static struct io_plan *pkt_out(struct io_conn *conn, struct peer *peer)
{ {
Pkt *out; Pkt *out;
if (peer->num_outpkt == 0) if (peer->num_outpkt == 0) {
/* We close the connection once we've sent everything. */
if (peer->cond == PEER_CLOSED)
return io_close(conn);
return io_out_wait(conn, peer, pkt_out, peer); return io_out_wait(conn, peer, pkt_out, peer);
}
out = peer->outpkt[--peer->num_outpkt]; out = peer->outpkt[--peer->num_outpkt];
return peer_write_packet(conn, peer, out, pkt_out); return peer_write_packet(conn, peer, out, pkt_out);
@@ -222,16 +224,14 @@ static struct io_plan *pkt_in(struct io_conn *conn, struct peer *peer)
const tal_t *ctx = tal(peer, char); const tal_t *ctx = tal(peer, char);
idata.pkt = tal_steal(ctx, peer->inpkt); idata.pkt = tal_steal(ctx, peer->inpkt);
state_event(peer, peer->inpkt->pkt_case, &idata);
/* We ignore packets if they tell us to. */
if (peer->cond != PEER_CLOSED)
state_event(peer, peer->inpkt->pkt_case, &idata);
/* Free peer->inpkt unless stolen above. */ /* Free peer->inpkt unless stolen above. */
tal_free(ctx); tal_free(ctx);
/* If we've closed (above), don't try to read (we can call
* io_close multiple times with no harm). */
if (peer->cond == PEER_CLOSED)
return io_close(conn);
return peer_read_packet(conn, peer, pkt_in); return peer_read_packet(conn, peer, pkt_in);
} }
@@ -252,11 +252,6 @@ static struct io_plan *peer_crypto_on(struct io_conn *conn, struct peer *peer)
queue_cmd(peer, do_anchor_offer, NULL); queue_cmd(peer, do_anchor_offer, NULL);
try_command(peer); try_command(peer);
/* If we've closed (above), don't continue (we can call
* io_close multiple times with no harm). */
if (peer->cond == PEER_CLOSED)
return io_close(conn);
return io_duplex(conn, return io_duplex(conn,
peer_read_packet(conn, peer, pkt_in), peer_read_packet(conn, peer, pkt_in),
pkt_out(conn, peer)); pkt_out(conn, peer));