DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json_script: add support for aborting script processing

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2015-11-06 22:58:15 +01:00
parent 136a519626
commit 3d45c47752
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
json_script.c
View file

@ -541,6 +541,9 @@ static int json_process_cmd(struct json_call *call, struct blob_attr *block)
} }
blobmsg_for_each_attr(cur, block, rem) { blobmsg_for_each_attr(cur, block, rem) {
if (ctx->abort)
break;
switch(blobmsg_type(cur)) { switch(blobmsg_type(cur)) {
case BLOBMSG_TYPE_STRING: case BLOBMSG_TYPE_STRING:
if (!i) if (!i)
@ -571,6 +574,8 @@ void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *
if (!call.seq) if (!call.seq)
call.seq = ++_seq; call.seq = ++_seq;
ctx->abort = false;
__json_script_run(&call, file, NULL); __json_script_run(&call, file, NULL);
} }

13
json_script.h
View file

@ -28,6 +28,7 @@ struct json_script_ctx {
struct blob_buf buf; struct blob_buf buf;
uint32_t run_seq; uint32_t run_seq;
bool abort;
/* /*
* handle_command: handle a command that was not recognized by the * handle_command: handle a command that was not recognized by the
@ -99,6 +100,18 @@ void json_script_run(struct json_script_ctx *ctx, const char *filename,
void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *file, void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *file,
struct blob_attr *vars); struct blob_attr *vars);
/*
* json_script_abort - abort current json script run
*
* to be called from a script context callback
*/
static inline void
json_script_abort(struct json_script_ctx *ctx)
{
ctx->abort = true;
}
/* /*
* json_script_eval_string - evaluate a string and store the result * json_script_eval_string - evaluate a string and store the result
* *