diff options
-rw-r--r-- | exec.c | 2 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | include/rpcd/exec.h | 2 | ||||
-rw-r--r-- | main.c | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -350,7 +350,7 @@ rpc_exec(const char **args, rpc_exec_write_cb_t in, uloop_process_add(&c->process); c->timeout.cb = rpc_exec_timeout_cb; - uloop_timeout_set(&c->timeout, exec_timeout); + uloop_timeout_set(&c->timeout, rpc_exec_timeout); if (c->stdin_cb) { @@ -690,7 +690,7 @@ rpc_file_exec_run(const char *cmd, uloop_process_add(&c->process); c->timeout.cb = rpc_file_exec_timeout_cb; - uloop_timeout_set(&c->timeout, exec_timeout); + uloop_timeout_set(&c->timeout, rpc_exec_timeout); close(opipe[1]); close(epipe[1]); diff --git a/include/rpcd/exec.h b/include/rpcd/exec.h index 01981fe..928f5ed 100644 --- a/include/rpcd/exec.h +++ b/include/rpcd/exec.h @@ -50,7 +50,7 @@ ustream_fd_init(&us, fd); \ } while(0) -extern int exec_timeout; +extern int rpc_exec_timeout; typedef int (*rpc_exec_write_cb_t)(struct ustream *, void *); typedef int (*rpc_exec_read_cb_t)(struct blob_buf *, char *, int, void *); @@ -33,7 +33,7 @@ static struct ubus_context *ctx; static bool respawn = false; -int exec_timeout = RPC_EXEC_DEFAULT_TIMEOUT; +int rpc_exec_timeout = RPC_EXEC_DEFAULT_TIMEOUT; static void handle_signal(int sig) @@ -74,7 +74,7 @@ int main(int argc, char **argv) break; case 't': - exec_timeout = 1000 * strtol(optarg, NULL, 0); + rpc_exec_timeout = 1000 * strtol(optarg, NULL, 0); break; default: @@ -82,7 +82,7 @@ int main(int argc, char **argv) } } - if (exec_timeout < 1000 || exec_timeout > 600000) { + if (rpc_exec_timeout < 1000 || rpc_exec_timeout > 600000) { fprintf(stderr, "Invalid execution timeout specified\n"); return -1; } |