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

connectd: do io logging properly for msgs we make.

Browse Source 
We don't need to log msgs from subds, but we do our own, and we weren't.

1. Rename queue_peer_msg to inject_peer_msg for clarity, make it do logging
2. In the one place where we're relaying, call msg_queue() directly.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-01-29 14:03:05 +10:30
parent 8782d39476
commit 960e911986
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectd/connectd.c
View File

@@ -2028,7 +2028,7 @@ static struct io_plan *recv_gossip(struct io_conn *conn,
peer = peer_htable_get(&daemon->peers, &dst); peer = peer_htable_get(&daemon->peers, &dst);
if (peer) if (peer)
queue_peer_msg(peer, take(gossip_msg)); inject_peer_msg(peer, take(gossip_msg));
return daemon_conn_read_next(conn, daemon->gossipd); return daemon_conn_read_next(conn, daemon->gossipd);
} }

11
connectd/multiplex.c
View File

@@ -36,8 +36,9 @@
#include <wire/wire_io.h> #include <wire/wire_io.h>
#include <wire/wire_sync.h> #include <wire/wire_sync.h>
void queue_peer_msg(struct peer *peer, const u8 *msg TAKES) void inject_peer_msg(struct peer *peer, const u8 *msg TAKES)
{ {
status_peer_io(LOG_IO_OUT, &peer->id, msg);
msg_enqueue(peer->peer_outq, msg); msg_enqueue(peer->peer_outq, msg);
} }
@@ -360,7 +361,7 @@ static void send_ping(struct peer *peer)
return; return;
} }
queue_peer_msg(peer, take(make_ping(NULL, 1, 0))); inject_peer_msg(peer, take(make_ping(NULL, 1, 0)));
peer->expecting_pong = PONG_EXPECTED_PROBING; peer->expecting_pong = PONG_EXPECTED_PROBING;
set_ping_timer(peer); set_ping_timer(peer);
} }
@@ -378,7 +379,7 @@ static void handle_ping_in(struct peer *peer, const u8 *msg)
} }
if (pong) if (pong)
queue_peer_msg(peer, take(pong)); inject_peer_msg(peer, take(pong));
} }
static void handle_ping_reply(struct peer *peer, const u8 *msg) static void handle_ping_reply(struct peer *peer, const u8 *msg)
@@ -582,7 +583,7 @@ static struct io_plan *read_from_subd_done(struct io_conn *subd_conn,
struct peer *peer) struct peer *peer)
{ {
/* Tell them to encrypt & write. */ /* Tell them to encrypt & write. */
queue_peer_msg(peer, take(peer->subd_in)); msg_enqueue(peer->peer_outq, take(peer->subd_in));
peer->subd_in = NULL; peer->subd_in = NULL;
/* Wait for them to wake us */ /* Wait for them to wake us */
@@ -828,7 +829,7 @@ void send_manual_ping(struct daemon *daemon, const u8 *msg)
if (tal_count(ping) > 65535) if (tal_count(ping) > 65535)
status_failed(STATUS_FAIL_MASTER_IO, "Oversize ping"); status_failed(STATUS_FAIL_MASTER_IO, "Oversize ping");
queue_peer_msg(peer, take(ping)); inject_peer_msg(peer, take(ping));
status_debug("sending ping expecting %sresponse", status_debug("sending ping expecting %sresponse",
num_pong_bytes >= 65532 ? "no " : ""); num_pong_bytes >= 65532 ? "no " : "");

5
connectd/multiplex.h
View File

@@ -21,8 +21,9 @@ struct io_plan *multiplex_peer_setup(struct io_conn *peer_conn,
void multiplex_final_msg(struct peer *peer, void multiplex_final_msg(struct peer *peer,
const u8 *final_msg TAKES); const u8 *final_msg TAKES);
/* Inject a message into the output stream */ /* Inject a message into the output stream. Unlike a raw msg_enqueue,
void queue_peer_msg(struct peer *peer, const u8 *msg TAKES); * this does io logging if required. */
void inject_peer_msg(struct peer *peer, const u8 *msg TAKES);
void setup_peer_gossip_store(struct peer *peer, void setup_peer_gossip_store(struct peer *peer,
const struct feature_set *our_features, const struct feature_set *our_features,

30
connectd/onion_message.c
View File

@@ -37,9 +37,9 @@ void handle_obs2_onion_message(struct daemon *daemon,
/* FIXME: ratelimit! */ /* FIXME: ratelimit! */
if (!fromwire_obs2_onion_message(msg, msg, &blinding, &onion)) { if (!fromwire_obs2_onion_message(msg, msg, &blinding, &onion)) {
queue_peer_msg(peer, inject_peer_msg(peer,
towire_warningfmt(NULL, NULL, towire_warningfmt(NULL, NULL,
"Bad onion_message")); "Bad onion_message"));
return; return;
} }
@@ -161,10 +161,10 @@ void handle_obs2_onion_message(struct daemon *daemon,
&next_node)); &next_node));
return; return;
} }
queue_peer_msg(next_peer, inject_peer_msg(next_peer,
take(towire_obs2_onion_message(NULL, take(towire_obs2_onion_message(NULL,
&next_blinding, &next_blinding,
serialize_onionpacket(tmpctx, rs->next)))); serialize_onionpacket(tmpctx, rs->next))));
} }
} }
@@ -188,7 +188,7 @@ void onionmsg_req(struct daemon *daemon, const u8 *msg)
omsg = towire_obs2_onion_message(NULL, &blinding, onionmsg); omsg = towire_obs2_onion_message(NULL, &blinding, onionmsg);
else else
omsg = towire_onion_message(NULL, &blinding, onionmsg); omsg = towire_onion_message(NULL, &blinding, onionmsg);
queue_peer_msg(peer, take(omsg)); inject_peer_msg(peer, take(omsg));
} }
} }
@@ -213,9 +213,9 @@ void handle_onion_message(struct daemon *daemon,
/* FIXME: ratelimit! */ /* FIXME: ratelimit! */
if (!fromwire_onion_message(msg, msg, &blinding, &onion)) { if (!fromwire_onion_message(msg, msg, &blinding, &onion)) {
queue_peer_msg(peer, inject_peer_msg(peer,
towire_warningfmt(NULL, NULL, towire_warningfmt(NULL, NULL,
"Bad onion_message")); "Bad onion_message"));
return; return;
} }
@@ -336,10 +336,10 @@ void handle_onion_message(struct daemon *daemon,
&next_node)); &next_node));
return; return;
} }
queue_peer_msg(next_peer, inject_peer_msg(next_peer,
take(towire_onion_message(NULL, take(towire_onion_message(NULL,
&next_blinding, &next_blinding,
serialize_onionpacket(tmpctx, rs->next)))); serialize_onionpacket(tmpctx, rs->next))));
} }
} }

