#include "env_set.h"
#include "options.h"
+static void
+argv_extend(struct argv *a, const size_t newcap)
+{
+ if (newcap > a->capacity)
+ {
+ char **newargv;
+ size_t i;
+ ALLOC_ARRAY_CLEAR(newargv, char *, newcap);
+ for (i = 0; i < a->argc; ++i)
+ {
+ newargv[i] = a->argv[i];
+ }
+ free(a->argv);
+ a->argv = newargv;
+ a->capacity = newcap;
+ }
+}
+
static void
argv_init(struct argv *a)
{
a->capacity = 0;
a->argc = 0;
a->argv = NULL;
+ argv_extend(a, 8);
}
struct argv
}
void
-argv_reset(struct argv *a)
+argv_free(struct argv *a)
{
size_t i;
for (i = 0; i < a->argc; ++i)
free(a->argv[i]);
}
free(a->argv);
- argv_init(a);
}
static void
-argv_extend(struct argv *a, const size_t newcap)
+argv_reset(struct argv *a)
{
- if (newcap > a->capacity)
+ size_t i;
+ for (i = 0; i < a->argc; ++i)
{
- char **newargv;
- size_t i;
- ALLOC_ARRAY_CLEAR(newargv, char *, newcap);
- for (i = 0; i < a->argc; ++i)
- {
- newargv[i] = a->argv[i];
- }
- free(a->argv);
- a->argv = newargv;
- a->capacity = newcap;
+ free(a->argv[i]);
+ a->argv[i] = NULL;
}
+ a->argc = 0;
}
static void
const char *
argv_str(const struct argv *a, struct gc_arena *gc, const unsigned int flags)
{
- if (a->argv)
- {
- return print_argv((const char **)a->argv, gc, flags);
- }
- else
- {
- return "";
- }
+ return print_argv((const char **)a->argv, gc, flags);
}
void
const char delim = 0x1D; /* ASCII Group Separator (GS) */
bool res = false;
- argv_extend(a, 1); /* ensure trailing NULL */
-
/*
* Prepare a format string which will be used by vsnprintf() later on.
*
{
/* Someone snuck in a GS (0x1D), fail gracefully */
argv_reset(a);
- argv_extend(a, 1); /* ensure trailing NULL */
goto out;
}
res = true;
argv_parse_cmd(struct argv *a, const char *s)
{
argv_reset(a);
- argv_extend(a, 1); /* ensure trailing NULL */
struct gc_arena gc = gc_new();
char *parms[MAX_PARMS + 1] = { 0 };
struct argv argv_new(void);
-void argv_reset(struct argv *a);
+void argv_free(struct argv *a);
const char *argv_str(const struct argv *a, struct gc_arena *gc, const unsigned int flags);
}
close(std_out);
- argv_reset(&argv);
+ argv_free(&argv);
return ret;
}
msg(M_FATAL, "ERROR: up/down plugin call failed");
}
- argv_reset(&argv);
+ argv_free(&argv);
}
if (command)
ifconfig_local, ifconfig_remote, context);
argv_msg(M_INFO, &argv);
openvpn_run_script(&argv, es, S_FATAL, "--up/--down");
- argv_reset(&argv);
+ argv_free(&argv);
}
gc_free(&gc);
return false;
#endif
-#ifdef ARGV_TEST
- {
- void argv_test(void);
-
- argv_test();
- return false;
- }
-#endif
-
#ifdef PRNG_TEST
{
struct gc_arena gc = gc_new();
setenv_str(es, "script_type", "route-up");
argv_parse_cmd(&argv, options->route_script);
openvpn_run_script(&argv, es, 0, "--route-up");
- argv_reset(&argv);
+ argv_free(&argv);
}
#ifdef _WIN32
msg(M_INFO, "TUN/TAP link layer address set to %s", lladdr);
}
- argv_reset(&argv);
+ argv_free(&argv);
return r;
}
msg(M_WARN, "WARNING: learn-address plugin call failed");
ret = false;
}
- argv_reset(&argv);
+ argv_free(&argv);
}
if (m->top.options.learn_address_script)
{
ret = false;
}
- argv_reset(&argv);
+ argv_free(&argv);
}
gc_free(&gc);
setenv_str(mi->context.c2.es, "script_type", "client-disconnect");
argv_parse_cmd(&argv, mi->context.options.client_disconnect_script);
openvpn_run_script(&argv, mi->context.c2.es, 0, "--client-disconnect");
- argv_reset(&argv);
+ argv_free(&argv);
}
#ifdef MANAGEMENT_DEF_AUTH
if (management)
}
script_depr_failed:
- argv_reset(&argv);
+ argv_free(&argv);
}
/* V2 callback, use a plugin_return struct for passing back return info */
}
script_failed:
- argv_reset(&argv);
+ argv_free(&argv);
}
/*
#include "syshead.h"
+#include "argv.h"
#include "networking.h"
#include "misc.h"
#include "openvpn.h"
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, ctx->es, S_FATAL, "Linux ip link set failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, ctx->es, S_FATAL, "Linux ip addr add failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
openvpn_execve_check(&argv, ctx->es, S_FATAL,
"Linux ip -6 addr add failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "Linux ip addr del failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "Linux ip -6 addr del failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, ctx->es, S_FATAL, "Linux ip addr add failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "Linux ip addr del failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(D_ROUTE, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "ERROR: Linux route add command failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(D_ROUTE, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "ERROR: Linux route -6 add command failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(D_ROUTE, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "ERROR: Linux route delete command failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
argv_msg(D_ROUTE, &argv);
openvpn_execve_check(&argv, ctx->es, 0, "ERROR: Linux route -6 del command failed");
- argv_reset(&argv);
+ argv_free(&argv);
return 0;
}
return_code = true;
}
- argv_reset(&argv);
+ argv_free(&argv);
return return_code;
}
p->so_pathname);
}
- argv_reset(&a);
+ argv_free(&a);
gc_free(&gc);
}
return status;
{
r->flags &= ~RT_ADDED;
}
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
/* release resources potentially allocated during route setup */
net_ctx_reset(ctx);
{
r6->flags &= ~RT_ADDED;
}
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
/* release resources potentially allocated during route setup */
net_ctx_reset(ctx);
done:
r->flags &= ~RT_ADDED;
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
/* release resources potentially allocated during route cleanup */
net_ctx_reset(ctx);
msg(M_FATAL, "Sorry, but I don't know how to do 'route ipv6' commands on this operating system. Try putting your routes in a --route-down script");
#endif /* if defined(TARGET_LINUX) */
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
/* release resources potentially allocated during route cleanup */
net_ctx_reset(ctx);
{
msg(M_WARN, "WARNING: ipchange plugin call failed");
}
- argv_reset(&argv);
+ argv_free(&argv);
}
/* Process --ipchange option */
setenv_str(es, "script_type", "ipchange");
ipchange_fmt(true, &argv, info, &gc);
openvpn_run_script(&argv, es, 0, "--ipchange");
- argv_reset(&argv);
+ argv_free(&argv);
}
gc_free(&gc);
ret = plugin_call_ssl(plugins, OPENVPN_PLUGIN_TLS_VERIFY, &argv, NULL, es, cert_depth, cert);
- argv_reset(&argv);
+ argv_free(&argv);
if (ret == OPENVPN_PLUGIN_FUNC_SUCCESS)
{
cleanup:
gc_free(&gc);
- argv_reset(&argv);
+ argv_free(&argv);
if (ret)
{
platform_unlink(tmp_file);
}
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
return ret;
}
ret = openvpn_run_script(&argv, es, 0, "--tls-crypt-v2-verify");
- argv_reset(&argv);
+ argv_free(&argv);
env_set_destroy(es);
if (!platform_unlink(tmp_file))
#if !defined(TARGET_LINUX)
gc_free(&gc);
- argv_reset(&argv);
+ argv_free(&argv);
#endif
}
#if !defined(TARGET_LINUX)
gc_free(&gc);
- argv_reset(&argv);
+ argv_free(&argv);
#endif
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, NULL, 0, "Generic ip addr del failed");
- argv_reset(&argv);
+ argv_free(&argv);
#endif /* ifdef TARGET_LINUX */
}
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, NULL, 0, "Linux ip -6 addr del failed");
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
#endif /* ifdef TARGET_LINUX */
}
IFCONFIG_PATH, tt->actual_name );
argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, NULL, 0, "Solaris ifconfig inet6 unplumb failed");
- argv_reset(&argv);
+ argv_free(&argv);
}
if (tt->ip_fd >= 0)
openvpn_execve_check(&argv, es, 0, "Solaris ifconfig unplumb failed");
close_tun(tt, NULL);
msg(M_FATAL, "Solaris ifconfig failed");
- argv_reset(&argv);
+ argv_free(&argv);
}
int
openvpn_execve_check(&argv, NULL, 0, "OpenBSD 'destroy tun interface' failed (non-critical)");
free(tt);
- argv_reset(&argv);
+ argv_free(&argv);
}
int
openvpn_execve_check(&argv, NULL, 0, "NetBSD 'destroy tun interface' failed (non-critical)");
free(tt);
- argv_reset(&argv);
+ argv_free(&argv);
}
static inline int
"FreeBSD 'destroy tun interface' failed (non-critical)");
free(tt);
- argv_reset(&argv);
+ argv_free(&argv);
}
int
close_tun_generic(tt);
free(tt);
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
}
env_set_add( es, "ODMDIR=/etc/objrepos" );
openvpn_execve_check(&argv, es, S_FATAL, "AIX 'create tun interface' failed");
env_set_destroy(es);
- argv_reset(&argv);
+ argv_free(&argv);
}
else
{
free(tt);
env_set_destroy(es);
- argv_reset(&argv);
+ argv_free(&argv);
}
int
WIN_IPCONFIG_PATH_SUFFIX);
argv_msg(D_TUNTAP_INFO, &argv);
openvpn_execve_check(&argv, es, 0, err);
- argv_reset(&argv);
+ argv_free(&argv);
argv_printf(&argv, "%s%s /registerdns",
get_win_sys_path(),
WIN_IPCONFIG_PATH_SUFFIX);
argv_msg(D_TUNTAP_INFO, &argv);
openvpn_execve_check(&argv, es, 0, err);
- argv_reset(&argv);
+ argv_free(&argv);
netcmd_semaphore_release();
msg(D_TUNTAP_INFO, "End ipconfig commands for register-dns...");
netsh_command(&argv, 1, (i==0) ? M_FATAL : M_NONFATAL);
}
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
}
}
}
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
}
BOOL_CAST(flags & NI_TEST_FIRST));
}
- argv_reset(&argv);
+ argv_free(&argv);
gc_free(&gc);
}
netsh_command(&argv, 4, M_FATAL);
- argv_reset(&argv);
+ argv_free(&argv);
}
/* Enable dhcp on tap adapter using iservice */
tt->actual_name);
netsh_command(&argv, 1, M_WARN);
}
- argv_reset(&argv);
+ argv_free(&argv);
}
void
argv_printf(&a, " %s %s %d ", PATH1, PATH2, 42);
assert_int_equal(a.argc, 3);
- argv_reset(&a);
+ argv_free(&a);
}
static void
argv_printf_cat(&a, " %s %s", PATH2, PARAM1);
assert_int_equal(a.argc, 3);
- argv_reset(&a);
+ argv_free(&a);
}
static void
assert_int_equal(a.argc, 1);
assert_string_equal(a.argv[0], "<p1:" PATH1 ">");
- argv_reset(&a);
+ argv_free(&a);
}
static void
assert_false(argv_printf(&a, "tool --do %s", "this\035--harmful"));
assert_int_equal(a.argc, 0);
- argv_reset(&a);
+ argv_free(&a);
}
static void
argv_printf(&a, "foo %s%s %s x y", PATH2, PATH1, "foo");
assert_int_equal(a.argc, 5);
- argv_reset(&a);
+ argv_free(&a);
}
static void
argv_printf(&a, "%s %s", "", PARAM1);
assert_int_equal(a.argc, 2);
- argv_reset(&a);
+ argv_free(&a);
}
static void
argv_parse_cmd(&a, SCRIPT_CMD);
assert_int_equal(a.argc, 3);
- argv_reset(&a);
+ argv_free(&a);
}
static void
argv_printf_cat(&a, "bar baz %d %s", 42, PATH1);
assert_int_equal(a.argc, 7);
- argv_reset(&a);
+ argv_free(&a);
}
static void
argv_printf_cat(&a, "foo");
assert_int_equal(a.argc, 5);
- argv_reset(&a);
+ argv_free(&a);
+}
+
+static void
+argv_str__empty_argv__empty_output(void **state)
+{
+ struct argv a = argv_new();
+ struct gc_arena gc = gc_new();
+ const char *output;
+
+ output = argv_str(&a, &gc, PA_BRACKET);
+ assert_string_equal(output, "");
+
+ argv_free(&a);
+ gc_free(&gc);
}
static void
assert_string_equal(output, "[" PATH1 PATH2 "] [" PARAM1 "] [" PARAM2 "]"
" [-1] [4294967295] [1]");
- argv_reset(&a);
+ argv_free(&a);
gc_free(&gc);
}
b = argv_insert_head(&a, PATH1);
assert_int_equal(b.argc, 1);
assert_string_equal(b.argv[0], PATH1);
- argv_reset(&b);
+ argv_free(&b);
- argv_reset(&a);
+ argv_free(&a);
}
static void
assert_string_equal(b.argv[i], a.argv[i - 1]);
}
}
- argv_reset(&b);
+ argv_free(&b);
- argv_reset(&a);
+ argv_free(&a);
}
int
cmocka_unit_test(argv_parse_cmd__command_string__argc_correct),
cmocka_unit_test(argv_parse_cmd__command_and_extra_options__argc_correct),
cmocka_unit_test(argv_printf_cat__used_twice__argc_correct),
+ cmocka_unit_test(argv_str__empty_argv__empty_output),
cmocka_unit_test(argv_str__multiple_argv__correct_output),
cmocka_unit_test(argv_insert_head__non_empty_argv__head_added),
};
projects / thirdparty / openvpn.git / commitdiff
