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

plugins/commando: try_command can reuse incoming struct commando.

Browse source 
We would create a `struct commando` to marshal our incoming messages,
then try_command would create a *new* one.  We can simply reuse, but
when I did I noticed a trick: the new one was not in the `incomings`
array, so didn't work towards the ratelimit.  So we need to remove it
from `incomings` in `try_command`, but at least it's now explicit.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-07-25 11:14:43 +09:30
parent 8db148871d
commit b16932697d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/commando.c
View file

@ -505,17 +505,14 @@ static const char *check_rune(const tal_t *ctx,
return err;
}
static void try_command(struct node_id *peer,
u64 idnum,
const u8 *msg, size_t msglen)
static void try_command(struct commando *incoming STEALS)
{
struct commando *incoming = new_commando(plugin, NULL, peer, idnum);
const jsmntok_t *toks, *method, *params, *rune, *id, *filter;
const char *buf = (const char *)msg, *failmsg;
const char *buf = (const char *)incoming->contents, *failmsg;
struct out_req *req;
const char *cmdid_prefix;
toks = json_parse_simple(incoming, buf, msglen);
toks = json_parse_simple(incoming, buf, tal_bytelen(buf));
if (!toks) {
commando_error(incoming, COMMANDO_ERROR_REMOTE,
"Invalid JSON");
@ -560,13 +557,17 @@ static void try_command(struct node_id *peer,
json_tok_full_len(id));
}
failmsg = check_rune(tmpctx, incoming, peer, buf, method, params, rune);
failmsg = check_rune(tmpctx, incoming, &incoming->peer, buf, method, params, rune);
if (failmsg) {
commando_error(incoming, COMMANDO_ERROR_REMOTE_AUTH,
"Not authorized: %s", failmsg);
return;
}
/* Don't count this towards incomings anymore */
destroy_commando(incoming, &incoming_commands);
tal_del_destructor2(incoming, destroy_commando, &incoming_commands);
/* We handle success and failure the same */
req = jsonrpc_request_whole_object_start(plugin, NULL,
json_strdup(tmpctx, buf,
@ -649,8 +650,7 @@ static void handle_incmd(struct node_id *peer,
return;
}
try_command(peer, idnum, incmd->contents, tal_bytelen(incmd->contents));
tal_free(incmd);
try_command(incmd);
}
static struct command_result *handle_reply(struct node_id *peer,