From e36d4d1143d2008ff64bdcff873adb2b0e4a701b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 22 Mar 2022 19:19:13 +1030 Subject: [PATCH] devtools/decodemsg: fix printing of wireaddr. printwire_ routines are supposed to print! And they're only needed inside devtools/. Signed-off-by: Rusty Russell --- common/wireaddr.c | 5 ----- common/wireaddr.h | 1 - devtools/print_wire.c | 5 +++++ devtools/print_wire.h | 2 ++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common/wireaddr.c b/common/wireaddr.c index 2873fe764..7d5354713 100644 --- a/common/wireaddr.c +++ b/common/wireaddr.c @@ -294,11 +294,6 @@ char *fmt_wireaddr(const tal_t *ctx, const struct wireaddr *a) } REGISTER_TYPE_TO_STRING(wireaddr, fmt_wireaddr); -char *printwire_wireaddr(const tal_t *ctx, const struct wireaddr *a) -{ - return fmt_wireaddr(ctx, a); -} - /* Valid forms: * * [anything]: diff --git a/common/wireaddr.h b/common/wireaddr.h index 74e02fc06..acdb2e4fe 100644 --- a/common/wireaddr.h +++ b/common/wireaddr.h @@ -93,7 +93,6 @@ bool parse_wireaddr(const char *arg, struct wireaddr *addr, u16 port, char *fmt_wireaddr(const tal_t *ctx, const struct wireaddr *a); char *fmt_wireaddr_without_port(const tal_t *ctx, const struct wireaddr *a); -char *printwire_wireaddr(const tal_t *ctx, const struct wireaddr *a); /* If no_dns is non-NULL, we will set it to true and return NULL if * we wanted to do a DNS lookup. */ diff --git a/devtools/print_wire.c b/devtools/print_wire.c index d73e7cb07..8fbab06d7 100644 --- a/devtools/print_wire.c +++ b/devtools/print_wire.c @@ -27,6 +27,11 @@ void printwire_u64(const char *fieldname, const u64 *v) printf("%"PRIu64"\n", *v); } +void printwire_wireaddr(const char *fieldname, const struct wireaddr *wireaddr) +{ + printf("%s\n", fmt_wireaddr(tmpctx, wireaddr)); +} + /* Returns false if we ran out of data. */ static bool print_hexstring(const u8 **cursor, size_t *plen, size_t len) { diff --git a/devtools/print_wire.h b/devtools/print_wire.h index 5f9f2aff3..081cd85d7 100644 --- a/devtools/print_wire.h +++ b/devtools/print_wire.h @@ -14,6 +14,7 @@ struct tlv_print_record_type { typedef u64 bigsize; #define printwire_bigsize printwire_u64 +struct wireaddr; void printwire_u8(const char *fieldname, const u8 *v); void printwire_u16(const char *fieldname, const u16 *v); @@ -24,6 +25,7 @@ void printwire_tlvs(const char *tlv_name, const u8 **cursor, size_t *plen, const struct tlv_print_record_type types[], size_t num_types); void printwire_bitcoin_blkid(const char *fieldname, const struct bitcoin_blkid *bitcoin_blkid); +void printwire_wireaddr(const char *fieldname, const struct wireaddr *wireaddr); void printwire_bitcoin_txid(const char *fieldname, const struct bitcoin_txid *bitcoin_txid); void printwire_channel_id(const char *fieldname, const struct channel_id *channel_id); void printwire_amount_sat(const char *fieldname, const struct amount_sat *sat);