mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 21:35:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62 from cdecker/irc-fix

Browse Source 
irc: Announce the correct expiry and handle aliases
This commit is contained in:
Rusty Russell 2016-10-31 11:31:37 +10:30 committed by GitHub
commit 4bb7c5ba7b
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/irc_announce.c
View File

@ -44,7 +44,7 @@ static bool announce_channel(const tal_t *ctx, struct ircstate *state, struct pe
loc->index,
state->dstate->config.fee_base,
state->dstate->config.fee_per_satoshi,
p->remote.locktime.locktime
state->dstate->config.min_htlc_expiry
);
sign_privmsg(state, msg);
irc_send_msg(state, msg);
@ -177,7 +177,6 @@ static void handle_node_announcement(
struct pubkey *pk = talz(msg, struct pubkey);
char *hostname = tal_strdup(msg, splits[2]);
int port = atoi(splits[3]);
if (!pubkey_from_hexstr(istate->dstate->secpctx, splits[1], strlen(splits[1]), pk) || port < 1)
return;
@ -185,9 +184,16 @@ static void handle_node_announcement(
log_debug(istate->log, "Ignoring node announcement from %s, signature check failed.",
splits[1]);
return;
} else if(splits[4] != NULL && strlen(splits[4]) > 64) {
log_debug(istate->log, "Ignoring node announcement from %s, alias too long",
splits[1]);
}
add_node(istate->dstate, pk, hostname, port);
struct node *node = add_node(istate->dstate, pk, hostname, port);
if (splits[4] != NULL){
tal_free(node->alias);
node->alias = tal_hexdata(node, splits[5], strlen(splits[4]));
}
}
/*
@ -210,7 +216,7 @@ static void handle_irc_privmsg(struct ircstate *istate, const struct privmsg *ms
if (splitcount == 10 && streq(type, "CHAN"))
handle_channel_announcement(istate, msg, splits + 1);
else if (splitcount == 5 && streq(type, "NODE"))
else if (splitcount >= 5 && streq(type, "NODE"))
handle_node_announcement(istate, msg, splits + 1);
}

1
daemon/routing.c
View File

@ -65,6 +65,7 @@ struct node *new_node(struct lightningd_state *dstate,
n->in = tal_arr(n, struct node_connection *, 0);
n->out = tal_arr(n, struct node_connection *, 0);
n->port = 0;
n->alias = NULL;
node_map_add(dstate->nodes, n);
tal_add_destructor(n, destroy_node);

3
daemon/routing.h
View File

@ -37,6 +37,9 @@ struct node {
/* Where that came from. */
struct node_connection *prev;
} bfg[ROUTING_MAX_HOPS+1];
/* UTF-8 encoded alias as tal_arr, not zero terminated */
u8 *alias;
};
struct lightningd_state;