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

subd: wrap all message callbacks in a transaction.

Browse Source 
Including destructors.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-11-01 11:40:48 +10:30
committed by Christian Decker
parent bbe7a03300
commit 3a596d6dda
2 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lightningd/subd.c
View File

@@ -20,6 +20,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <wallet/db.h>
#include <wire/wire.h>
#include <wire/wire_io.h>
@@ -411,20 +412,26 @@ static struct io_plan *sd_msg_read(struct io_conn *conn, struct subd *sd)
int type = fromwire_peektype(sd->msg_in);
const tal_t *tmpctx;
struct subd_req *sr;
struct db *db = sd->ld->wallet->db;
struct io_plan *plan;
if (type == -1) {
subdaemon_malformed_msg(sd, sd->msg_in);
return io_close(conn);
}
/* Everything we do, we wrap in a database transaction */
db_begin_transaction(db);
if (type == -1)
goto malformed;
/* First, check for replies. */
sr = get_req(sd, type);
if (sr) {
if (sr->num_reply_fds && sd->fds_in == NULL)
return sd_collect_fds(conn, sd, sr->num_reply_fds);
if (sr->num_reply_fds && sd->fds_in == NULL) {
plan = sd_collect_fds(conn, sd, sr->num_reply_fds);
goto out;
}
assert(sr->num_reply_fds == tal_count(sd->fds_in));
return sd_msg_reply(conn, sd, sr);
plan = sd_msg_reply(conn, sd, sr);
goto out;
}
/* If not stolen, we'll free this below. */
@@ -434,24 +441,18 @@ static struct io_plan *sd_msg_read(struct io_conn *conn, struct subd *sd)
if (type == STATUS_TRACE) {
int str_len;
const char *str = string_from_msg(sd->msg_in, &str_len);
if (!str) {
subdaemon_malformed_msg(sd, sd->msg_in);
return io_close(conn);
}
if (!str)
goto malformed;
log_debug(sd->log, "TRACE: %.*s", str_len, str);
goto next;
} else if (type & STATUS_FAIL) {
int str_len;
const char *str = string_from_msg(sd->msg_in, &str_len);
if (!str) {
subdaemon_malformed_msg(sd, sd->msg_in);
return io_close(conn);
}
if (!str)
goto malformed;
if (!log_status_fail(sd, type, str, str_len)) {
subdaemon_malformed_msg(sd, sd->msg_in);
return io_close(conn);
}
if (!log_status_fail(sd, type, str, str_len))
goto malformed;
/* If they care, tell them about invalid peer behavior */
if (sd->peer && type == STATUS_FAIL_PEER_BAD) {
@@ -464,7 +465,7 @@ static struct io_plan *sd_msg_read(struct io_conn *conn, struct subd *sd)
(u8 *)str, str_len,
0)));
}
return io_close(conn);
goto close;
}
log_info(sd->log, "UPDATE %s", sd->msgname(type));
@@ -478,7 +479,7 @@ static struct io_plan *sd_msg_read(struct io_conn *conn, struct subd *sd)
i = sd->msgcb(sd, sd->msg_in, sd->fds_in);
if (freed)
return io_close(conn);
goto close;
tal_del_destructor2(sd, mark_freed, &freed);
sd->conn = conn;
@@ -489,7 +490,8 @@ static struct io_plan *sd_msg_read(struct io_conn *conn, struct subd *sd)
/* Don't free msg_in: we go around again. */
tal_steal(sd, sd->msg_in);
tal_free(tmpctx);
return sd_collect_fds(conn, sd, i);
plan = sd_collect_fds(conn, sd, i);
goto out;
}
}
@@ -497,9 +499,20 @@ next:
sd->msg_in = NULL;
sd->fds_in = tal_free(sd->fds_in);
tal_free(tmpctx);
return io_read_wire(conn, sd, &sd->msg_in, sd_msg_read, sd);
plan = io_read_wire(conn, sd, &sd->msg_in, sd_msg_read, sd);
goto out;
malformed:
subdaemon_malformed_msg(sd, sd->msg_in);
close:
plan = io_close(conn);
out:
db_commit_transaction(db);
return plan;
}
static void destroy_subd(struct subd *sd)
{
int status;

8
lightningd/subd.h
View File

@@ -31,7 +31,7 @@ struct subd {
/* For logging */
struct log *log;
/* Callback when non-reply message comes in. */
/* Callback when non-reply message comes in (inside db transaction) */
unsigned (*msgcb)(struct subd *, const u8 *, const int *);
const char *(*msgname)(int msgtype);
@@ -57,7 +57,7 @@ struct subd {
* @ld: global state
* @name: basename of daemon
* @msgname: function to get name from messages
* @msgcb: function to call when non-fatal message received (or NULL)
* @msgcb: function to call (inside db transaction) when non-fatal message received (or NULL)
* @...: NULL-terminated list of pointers to fds to hand as fd 3, 4...
* (can be take, if so, set to -1)
*
@@ -78,7 +78,7 @@ struct subd *new_global_subd(struct lightningd *ld,
* @name: basename of daemon
* @peer: peer to associate.
* @msgname: function to get name from messages
* @msgcb: function to call when non-fatal message received (or NULL)
* @msgcb: function to call (inside db transaction) when non-fatal message received (or NULL)
* @...: NULL-terminated list of pointers to fds to hand as fd 3, 4...
* (can be take, if so, set to -1)
*
@@ -122,7 +122,7 @@ void subd_send_fd(struct subd *sd, int fd);
* @msg_out: request message (can be take)
* @fd_out: if >=0 fd to pass at the end of the message (closed after)
* @num_fds_in: how many fds to read in to hand to @replycb if it's a reply.
* @replycb: callback when reply comes in (can free subd)
* @replycb: callback (inside db transaction) when reply comes in (can free subd)
* @replycb_data: final arg to hand to @replycb
*
* @replycb cannot free @sd, so it returns false to remove it.