aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

routing: Cleaning up old hostname and port handling

Browse Source 
The single string-based hostname and port has been retired in favor of
having multiple `struct ipaddr`s from the `node_announcement`. This
breaks the hostnames and ports from IRC, but I didn't bother to
backport ipaddr for it since it is only used in the legacy daemon.
This commit is contained in:
Christian Decker
2017-05-08 23:41:23 +02:00
committed by Rusty Russell
parent e972b208c7
commit 2d76b066c2
7 changed files with 11 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/routing.c
View File

@@ -74,9 +74,7 @@ struct node *new_node(struct routing_state *rstate,
n->id = *id;
n->in = tal_arr(n, struct node_connection *, 0);
n->out = tal_arr(n, struct node_connection *, 0);
n->port = 0;
n->alias = NULL;
n->hostname = NULL;
n->node_announcement = NULL;
n->last_timestamp = 0;
n->addresses = tal_arr(n, struct ipaddr, 0);
@@ -88,9 +86,7 @@ struct node *new_node(struct routing_state *rstate,
struct node *add_node(
struct routing_state *rstate,
const struct pubkey *pk,
char *hostname,
int port)
const struct pubkey *pk)
{
struct node *n = get_node(rstate, pk);
if (!n) {
@@ -101,8 +97,6 @@ struct node *add_node(
log_debug_struct(rstate->base_log, "Update existing node %s",
struct pubkey, pk);
}
n->hostname = tal_steal(n, hostname);
n->port = port;
return n;
}
@@ -916,13 +910,6 @@ void handle_node_announcement(
node->addresses = tal_steal(node, ipaddrs);
node->last_timestamp = timestamp;
node->hostname = tal_free(node->hostname);
if (!read_ip(node, addresses, &node->hostname, &node->port)) {
/* FIXME: SHOULD fail connection here. */
tal_free(serialized);
return;
}
memcpy(node->rgb_color, rgb_color, 3);