From 72aa83026a4f1c092c2ad2cb52391140aea99fcc Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 30 Sep 2019 11:05:17 +0930 Subject: [PATCH] devtools/mkquery: tool to generate gossip query messages. These helpers would be better autogenerated in python, perhaps as part of cdecker's pyln package? Signed-off-by: Rusty Russell --- devtools/Makefile | 4 ++- devtools/mkquery.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 devtools/mkquery.c diff --git a/devtools/Makefile b/devtools/Makefile index 5166b9e7c..cf5810c16 100644 --- a/devtools/Makefile +++ b/devtools/Makefile @@ -1,6 +1,6 @@ DEVTOOLS_SRC := devtools/gen_print_wire.c devtools/gen_print_onion_wire.c devtools/print_wire.c DEVTOOLS_OBJS := $(DEVTOOLS_SRC:.c=.o) -DEVTOOLS := devtools/bolt11-cli devtools/decodemsg devtools/onion devtools/dump-gossipstore devtools/gossipwith devtools/create-gossipstore devtools/mkcommit devtools/mkfunding devtools/mkclose devtools/mkgossip devtools/mkencoded devtools/checkchannels +DEVTOOLS := devtools/bolt11-cli devtools/decodemsg devtools/onion devtools/dump-gossipstore devtools/gossipwith devtools/create-gossipstore devtools/mkcommit devtools/mkfunding devtools/mkclose devtools/mkgossip devtools/mkencoded devtools/checkchannels devtools/mkquery DEVTOOLS_TOOL_SRC := $(DEVTOOLS:=.c) DEVTOOLS_TOOL_OBJS := $(DEVTOOLS_TOOL_SRC:.c=.o) @@ -78,6 +78,8 @@ devtools/mkencoded: $(DEVTOOLS_COMMON_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) wire/fr devtools/checkchannels: $(DEVTOOLS_COMMON_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) common/configdir.o wire/fromwire.o wire/towire.o wire/tlvstream.o devtools/checkchannels.o +devtools/mkquery: $(DEVTOOLS_COMMON_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) wire/fromwire.o wire/towire.o wire/tlvstream.o devtools/mkquery.o + # Make sure these depend on everything. ALL_PROGRAMS += $(DEVTOOLS) ALL_OBJS += $(DEVTOOLS_OBJS) $(DEVTOOLS_TOOL_OBJS) diff --git a/devtools/mkquery.c b/devtools/mkquery.c new file mode 100644 index 000000000..6e86fe8c1 --- /dev/null +++ b/devtools/mkquery.c @@ -0,0 +1,89 @@ +/* Generate various query messages. */ +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void usage(void) +{ + errx(1, "Usage: mkquery gossip_timestamp_filter OR\n" + " mkquery query_channel_range [] OR\n" + " mkquery query_short_channel_ids [query-flags-encoding query-flags]"); +} + +int main(int argc, char *argv[]) +{ + struct bitcoin_blkid chainhash; + const tal_t *ctx = tal(NULL, char); + const u8 *msg; + + setup_locale(); + secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | + SECP256K1_CONTEXT_SIGN); + + if (argc < 3) + usage(); + + if (!hex_decode(argv[2], strlen(argv[2]), &chainhash, sizeof(chainhash))) + errx(1, "Parsing chainhash"); + + if (streq(argv[1], "gossip_timestamp_filter")) { + if (argc != 5) + usage(); + msg = towire_gossip_timestamp_filter(ctx, &chainhash, + strtol(argv[3], NULL, 0), + strtol(argv[4], NULL, 0)); + } else if (streq(argv[1], "query_channel_range")) { + struct tlv_query_channel_range_tlvs *tlvs; + if (argc == 5) + tlvs = NULL; + else if (argc == 6) { + tlvs = tlv_query_channel_range_tlvs_new(ctx); + tlvs->query_option = tal(tlvs, struct tlv_query_channel_range_tlvs_query_option); + tlvs->query_option->query_option_flags + = strtol(argv[5], NULL, 0); + } else + usage(); + msg = towire_query_channel_range(ctx, &chainhash, + strtol(argv[3], NULL, 0), + strtol(argv[4], NULL, 0), + tlvs); + } else if (streq(argv[1], "query_short_channel_ids")) { + struct tlv_query_short_channel_ids_tlvs *tlvs; + u8 *encoded; + + if (argc == 4) + tlvs = NULL; + else if (argc == 6) { + tlvs = tlv_query_short_channel_ids_tlvs_new(ctx); + tlvs->query_flags = tal(tlvs, struct tlv_query_short_channel_ids_tlvs_query_flags); + tlvs->query_flags->encoding_type = strtol(argv[4], NULL, 0); + tlvs->query_flags->encoded_query_flags = tal_hexdata(tlvs->query_flags, + argv[5], strlen(argv[5])); + if (!tlvs->query_flags->encoded_query_flags) + usage(); + } else + usage(); + + encoded = tal_hexdata(ctx, argv[3], strlen(argv[3])); + if (!encoded) + usage(); + + msg = towire_query_short_channel_ids(ctx, &chainhash, encoded, tlvs); + } else + usage(); + + printf("%s\n", tal_hex(ctx, msg)); + tal_free(msg); + return 0; +}