plugin: store pointer to exec timeout value in the ops structure

This is required for plugins that need access to the configured execution
timeout. The global variable cannot be used as-is since we dlopen() with
RTLD_LOCAL.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/include/rpcd/plugin.h b/include/rpcd/plugin.h
index 8a1178d6594a087943c365b6d5e686a68291d527..363c0d7db40b71da4cb09021a2e1c1080812c5fe 100644 (file)
--- a/include/rpcd/plugin.h
+++ b/include/rpcd/plugin.h
@@ -54,6 +54,7 @@ struct rpc_daemon_ops {
                 rpc_exec_read_cb_t err, rpc_exec_done_cb_t end,
                 void *priv, struct ubus_context *ctx,
                 struct ubus_request_data *req);
+    int *exec_timeout;
 };
 
 struct rpc_plugin {

diff --git a/plugin.c b/plugin.c
index 532fa15284b17a715d896244043befc2c93e1063..3740622e8fe9c753a8f2b73df341173b9642079c 100644 (file)
--- a/plugin.c
+++ b/plugin.c
@@ -404,6 +404,7 @@ static const struct rpc_daemon_ops ops = {
        .session_create_cb  = rpc_session_create_cb,
        .session_destroy_cb = rpc_session_destroy_cb,
        .exec               = rpc_exec,
+       .exec_timeout       = &rpc_exec_timeout,
 };
 
 static int