6
connectd/test/run-onion_message.c
View File

@@ -88,6 +88,9 @@ bool fromwire_connectd_send_onionmsg(const tal_t *ctx UNNEEDED, const void *p UN
/* Generated stub for fromwire_node_id */ /* Generated stub for fromwire_node_id */
void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED) void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED)
{ fprintf(stderr, "fromwire_node_id called!\n"); abort(); } { fprintf(stderr, "fromwire_node_id called!\n"); abort(); }
/* Generated stub for inject_peer_msg */
void inject_peer_msg(struct peer *peer UNNEEDED, const u8 *msg TAKES UNNEEDED)
{ fprintf(stderr, "inject_peer_msg called!\n"); abort(); }
/* Generated stub for master_badmsg */ /* Generated stub for master_badmsg */
void master_badmsg(u32 type_expected UNNEEDED, const u8 *msg) void master_badmsg(u32 type_expected UNNEEDED, const u8 *msg)
{ fprintf(stderr, "master_badmsg called!\n"); abort(); } { fprintf(stderr, "master_badmsg called!\n"); abort(); }
@@ -100,9 +103,6 @@ void node_id_from_pubkey(struct node_id *id UNNEEDED, const struct pubkey *key U
/* Generated stub for pubkey_from_node_id */ /* Generated stub for pubkey_from_node_id */
bool pubkey_from_node_id(struct pubkey *key UNNEEDED, const struct node_id *id UNNEEDED) bool pubkey_from_node_id(struct pubkey *key UNNEEDED, const struct node_id *id UNNEEDED)
{ fprintf(stderr, "pubkey_from_node_id called!\n"); abort(); } { fprintf(stderr, "pubkey_from_node_id called!\n"); abort(); }
/* Generated stub for queue_peer_msg */
void queue_peer_msg(struct peer *peer UNNEEDED, const u8 *msg TAKES UNNEEDED)
{ fprintf(stderr, "queue_peer_msg called!\n"); abort(); }
/* Generated stub for status_fmt */ /* Generated stub for status_fmt */
void status_fmt(enum log_level level UNNEEDED, void status_fmt(enum log_level level UNNEEDED,
const struct node_id *peer UNNEEDED, const struct node_id *peer UNNEEDED,