mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-19 18:11:28 +01:00
eb0603bd13
We save wireaddr to databases as a string (which is pretty dumb) but it turned out that my local node saved '[::ffff:127.0.0.1]:49150' which our parser can't parse. Thus I've reworked the parser to make fewer assumptions: parse_ip_port() is renamed to separate_address_and_port() and is now far more accepting of different forms, and returns failure only on grossly malformed strings. Otherwise it overwrites its *port arg only if there's a port specified. I also made it static. Then fromwire_wireaddr() hands the resulting address to inet_pton to figure out if it's actually valid. Cc: William Casarin <jb55@jb55.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
49 lines
1.7 KiB
C
49 lines
1.7 KiB
C
#ifndef LIGHTNING_COMMON_WIREADDR_H
|
|
#define LIGHTNING_COMMON_WIREADDR_H
|
|
#include "config.h"
|
|
#include <ccan/short_types/short_types.h>
|
|
#include <ccan/tal/tal.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
|
|
/* BOLT #7:
|
|
*
|
|
* The following `address descriptor` types are defined:
|
|
*
|
|
* * `0`: padding. data = none (length 0).
|
|
* * `1`: ipv4. data = `[4:ipv4_addr][2:port]` (length 6)
|
|
* * `2`: ipv6. data = `[16:ipv6_addr][2:port]` (length 18)
|
|
* * `3`: tor v2 onion service. data = `[10:onion_addr][2:port]` (length 12)
|
|
* * Version 2 onion service addresses. Encodes an 80-bit truncated `SHA-1` hash
|
|
* of a 1024-bit `RSA` public key for the onion service.
|
|
* * `4`: tor v3 onion service. data `[35:onion_addr][2:port]` (length 37)
|
|
* * Version 3 ([prop224](https://gitweb.torproject.org/torspec.git/tree/proposals/224-rend-spec-ng.txt))
|
|
* onion service addresses. Encodes: `[32:32_byte_ed25519_pubkey] || [2:checksum] || [1:version]`.
|
|
* where `checksum = sha3(".onion checksum" | pubkey || version)[:2]`
|
|
*/
|
|
|
|
enum wire_addr_type {
|
|
ADDR_TYPE_PADDING = 0,
|
|
ADDR_TYPE_IPV4 = 1,
|
|
ADDR_TYPE_IPV6 = 2,
|
|
};
|
|
|
|
/* FIXME(cdecker) Extend this once we have defined how TOR addresses
|
|
* should look like */
|
|
struct wireaddr {
|
|
enum wire_addr_type type;
|
|
u8 addrlen;
|
|
u8 addr[16];
|
|
u16 port;
|
|
};
|
|
|
|
/* Inserts a single ADDR_TYPE_PADDING if addr is NULL */
|
|
void towire_wireaddr(u8 **pptr, const struct wireaddr *addr);
|
|
bool fromwire_wireaddr(const u8 **cursor, size_t *max, struct wireaddr *addr);
|
|
|
|
bool parse_wireaddr(const char *arg, struct wireaddr *addr, u16 port);
|
|
|
|
char *fmt_wireaddr(const tal_t *ctx, const struct wireaddr *a);
|
|
|
|
#endif /* LIGHTNING_COMMON_WIREADDR_H */
|