|
|
|
#include <ccan/mem/mem.h>
|
|
|
|
#include <ccan/utf8/utf8.h>
|
|
|
|
#include <common/decode_array.h>
|
|
|
|
#include <common/type_to_string.h>
|
|
|
|
#include <devtools/print_wire.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wire/tlvstream.h>
|
|
|
|
|
|
|
|
void printwire_u8(const char *fieldname, const u8 *v)
|
|
|
|
{
|
|
|
|
printf("%u\n", *v);
|
|
|
|
}
|
|
|
|
|
|
|
|
void printwire_u16(const char *fieldname, const u16 *v)
|
|
|
|
{
|
|
|
|
printf("%u\n", *v);
|
|
|
|
}
|
|
|
|
|
|
|
|
void printwire_u32(const char *fieldname, const u32 *v)
|
|
|
|
{
|
|
|
|
printf("%u\n", *v);
|
|
|
|
}
|
|
|
|
|
|
|
|
void printwire_u64(const char *fieldname, const u64 *v)
|
|
|
|
{
|
|
|
|
printf("%"PRIu64"\n", *v);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns false if we ran out of data. */
|
|
|
|
static bool print_hexstring(const u8 **cursor, size_t *plen, size_t len)
|
|
|
|
{
|
|
|
|
while (len) {
|
|
|
|
u8 v = fromwire_u8(cursor, plen);
|
|
|
|
if (!*cursor)
|
|
|
|
return false;
|
|
|
|
printf("%02x", v);
|
|
|
|
len--;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void printwire_alias(const u8 **cursor, size_t *plen, size_t len)
|
|
|
|
{
|
|
|
|
struct utf8_state utf8 = UTF8_STATE_INIT;
|
|
|
|
const char *p = (const char *)*cursor;
|
|
|
|
bool char_done = true;
|
|
|
|
|
|
|
|
printf("[");
|
|
|
|
for (size_t i = 0; i < len; i++) {
|
|
|
|
if (!p[i]) {
|
|
|
|
if (!memeqzero(p+i, len-i)) {
|
|
|
|
printf(" **INVALID PADDING** ");
|
|
|
|
goto hexdump;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (utf8_decode(&utf8, p[i])) {
|
|
|
|
if (errno != 0) {
|
|
|
|
printf(" **INVALID UTF-8** ");
|
|
|
|
goto hexdump;
|
|
|
|
}
|
|
|
|
char_done = true;
|
|
|
|
} else {
|
|
|
|
/* Don't allow unprintable characters */
|
|
|
|
if (utf8.total_len == 1 && !cisprint(utf8.c)) {
|
|
|
|
printf(" **UNPRINTABLE CHARACTER** ");
|
|
|
|
goto hexdump;
|
|
|
|
}
|
|
|
|
char_done = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!char_done) {
|
|
|
|
printf(" **INCOMPLETE UTF-8** ");
|
|
|
|
goto hexdump;
|
|
|
|
}
|
|
|
|
printf("%.*s ", (int)len, p);
|
|
|
|
|
|
|
|
hexdump:
|
|
|
|
if (!print_hexstring(cursor, plen, len))
|
|
|
|
return;
|
|
|
|
printf(" ]\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void printwire_addresses(const u8 **cursor, size_t *plen, size_t len)
|
|
|
|
{
|
|
|
|
struct wireaddr addr;
|
|
|
|
|
|
|
|
printf("[");
|
|
|
|
while (*plen && fromwire_wireaddr(cursor, plen, &addr))
|
|
|
|
printf(" %s", fmt_wireaddr(NULL, &addr));
|
|
|
|
if (!*cursor)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (*plen != 0) {
|
|
|
|
printf(" UNKNOWN:");
|
|
|
|
if (!print_hexstring(cursor, plen, len))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
printf(" ]\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void printwire_encoded_short_ids(const u8 **cursor, size_t *plen, size_t len)
|
|
|
|
{
|
|
|
|
struct short_channel_id *scids;
|
|
|
|
u8 *arr = fromwire_tal_arrn(tmpctx, cursor, plen, len);
|
|
|
|
|
|
|
|
if (!arr)
|
|
|
|
return;
|
|
|
|
|
|
|
|
printf("[");
|
|
|
|
scids = decode_short_ids(tmpctx, arr);
|
|
|
|
if (scids) {
|
|
|
|
switch (arr[0]) {
|
|
|
|
case ARR_UNCOMPRESSED:
|
|
|
|
printf(" (UNCOMPRESSED)");
|
|
|
|
break;
|
|
|
|
case ARR_ZLIB:
|
|
|
|
printf(" (ZLIB)");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
for (size_t i = 0; i < tal_count(scids); i++)
|
|
|
|
printf(" %s",
|
|
|
|
short_channel_id_to_str(tmpctx, &scids[i]));
|
|
|
|
} else {
|
|
|
|
/* If it was unknown, that's different from corrupt */
|
|
|
|
if (len == 0
|
|
|
|
|| arr[0] == ARR_UNCOMPRESSED
|
|
|
|
|| arr[0] == ARR_ZLIB) {
|
|
|
|
printf(" **CORRUPT**");
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
printf(" UNKNOWN:");
|
|
|
|
print_hexstring(cursor, plen, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf(" ]\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
void printwire_u8_array(const char *fieldname, const u8 **cursor, size_t *plen, size_t len)
|
|
|
|
{
|
|
|
|
if (streq(fieldname, "node_announcement.alias")) {
|
|
|
|
printwire_alias(cursor, plen, len);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (streq(fieldname, "node_announcement.addresses")) {
|
|
|
|
printwire_addresses(cursor, plen, len);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (strends(fieldname, ".encoded_short_ids")) {
|
|
|
|
printwire_encoded_short_ids(cursor, plen, len);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
printf("[");
|
|
|
|
if (!print_hexstring(cursor, plen, len))
|
|
|
|
return;
|
|
|
|
printf("]\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct tlv_print_record_type *
|
|
|
|
find_print_record_type(u64 type,
|
|
|
|
const struct tlv_print_record_type types[],
|
|
|
|
size_t num_types)
|
|
|
|
{
|
|
|
|
for (size_t i = 0; i < num_types; i++)
|
|
|
|
if (types[i].type == type)
|
|
|
|
return types + i;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void printwire_tlvs(const char *fieldname, const u8 **cursor, size_t *plen,
|
|
|
|
const struct tlv_print_record_type types[],
|
|
|
|
size_t num_types)
|
|
|
|
{
|
|
|
|
while (*plen > 0) {
|
|
|
|
u64 type, length;
|
|
|
|
const struct tlv_print_record_type *ptype;
|
|
|
|
|
|
|
|
type = fromwire_bigsize(cursor, plen);
|
|
|
|
if (!*cursor)
|
|
|
|
goto fail;
|
|
|
|
length = fromwire_bigsize(cursor, plen);
|
|
|
|
if (!*cursor)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
ptype = find_print_record_type(type, types, num_types);
|
|
|
|
if (ptype) {
|
|
|
|
size_t tlvlen = length;
|
|
|
|
printf("{\ntype=%"PRIu64"\nlen=%"PRIu64"\n", type, length);
|
|
|
|
ptype->print(fieldname, cursor, &tlvlen);
|
|
|
|
if (!*cursor)
|
|
|
|
goto fail;
|
|
|
|
printf("}\n");
|
|
|
|
*plen -= length;
|
|
|
|
} else
|
|
|
|
printf("**TYPE #%"PRIu64" UNKNOWN for TLV %s**\n", type, fieldname);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
printf("**TRUNCATED TLV %s**\n", fieldname);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define PRINTWIRE_TYPE_TO_STRING(T, N) \
|
|
|
|
void printwire_##N(const char *fieldname, const T *v) \
|
|
|
|
{ \
|
|
|
|
const char *s = type_to_string(NULL, T, v); \
|
|
|
|
printf("%s\n", s); \
|
|
|
|
tal_free(s); \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define PRINTWIRE_STRUCT_TYPE_TO_STRING(T) \
|
|
|
|
PRINTWIRE_TYPE_TO_STRING(struct T, T)
|
|
|
|
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(bitcoin_blkid);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(bitcoin_txid);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(channel_id);
|
common/node_id: new type.
Node ids are pubkeys, but we only use them as pubkeys for routing and checking
gossip messages. So we're packing and unpacking them constantly, and wasting
some space and time.
This introduces a new type, explicitly the SEC1 compressed encoding
(33 bytes). We ensure its validity when we load from the db, or get it
from JSON. We still use 'struct pubkey' for peer messages, which checks
validity.
Results from 5 runs, min-max(mean +/- stddev):
store_load_msec,vsz_kb,store_rewrite_sec,listnodes_sec,listchannels_sec,routing_sec,peer_write_all_sec
39475-39572(39518+/-36),2880732,41.150000-41.390000(41.298+/-0.085),2.260000-2.550000(2.336+/-0.11),44.390000-65.150000(58.648+/-7.5),32.740000-33.020000(32.89+/-0.093),44.130000-45.090000(44.566+/-0.32)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
6 years ago
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(node_id);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(preimage);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(pubkey);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(sha256);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(secret);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(short_channel_id);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(amount_sat);
|
|
|
|
PRINTWIRE_STRUCT_TYPE_TO_STRING(amount_msat);
|
|
|
|
PRINTWIRE_TYPE_TO_STRING(secp256k1_ecdsa_signature, secp256k1_ecdsa_signature);
|