connectd: unify IO logging calls.
What the developer wrote
Authored by Rusty Russell
connectd: unify IO logging calls.
Normally, connectd forwards messages and then the subds do logging,
but it logs manually for msgs which are handled internally.
Clarify this logic in one place for all callers.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
What changed, and why it matters
This is a small internal code cleanup in Core Lightning's connection handling. It moves repeated logging calls into a single helper function so the code is easier to read. There is no change to security behavior, no bug fix, and no vulnerability.
No security action needed. Treat as normal refactoring.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit refactors connectd/multiplex.c to introduce a helper log_peer_io() that calls status_peer_io(LOG_IO_IN, ...) and io_wake(peer->peer_outq). Previously, several locally-handled message types called status_peer_io() directly, and read_body_from_peer_done() called io_wake() separately after local handling. The new helper unifies these calls. The functional effect is identical: every path that previously logged still logs, and io_wake() is still invoked after local handling. The removed io_wake() at the call site is now performed inside log_peer_io(), which is called by all local-handling branches.
Changed components
connectd/multiplex.cInspect captured patch +13 / −6
diff --git a/connectd/multiplex.c b/connectd/multiplex.c
index 1cbc98f1..203962c3 100644
--- a/connectd/multiplex.c
+++ b/connectd/multiplex.c
@@ -732,6 +732,14 @@ static void handle_pong_in(struct peer *peer, const u8 *msg)
abort();
}
+/* Various cases where we don't send the msg to a gossipd, we want to
+ * do IO logging! */
+static void log_peer_io(const struct peer *peer, const u8 *msg)
+{
+ status_peer_io(LOG_IO_IN, &peer->id, msg);
+ io_wake(peer->peer_outq);
+}
+
/* Forward to gossipd */
static void handle_gossip_in(struct peer *peer, const u8 *msg)
{
@@ -744,7 +752,7 @@ static void handle_gossip_in(struct peer *peer, const u8 *msg)
gmsg = towire_gossipd_recv_gossip(NULL, &peer->id, msg);
/* gossipd doesn't log IO, so we log it here. */
- status_peer_io(LOG_IO_IN, &peer->id, msg);
+ log_peer_io(peer, msg);
daemon_conn_send(peer->daemon->gossipd, take(gmsg));
}
@@ -857,19 +865,19 @@ static bool handle_message_locally(struct peer *peer, const u8 *msg)
gossip_rcvd_filter_add(peer->gs.grf, msg);
if (type == WIRE_GOSSIP_TIMESTAMP_FILTER) {
- status_peer_io(LOG_IO_IN, &peer->id, msg);
+ log_peer_io(peer, msg);
handle_gossip_timestamp_filter_in(peer, msg);
return true;
} else if (type == WIRE_PING) {
- status_peer_io(LOG_IO_IN, &peer->id, msg);
+ log_peer_io(peer, msg);
handle_ping_in(peer, msg);
return true;
} else if (type == WIRE_PONG) {
- status_peer_io(LOG_IO_IN, &peer->id, msg);
+ log_peer_io(peer, msg);
handle_pong_in(peer, msg);
return true;
} else if (type == WIRE_ONION_MESSAGE) {
- status_peer_io(LOG_IO_IN, &peer->id, msg);
+ log_peer_io(peer, msg);
handle_onion_message(peer->daemon, peer, msg);
return true;
} else if (type == WIRE_QUERY_CHANNEL_RANGE) {
@@ -1267,7 +1275,6 @@ static struct io_plan *read_body_from_peer_done(struct io_conn *peer_conn,
/* If we swallow this, just try again. */
if (handle_message_locally(peer, decrypted)) {
/* Make sure to update peer->peer_in_lastmsg so we blame correct msg! */
- io_wake(peer->peer_outq);
goto out;
}
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.