mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

devtools/gossipwith: allow setting features on cmdline.

Browse source 
Particularly important when talking with modern lnd, which
will hang up on you if you don't offer feature bit 1!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-11-15 15:06:18 +10:30 • committed by Christian Decker
parent 2e9b8f42fb
commit 14a5584b50
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
devtools/gossipwith.c
View file

@ -7,6 +7,7 @@
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <common/crypto_sync.h> #include <common/crypto_sync.h>
#include <common/dev_disconnect.h> #include <common/dev_disconnect.h>
#include <common/features.h>
#include <common/peer_failed.h> #include <common/peer_failed.h>
#include <common/per_peer_state.h> #include <common/per_peer_state.h>
#include <common/status.h> #include <common/status.h>
@ -22,6 +23,7 @@ static bool stream_stdin = false;
static bool no_init = false; static bool no_init = false;
static bool hex = false; static bool hex = false;
static int timeout_after = -1; static int timeout_after = -1;
static u8 *features;
static struct io_plan *simple_write(struct io_conn *conn, static struct io_plan *simple_write(struct io_conn *conn,
const void *data, size_t len, const void *data, size_t len,
@ -127,18 +129,15 @@ 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;
struct pollfd pollfd[2]; struct pollfd pollfd[2];
pps->peer_fd = io_conn_fd(conn); pps->peer_fd = io_conn_fd(conn);
if (initial_sync) { if (initial_sync)
localfeatures = tal(conn, u8); set_feature_bit(&features,
localfeatures[0] = (1 << 3); OPTIONAL_FEATURE(OPT_INITIAL_ROUTING_SYNC));
} else
localfeatures = NULL;
if (!no_init) { if (!no_init) {
msg = towire_init(NULL, NULL, localfeatures); msg = towire_init(NULL, NULL, features);
sync_crypto_write(pps, take(msg)); sync_crypto_write(pps, take(msg));
/* Ignore their init message. */ /* Ignore their init message. */
@ -211,6 +210,14 @@ static void opt_show_secret(char buf[OPT_SHOW_LEN], const struct secret *s)
hex_encode(s->data, sizeof(s->data), buf, OPT_SHOW_LEN); hex_encode(s->data, sizeof(s->data), buf, OPT_SHOW_LEN);
} }
static char *opt_set_features(const char *arg, u8 **features)
{
*features = tal_hexdata(tal_parent(*features), arg, strlen(arg));
if (!*features)
return "features must be valid hex";
return NULL;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct io_conn *conn = tal(NULL, struct io_conn); struct io_conn *conn = tal(NULL, struct io_conn);
@ -226,6 +233,7 @@ int main(int argc, char *argv[])
SECP256K1_CONTEXT_SIGN); SECP256K1_CONTEXT_SIGN);
memset(&notsosecret, 0x42, sizeof(notsosecret)); memset(&notsosecret, 0x42, sizeof(notsosecret));
features = tal_arr(conn, u8, 0);
opt_register_noarg("--initial-sync", opt_set_bool, &initial_sync, opt_register_noarg("--initial-sync", opt_set_bool, &initial_sync,
"Stream complete gossip history at start"); "Stream complete gossip history at start");
@ -244,6 +252,8 @@ int main(int argc, char *argv[])
"Exit (success) this many seconds after no msgs rcvd"); "Exit (success) this many seconds after no msgs rcvd");
opt_register_noarg("--hex", opt_set_bool, &hex, opt_register_noarg("--hex", opt_set_bool, &hex,
"Print out messages in hex"); "Print out messages in hex");
opt_register_arg("--features=<hex>", opt_set_features, NULL,
&features, "Send these features in init");
opt_register_noarg("--help|-h", opt_usage_and_exit, opt_register_noarg("--help|-h", opt_usage_and_exit,
"id@addr[:port] [hex-msg-tosend...]\n" "id@addr[:port] [hex-msg-tosend...]\n"
"Connect to a lightning peer and relay gossip messages from it", "Connect to a lightning peer and relay gossip messages from it",