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

routing: Passing back all addresses on getnodes

Browse Source
This commit is contained in:
Christian Decker
2017-05-08 23:22:59 +02:00
committed by Rusty Russell
parent 26892e79bb
commit e972b208c7
6 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon/json.c
View File

@@ -1,5 +1,6 @@
/* JSON core and helpers */
#include "json.h"
#include <arpa/inet.h>
#include <assert.h>
#include <ccan/build_assert/build_assert.h>
#include <ccan/str/hex/hex.h>
@@ -453,6 +454,25 @@ void json_add_short_channel_id(struct json_result *response,
json_add_string(response, fieldname, str);
}
void json_add_address(struct json_result *response, const char *fieldname,
const struct ipaddr *addr)
{
json_object_start(response, fieldname);
char *addrstr = tal_arr(response, char, INET6_ADDRSTRLEN);
if (addr->type == ADDR_TYPE_IPV4) {
inet_ntop(AF_INET, addr->addr, addrstr, INET_ADDRSTRLEN);
json_add_string(response, "type", "ipv4");
json_add_string(response, "address", addrstr);
json_add_num(response, "port", addr->port);
} else if (addr->type == ADDR_TYPE_IPV6) {
inet_ntop(AF_INET6, addr->addr, addrstr, INET6_ADDRSTRLEN);
json_add_string(response, "type", "ipv6");
json_add_string(response, "address", addrstr);
json_add_num(response, "port", addr->port);
}
json_object_end(response);
}
void json_add_object(struct json_result *result, ...)
{
va_list ap;