aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-21 08:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

db: forget peer properly.

Browse Source 
Otherwise, if they reconnect, we get a database error.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-08-18 14:25:14 +09:30
parent 9f512f6540
commit f68607d10b
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
daemon/db.c
View File

@@ -1415,21 +1415,28 @@ bool db_add_commit_map(struct peer *peer,
void db_forget_peer(struct peer *peer) void db_forget_peer(struct peer *peer)
{ {
const char *errmsg, *ctx = tal(peer, char); const char *ctx = tal(peer, char);
const char *peerid = pubkey_to_hexstr(ctx, peer->dstate->secpctx, peer->id); const char *peerid = pubkey_to_hexstr(ctx, peer->dstate->secpctx, peer->id);
size_t i;
const char *const tables[] = { "anchors", "htlcs", "commit_info", "shachain", "their_visible_state", "their_commitments", "peer_secrets", "closing", "peers" };
log_debug(peer->log, "%s(%s)", __func__, peerid); log_debug(peer->log, "%s(%s)", __func__, peerid);
assert(peer->state == STATE_CLOSED); assert(peer->state == STATE_CLOSED);
assert(!peer->dstate->db->in_transaction); if (!db_start_transaction(peer))
fatal("%s:db_start_transaction failed", __func__);
/* FIXME: Implement cleanup of other tables, too. */ for (i = 0; i < ARRAY_SIZE(tables); i++) {
errmsg = db_exec(ctx, peer->dstate, "DELETE from peers WHERE peer=x'%s';", const char *errmsg;
peerid); errmsg = db_exec(ctx, peer->dstate,
"DELETE from %s WHERE peer=x'%s';",
tables[i], peerid);
if (errmsg)
fatal("%s:%s", __func__, errmsg);
}
if (!db_commit_transaction(peer))
fatal("%s:db_commi_transaction failed", __func__);
if (errmsg)
fatal("%s:%s", __func__, errmsg);
tal_free(ctx); tal_free(ctx);
} }