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

daemon: make find_peer take the raw token.

Browse Source 
Cuts duplicate code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-03-15 17:07:31 +10:30
parent 71c02c7b4c
commit b218e79206
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
daemon/peer.c
View File

@@ -48,11 +48,19 @@ struct pending_cmd {
}; };
static struct peer *find_peer(struct lightningd_state *dstate, static struct peer *find_peer(struct lightningd_state *dstate,
const struct pubkey *id) const char *buffer,
jsmntok_t *peeridtok)
{ {
struct pubkey peerid;
struct peer *peer; struct peer *peer;
if (!pubkey_from_hexstr(dstate->secpctx,
buffer + peeridtok->start,
peeridtok->end - peeridtok->start, &peerid))
return NULL;
list_for_each(&dstate->peers, peer, list) { list_for_each(&dstate->peers, peer, list) {
if (peer->state != STATE_INIT && pubkey_eq(&peer->id, id)) if (peer->state != STATE_INIT && pubkey_eq(&peer->id, &peerid))
return peer; return peer;
} }
return NULL; return NULL;
@@ -1389,7 +1397,6 @@ static void json_newhtlc(struct command *cmd,
{ {
struct peer *peer; struct peer *peer;
jsmntok_t *peeridtok, *msatoshistok, *expirytok, *rhashtok; jsmntok_t *peeridtok, *msatoshistok, *expirytok, *rhashtok;
struct pubkey peerid;
unsigned int expiry; unsigned int expiry;
struct newhtlc *newhtlc; struct newhtlc *newhtlc;
@@ -1403,13 +1410,7 @@ static void json_newhtlc(struct command *cmd,
return; return;
} }
if (!pubkey_from_hexstr(cmd->dstate->secpctx, peer = find_peer(cmd->dstate, buffer, peeridtok);
buffer + peeridtok->start,
peeridtok->end - peeridtok->start, &peerid)) {
command_fail(cmd, "Not a valid peerid");
return;
}
peer = find_peer(cmd->dstate, &peerid);
if (!peer) { if (!peer) {
command_fail(cmd, "Could not find peer with that peerid"); command_fail(cmd, "Could not find peer with that peerid");
return; return;
@@ -1518,7 +1519,6 @@ static void json_fulfillhtlc(struct command *cmd,
{ {
struct peer *peer; struct peer *peer;
jsmntok_t *peeridtok, *rtok; jsmntok_t *peeridtok, *rtok;
struct pubkey peerid;
struct fulfillhtlc *fulfillhtlc; struct fulfillhtlc *fulfillhtlc;
if (!json_get_params(buffer, params, if (!json_get_params(buffer, params,
@@ -1529,13 +1529,7 @@ static void json_fulfillhtlc(struct command *cmd,
return; return;
} }
if (!pubkey_from_hexstr(cmd->dstate->secpctx, peer = find_peer(cmd->dstate, buffer, peeridtok);
buffer + peeridtok->start,
peeridtok->end - peeridtok->start, &peerid)) {
command_fail(cmd, "Not a valid peerid");
return;
}
peer = find_peer(cmd->dstate, &peerid);
if (!peer) { if (!peer) {
command_fail(cmd, "Could not find peer with that peerid"); command_fail(cmd, "Could not find peer with that peerid");
return; return;
@@ -1606,7 +1600,6 @@ static void json_failhtlc(struct command *cmd,
{ {
struct peer *peer; struct peer *peer;
jsmntok_t *peeridtok, *rhashtok; jsmntok_t *peeridtok, *rhashtok;
struct pubkey peerid;
struct failhtlc *failhtlc; struct failhtlc *failhtlc;
if (!json_get_params(buffer, params, if (!json_get_params(buffer, params,
@@ -1617,13 +1610,7 @@ static void json_failhtlc(struct command *cmd,
return; return;
} }
if (!pubkey_from_hexstr(cmd->dstate->secpctx, peer = find_peer(cmd->dstate, buffer, peeridtok);
buffer + peeridtok->start,
peeridtok->end - peeridtok->start, &peerid)) {
command_fail(cmd, "Not a valid peerid");
return;
}
peer = find_peer(cmd->dstate, &peerid);
if (!peer) { if (!peer) {
command_fail(cmd, "Could not find peer with that peerid"); command_fail(cmd, "Could not find peer with that peerid");
return; return;
@@ -1657,7 +1644,6 @@ static void json_close(struct command *cmd,
{ {
struct peer *peer; struct peer *peer;
jsmntok_t *peeridtok; jsmntok_t *peeridtok;
struct pubkey peerid;
if (!json_get_params(buffer, params, if (!json_get_params(buffer, params,
"peerid", &peeridtok, "peerid", &peeridtok,
@@ -1666,13 +1652,7 @@ static void json_close(struct command *cmd,
return; return;
} }
if (!pubkey_from_hexstr(cmd->dstate->secpctx, peer = find_peer(cmd->dstate, buffer, peeridtok);
buffer + peeridtok->start,
peeridtok->end - peeridtok->start, &peerid)) {
command_fail(cmd, "Not a valid peerid");
return;
}
peer = find_peer(cmd->dstate, &peerid);
if (!peer) { if (!peer) {
command_fail(cmd, "Could not find peer with that peerid"); command_fail(cmd, "Could not find peer with that peerid");
return; return;