mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

refactor: Moving functionality out of p2p_announce

Browse source 
Further decoupling the old daemons from the new daemons.
This commit is contained in:
Christian Decker 2017-01-22 16:16:51 +01:00 • committed by Rusty Russell
parent 2c06524165
commit 2a7e757053
4 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
daemon/p2p_announce.c
View file

@ -171,33 +171,6 @@ static void queue_broadcast(struct lightningd_state *dstate,
list_add_tail(&dstate->broadcast_queue, &msg->list);
}
static bool add_channel_direction(struct lightningd_state *dstate,
const struct pubkey *from,
const struct pubkey *to,
const int direction,
const struct channel_id *channel_id,
const u8 *announcement)
{
struct node_connection *c = get_connection(dstate->rstate, from, to);
if (c){
/* Do not clobber connections added otherwise */
memcpy(&c->channel_id, channel_id, sizeof(c->channel_id));
c->flags = direction;
printf("Found node_connection via get_connection");
return false;
}else if(get_connection_by_cid(dstate->rstate, channel_id, direction)) {
return false;
}
c = half_add_connection(dstate->rstate, from, to, channel_id, direction);
/* Remember the announcement so we can forward it to new peers */
tal_free(c->channel_announcement);
c->channel_announcement = tal_dup_arr(c, u8, announcement,
tal_count(announcement), 0);
return true;
}
void handle_channel_announcement(
struct peer *peer,
const u8 *announce, size_t len)
@ -240,10 +213,10 @@ void handle_channel_announcement(
channel_id.outnum
);
forward |= add_channel_direction(peer->dstate, &node_id_1,
forward |= add_channel_direction(peer->dstate->rstate, &node_id_1,
&node_id_2, 0, &channel_id,
serialized);
forward |= add_channel_direction(peer->dstate, &node_id_2,
forward |= add_channel_direction(peer->dstate->rstate, &node_id_2,
&node_id_1, 1, &channel_id,
serialized);
if (!forward){

2
daemon/p2p_announce.h
View file

@ -1,6 +1,8 @@
#ifndef LIGHTNING_DAEMON_P2P_ANNOUNCE_H
#define LIGHTNING_DAEMON_P2P_ANNOUNCE_H
#include "config.h"
#include "daemon/lightningd.h"
#include "daemon/routing.h"
#include "lightningd.h"
#include "wire/gen_peer_wire.h"

26
daemon/routing.c
View file

@ -670,3 +670,29 @@ static const struct json_command getnodes_command = {
"Returns a 'nodes' array"
};
AUTODATA(json_command, &getnodes_command);
bool add_channel_direction(struct routing_state *rstate,
const struct pubkey *from,
const struct pubkey *to,
const int direction,
const struct channel_id *channel_id,
const u8 *announcement)
{
struct node_connection *c = get_connection(rstate, from, to);
if (c){
/* Do not clobber connections added otherwise */
memcpy(&c->channel_id, channel_id, sizeof(c->channel_id));
c->flags = direction;
return false;
}else if(get_connection_by_cid(rstate, channel_id, direction)) {
return false;
}
c = half_add_connection(rstate, from, to, channel_id, direction);
/* Remember the announcement so we can forward it to new peers */
tal_free(c->channel_announcement);
c->channel_announcement = tal_dup_arr(c, u8, announcement,
tal_count(announcement), 0);
return true;
}

7
daemon/routing.h
View file

@ -149,4 +149,11 @@ struct node_map *empty_node_map(const tal_t *ctx);
char *opt_add_route(const char *arg, struct lightningd_state *dstate);
bool add_channel_direction(struct routing_state *rstate,
const struct pubkey *from,
const struct pubkey *to,
const int direction,
const struct channel_id *channel_id,
const u8 *announcement);
#endif /* LIGHTNING_DAEMON_ROUTING_H */