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

gossipd: get_channel() wrapper for channel lookup.

Browse Source 
We rename the current routing.c get_channel to find_channel.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-01 19:52:28 +10:30
committed by Christian Decker
parent 042d5d13f5
commit affc1be4d6
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gossipd/routing.c
View File

@@ -206,11 +206,10 @@ static struct node_connection * get_connection(struct routing_state *rstate,
} }
struct node_connection *get_connection_by_scid(const struct routing_state *rstate, struct node_connection *get_connection_by_scid(const struct routing_state *rstate,
const struct short_channel_id *schanid, const struct short_channel_id *scid,
const u8 direction) const u8 direction)
{ {
u64 scid = short_channel_id_to_uint(schanid); struct routing_channel *chan = get_channel(rstate, scid);
struct routing_channel *chan = uintmap_get(&rstate->channels, scid);
if (chan == NULL) if (chan == NULL)
return NULL; return NULL;
@@ -598,8 +597,7 @@ struct routing_channel *routing_channel_new(const tal_t *ctx,
static void destroy_node_connection(struct node_connection *nc, static void destroy_node_connection(struct node_connection *nc,
struct routing_state *rstate) struct routing_state *rstate)
{ {
struct routing_channel *chan = uintmap_get( struct routing_channel *chan = get_channel(rstate,&nc->short_channel_id);
&rstate->channels, short_channel_id_to_uint(&nc->short_channel_id));
struct node_connection *c = chan->connections[nc->flags & 0x1]; struct node_connection *c = chan->connections[nc->flags & 0x1];
if (c == NULL) if (c == NULL)
return; return;
@@ -683,7 +681,7 @@ const struct short_channel_id *handle_channel_announcement(
/* Check if we know the channel already (no matter in what /* Check if we know the channel already (no matter in what
* state, we stop here if yes). */ * state, we stop here if yes). */
chan = uintmap_get(&rstate->channels, scid); chan = get_channel(rstate, &pending->short_channel_id);
if (chan != NULL && chan->public) { if (chan != NULL && chan->public) {
return tal_free(pending); return tal_free(pending);
} }
@@ -765,10 +763,9 @@ bool handle_pending_cannouncement(struct routing_state *rstate,
const u8 *s; const u8 *s;
struct pending_cannouncement *pending; struct pending_cannouncement *pending;
struct routing_channel *chan; struct routing_channel *chan;
u64 uscid = short_channel_id_to_uint(scid);
/* There may be paths which can clean this up, eg. error processing. */ /* There may be paths which can clean this up, eg. error processing. */
chan = uintmap_get(&rstate->channels, uscid); chan = get_channel(rstate, scid);
if (!chan) if (!chan)
return false; return false;
@@ -918,8 +915,7 @@ void handle_channel_update(struct routing_state *rstate, const u8 *update)
return; return;
} }
chan = uintmap_get(&rstate->channels, chan = get_channel(rstate, &short_channel_id);
short_channel_id_to_uint(&short_channel_id));
if (!chan) { if (!chan) {
SUPERVERBOSE("Ignoring update for unknown channel %s", SUPERVERBOSE("Ignoring update for unknown channel %s",
type_to_string(trc, struct short_channel_id, type_to_string(trc, struct short_channel_id,
@@ -1331,9 +1327,7 @@ void mark_channel_unroutable(struct routing_state *rstate,
status_trace("Received mark_channel_unroutable channel %s", status_trace("Received mark_channel_unroutable channel %s",
scid); scid);
chan = uintmap_get(&rstate->channels, chan = get_channel(rstate, channel);
short_channel_id_to_uint(channel));
if (!chan) { if (!chan) {
status_unusual("mark_channel_unroutable: " status_unusual("mark_channel_unroutable: "
"channel %s not in routemap", "channel %s not in routemap",

7
gossipd/routing.h
View File

@@ -124,6 +124,13 @@ struct routing_state {
UINTMAP(struct routing_channel*) channels; UINTMAP(struct routing_channel*) channels;
}; };
static inline struct routing_channel *
get_channel(const struct routing_state *rstate,
const struct short_channel_id *scid)
{
return uintmap_get(&rstate->channels, short_channel_id_to_uint(scid));
}
struct route_hop { struct route_hop {
struct short_channel_id channel_id; struct short_channel_id channel_id;
struct pubkey nodeid; struct pubkey nodeid;