Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
#ifndef LIGHTNING_LIGHTNINGD_PARAMS_H
|
|
|
|
#define LIGHTNING_LIGHTNINGD_PARAMS_H
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
struct param;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Typesafe callback system for unmarshalling and validating json parameters.
|
|
|
|
|
|
|
|
Typical usage:
|
|
|
|
unsigned cltv;
|
|
|
|
const jsmntok_t *note;
|
2018-07-02 02:53:11 +02:00
|
|
|
u64 *msatoshi;
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
|
|
|
|
if (!param_parse(cmd, buffer, tokens,
|
|
|
|
param_req("cltv", json_tok_number, &cltv),
|
2018-07-04 18:50:20 +02:00
|
|
|
param_opt("note", json_tok_tok, ¬e),
|
2018-07-02 02:53:11 +02:00
|
|
|
param_opt("msatoshi", json_tok_u64, &msatoshi),
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
NULL))
|
|
|
|
return;
|
|
|
|
|
|
|
|
At this point in the code you can be assured the json tokens were successfully
|
2018-07-04 03:46:07 +02:00
|
|
|
parsed. If not, param_parse() returns false, having already called
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
command_fail() with a descriptive error message. The data section of the json
|
|
|
|
result contains the offending parameter and its value.
|
|
|
|
|
|
|
|
cltv is a required parameter, and is set correctly.
|
|
|
|
|
2018-07-02 02:53:11 +02:00
|
|
|
note and msatoshi are optional parameters. Their argument will be set to NULL
|
|
|
|
if they are not provided.
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
|
2018-07-02 02:53:11 +02:00
|
|
|
The note parameter uses a special callback, param_opt_tok: it
|
|
|
|
simply sets note to the appropriate value (or NULL) and lets the
|
|
|
|
handler do the validating.
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
|
|
|
|
There are canned failure messages for common callbacks. An example:
|
|
|
|
|
|
|
|
'msatoshi' should be an unsigned 64 bit integer, not '123z'
|
|
|
|
|
|
|
|
Otherwise a generic message is provided.
|
|
|
|
*/
|
2018-07-04 03:46:07 +02:00
|
|
|
bool param_parse(struct command *cmd, const char *buffer,
|
|
|
|
const jsmntok_t params[], ...);
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This callback provided must follow this signature; e.g.,
|
|
|
|
* bool json_tok_double(const char *buffer, const jsmntok_t *tok, double *arg)
|
|
|
|
*/
|
|
|
|
typedef bool(*param_cb)(const char *buffer, const jsmntok_t *tok, void *arg);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a handler to unmarshal a required json token into @arg. The handler must
|
|
|
|
* return true on success and false on failure. Upon failure, command_fail will be
|
|
|
|
* called with a descriptive error message.
|
|
|
|
*
|
|
|
|
* This operation is typesafe; i.e., a compilation error will occur if the types
|
2018-07-07 07:52:14 +02:00
|
|
|
* of @arg and the last parameter of @cb do not match (see the weird 0*sizeof).
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
*
|
|
|
|
* Returns an opaque pointer that can be later used in param_is_set().
|
|
|
|
*/
|
2018-07-04 03:46:07 +02:00
|
|
|
#define param_req(name, cb, arg) \
|
|
|
|
name"", \
|
2018-07-11 04:29:53 +02:00
|
|
|
true, \
|
2018-07-07 07:52:14 +02:00
|
|
|
(cb), \
|
|
|
|
(arg) + 0*sizeof((cb)((const char *)NULL, \
|
|
|
|
(const jsmntok_t *)NULL, \
|
|
|
|
(arg)) == true), \
|
2018-07-11 20:32:41 +02:00
|
|
|
(size_t)0
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
/*
|
2018-07-04 18:50:20 +02:00
|
|
|
* Similar to above but for optional parameters.
|
|
|
|
* @arg must be the address of a pointer. If found during parsing, it will be
|
|
|
|
* allocated, otherwise it will be set to NULL.
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
*/
|
2018-07-04 18:03:12 +02:00
|
|
|
#define param_opt(name, cb, arg) \
|
2018-07-04 03:46:07 +02:00
|
|
|
name"", \
|
2018-07-11 04:29:53 +02:00
|
|
|
false, \
|
2018-07-07 07:52:14 +02:00
|
|
|
(cb), \
|
|
|
|
(arg) + 0*sizeof((cb)((const char *)NULL, \
|
|
|
|
(const jsmntok_t *)NULL,\
|
|
|
|
*(arg)) == true), \
|
|
|
|
sizeof(**(arg))
|
|
|
|
|
2018-07-11 04:29:53 +02:00
|
|
|
/*
|
2018-07-11 16:17:06 +02:00
|
|
|
* Similar to param_req but for optional parameters with defaults.
|
|
|
|
* @arg will be set to @def if it isn't found during parsing.
|
2018-07-11 04:29:53 +02:00
|
|
|
*/
|
|
|
|
#define param_opt_default(name, cb, arg, def) \
|
|
|
|
name"", \
|
|
|
|
false, \
|
|
|
|
(cb), \
|
|
|
|
(arg) + 0*sizeof((cb)((const char *)NULL, \
|
|
|
|
(const jsmntok_t *)NULL, \
|
|
|
|
(arg)) == true), \
|
|
|
|
((void)((*arg) = (def)), 0)
|
|
|
|
|
2018-07-07 07:52:14 +02:00
|
|
|
/*
|
|
|
|
* For when you want an optional raw token.
|
|
|
|
*
|
|
|
|
* Note: weird sizeof() does type check that arg really is a (const) jsmntok_t **.
|
|
|
|
*/
|
|
|
|
#define param_opt_tok(name, arg) \
|
|
|
|
name"", \
|
2018-07-11 04:29:53 +02:00
|
|
|
false, \
|
2018-07-07 07:52:14 +02:00
|
|
|
json_tok_tok, \
|
|
|
|
(arg) + 0*sizeof(*(arg) == (jsmntok_t *)NULL), \
|
|
|
|
sizeof(const jsmntok_t *)
|
Typesafe callback system for parsing json
This is part of #1464 and incorporates Rusty's suggested updates from #1569.
See comment in param.h for description, here's the basics:
unsigned cltv;
const jsmntok_t *note;
u64 msatoshi;
struct param * mp;
if (!param_parse(cmd, buffer, tokens,
param_req("cltv", json_tok_number, &cltv),
param_opt("note", json_tok_tok, ¬e),
mp = param_opt("msatoshi", json_tok_u64, &msatoshi),
NULL))
return;
if (param_is_set(mp))
do_something()
There is a lot of developer mode code to make sure we don't make mistakes,
like trying to unmarshal into the same variable twice or adding a required param
after optional.
During testing, I found a bug (of sorts) in the current system. It allows you
to provide two named parameters with the same name without error; e.g.:
# cli/lightning-cli -k newaddr addresstype=p2sh-segwit addresstype=bech32
{
"address": "2N3r6fT65PhfhE1mcMS6TtcdaEurud6M7pA"
}
It just takes the first and ignores the second. The new system reports this as an
error for now. We can always change this later.
2018-06-16 17:29:32 +02:00
|
|
|
|
|
|
|
#endif /* LIGHTNING_LIGHTNINGD_PARAMS_H */
|