aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

wireaddr: use fmt_wireaddr_without_port in fmt_wireaddr.

Browse Source 
Avoids duplicate code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-05-10 08:48:24 +09:30
parent 7900318216
commit e91975c22d
1 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
common/wireaddr.c
View File

@@ -106,37 +106,6 @@ bool fromwire_wireaddr_internal(const u8 **cursor, size_t *max,
return false; return false;
} }
char *fmt_wireaddr(const tal_t *ctx, const struct wireaddr *a)
{
char addrstr[LARGEST_ADDRLEN];
char *ret, *hex;
switch (a->type) {
case ADDR_TYPE_IPV4:
if (!inet_ntop(AF_INET, a->addr, addrstr, INET_ADDRSTRLEN))
return "Unprintable-ipv4-address";
return tal_fmt(ctx, "%s:%u", addrstr, a->port);
case ADDR_TYPE_IPV6:
if (!inet_ntop(AF_INET6, a->addr, addrstr, INET6_ADDRSTRLEN))
return "Unprintable-ipv6-address";
return tal_fmt(ctx, "[%s]:%u", addrstr, a->port);
case ADDR_TYPE_TOR_V2:
return tal_fmt(ctx, "%s.onion:%u",
b32_encode(addrstr, (u8 *) a->addr, 2), a->port);
case ADDR_TYPE_TOR_V3:
return tal_fmt(ctx, "%s.onion:%u",
b32_encode(addrstr, (u8 *) a->addr, 3), a->port);
case ADDR_TYPE_PADDING:
break;
}
hex = tal_hexstr(ctx, a->addr, a->addrlen);
ret = tal_fmt(ctx, "Unknown type %u %s:%u", a->type, hex, a->port);
tal_free(hex);
return ret;
}
REGISTER_TYPE_TO_STRING(wireaddr, fmt_wireaddr);
void wireaddr_from_ipv4(struct wireaddr *addr, void wireaddr_from_ipv4(struct wireaddr *addr,
const struct in_addr *ip4, const struct in_addr *ip4,
const u16 port) const u16 port)
@@ -240,6 +209,14 @@ char *fmt_wireaddr_without_port(const tal_t * ctx, const struct wireaddr *a)
return ret; return ret;
} }
char *fmt_wireaddr(const tal_t *ctx, const struct wireaddr *a)
{
char *ret = fmt_wireaddr_without_port(ctx, a);
tal_append_fmt(&ret, ":%u", a->port);
return ret;
}
REGISTER_TYPE_TO_STRING(wireaddr, fmt_wireaddr);
/* Valid forms: /* Valid forms:
* *
* [anything]:<number> * [anything]:<number>