mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

devtools/gossipwith: allow interaction.

Browse Source 
This lets us use it as an interactive driver of conversation, rather
than writing all packets then reading all packets.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-07-17 07:12:14 +09:30 committed by neil saitug
parent d59e2b1b4b
commit af535bf5ff
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
devtools/gossipwith.c
View File

@ -1,4 +1,5 @@
/* Simple tool to route gossip from a peer. */ /* Simple tool to route gossip from a peer. */
#include <ccan/array_size/array_size.h>
#include <ccan/err/err.h> #include <ccan/err/err.h>
#include <ccan/io/io.h> #include <ccan/io/io.h>
#include <ccan/opt/opt.h> #include <ccan/opt/opt.h>
@ -9,6 +10,7 @@
#include <common/per_peer_state.h> #include <common/per_peer_state.h>
#include <common/status.h> #include <common/status.h>
#include <netdb.h> #include <netdb.h>
#include <poll.h>
#include <secp256k1_ecdh.h> #include <secp256k1_ecdh.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>
@ -118,6 +120,7 @@ static struct io_plan *handshake_success(struct io_conn *conn,
u8 *msg; u8 *msg;
struct per_peer_state *pps = new_per_peer_state(conn, orig_cs); struct per_peer_state *pps = new_per_peer_state(conn, orig_cs);
u8 *localfeatures; u8 *localfeatures;
struct pollfd pollfd[2];
pps->peer_fd = io_conn_fd(conn); pps->peer_fd = io_conn_fd(conn);
if (initial_sync) { if (initial_sync) {
@ -132,19 +135,13 @@ static struct io_plan *handshake_success(struct io_conn *conn,
/* Ignore their init message. */ /* Ignore their init message. */
tal_free(sync_crypto_read(NULL, pps)); tal_free(sync_crypto_read(NULL, pps));
/* Did they ask us to send any messages? Do so now. */ if (stream_stdin)
if (stream_stdin) { pollfd[0].fd = STDIN_FILENO;
beint16_t be_inlen; else
pollfd[0].fd = -1;
while (read_all(STDIN_FILENO, &be_inlen, sizeof(be_inlen))) { pollfd[0].events = POLLIN;
u32 msglen = be16_to_cpu(be_inlen); pollfd[1].fd = pps->peer_fd;
u8 *msg = tal_arr(NULL, u8, msglen); pollfd[1].events = POLLIN;
if (!read_all(STDIN_FILENO, msg, msglen))
err(1, "Only read partial message");
sync_crypto_write(pps, take(msg));
}
}
while (*args) { while (*args) {
u8 *m = tal_hexdata(NULL, *args, strlen(*args)); u8 *m = tal_hexdata(NULL, *args, strlen(*args));
@ -154,17 +151,35 @@ static struct io_plan *handshake_success(struct io_conn *conn,
args++; args++;
} }
/* Now write out whatever we get. */ for (;;) {
while ((msg = sync_crypto_read(NULL, pps)) != NULL) { beint16_t belen;
be16 len = cpu_to_be16(tal_bytelen(msg)); u8 *msg;
if (!write_all(STDOUT_FILENO, &len, sizeof(len)) poll(pollfd, ARRAY_SIZE(pollfd), -1);
|| !write_all(STDOUT_FILENO, msg, tal_bytelen(msg)))
err(1, "Writing out msg");
tal_free(msg);
if (--max_messages == 0) /* We always to stdin first if we can */
exit(0); if (pollfd[0].revents & POLLIN) {
if (!read_all(STDIN_FILENO, &belen, sizeof(belen)))
pollfd[0].fd = -1;
else {
msg = tal_arr(NULL, u8, be16_to_cpu(belen));
if (!read_all(STDIN_FILENO, msg, tal_bytelen(msg)))
err(1, "Only read partial message");
sync_crypto_write(pps, take(msg));
}
} else if (pollfd[1].revents & POLLIN) {
msg = sync_crypto_read(NULL, pps);
if (!msg)
break;
belen = cpu_to_be16(tal_bytelen(msg));
if (!write_all(STDOUT_FILENO, &belen, sizeof(belen))
|| !write_all(STDOUT_FILENO, msg, tal_bytelen(msg)))
err(1, "Writing out msg");
tal_free(msg);
if (--max_messages == 0)
exit(0);
}
} }
err(1, "Reading msg"); err(1, "Reading msg");
} }