From: Sergey Dyasli <[email protected]>
Allow passing arguments to the ext program via the query parameters. The
name of each argument is "argv" and it can be repeated multiple times to
pass several arguments.
URI example:
qemu+ext:///system?command=/bin/prog&argv=192.168.0.10&argv=8080
Suggested-by: Daniel P. Berrangé <[email protected]>
Signed-off-by: Sergey Dyasli <[email protected]>
Signed-off-by: Mark Cave-Ayland <[email protected]>
---
src/remote/remote_driver.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ec71eaed87..5c574eff37 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -805,6 +805,7 @@ static int
doRemoteOpenExtractURIArgs(virConnectPtr conn,
char **name,
char **command,
+ GPtrArray **extArgs,
char **sockname,
char **authtype,
char **sshauth,
@@ -829,6 +830,13 @@ doRemoteOpenExtractURIArgs(virConnectPtr conn,
EXTRACT_URI_ARG_STR("name", *name);
EXTRACT_URI_ARG_STR("command", *command);
+ if (STRCASEEQ(var->name, "argv")) {
+ if (!*extArgs)
+ *extArgs = g_ptr_array_new_with_free_func(g_free);
+ g_ptr_array_add(*extArgs, g_strdup(var->value));
+ var->ignore = 1;
+ continue;
+ }
EXTRACT_URI_ARG_STR("socket", *sockname);
EXTRACT_URI_ARG_STR("auth", *authtype);
EXTRACT_URI_ARG_STR("sshauth", *sshauth);
@@ -895,6 +903,7 @@ doRemoteOpen(virConnectPtr conn,
g_autofree char *tls_priority = NULL;
g_autofree char *name = NULL;
g_autofree char *command = NULL;
+ g_autoptr(GPtrArray) extArgs = NULL;
g_autofree char *sockname = NULL;
g_autofree char *netcat = NULL;
g_autofree char *port = NULL;
@@ -945,6 +954,7 @@ doRemoteOpen(virConnectPtr conn,
if (doRemoteOpenExtractURIArgs(conn,
&name,
&command,
+ &extArgs,
&sockname,
&authtype,
&sshauth,
@@ -1195,7 +1205,18 @@ doRemoteOpen(virConnectPtr conn,
break;
case REMOTE_DRIVER_TRANSPORT_EXT: {
- char const *cmd_argv[] = { command, NULL };
+ size_t nExtArgs = extArgs ? extArgs->len : 0;
+ g_autofree const char **cmd_argv = NULL;
+ size_t idx;
+
+ if (!(cmd_argv = g_new0(const char *, nExtArgs + 2)))
+ goto error;
+
+ cmd_argv[0] = command;
+
+ for (idx = 0; idx < nExtArgs; idx++)
+ cmd_argv[idx + 1] = g_ptr_array_index(extArgs, idx);
+
if (!(priv->client = virNetClientNewExternal(cmd_argv)))
goto error;
--
2.43.0
