From: Daniel Lenski <dlenski@gmail.com>
Date: Mon, 24 Jan 2022 01:23:50 +0000 (-0800)
Subject: Pass verbosity level in vpnc-script environment as LOG_LEVEL
X-Git-Tag: v8.20~21^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=69fc830245d53bb210d8c5ca46a4d65cc1ccd299;p=users%2Fdwmw2%2Fopenconnect.git

Pass verbosity level in vpnc-script environment as LOG_LEVEL

Based on discussion in https://gitlab.com/openconnect/vpnc-scripts/-/issues/32#note_811874252.

Corresponding improvements to the Windows script (vpnc-script-win.js) added
in https://gitlab.com/openconnect/vpnc-scripts/-/merge_requests/45.

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/main.c b/main.c
index f4d67ae0..26843adb 100644
--- a/main.c
+++ b/main.c
@@ -150,7 +150,7 @@ static void __attribute__ ((format(printf, 3, 4)))
 static void  __attribute__ ((format(printf, 3, 4)))
     syslog_progress(void *_vpninfo, int level, const char *fmt, ...)
 {
-	struct openconect_info *vpninfo = _vpninfo;
+	struct openconnect_info *vpninfo = _vpninfo;
 	int priority = level ? LOG_INFO : LOG_NOTICE;
 	va_list args;
 
@@ -1658,7 +1658,7 @@ int main(int argc, char **argv)
 	oc_token_mode_t token_mode = OC_TOKEN_MODE_NONE;
 	int reconnect_timeout = 300;
 	int ret;
-	int verbose;
+	int verbose = PRG_INFO;
 #ifdef HAVE_NL_LANGINFO
 	char *charset;
 #endif
diff --git a/script.c b/script.c
index 682a1571..f3a638da 100644
--- a/script.c
+++ b/script.c
@@ -306,6 +306,7 @@ void prepare_script_env(struct openconnect_info *vpninfo)
 
 	script_setenv_int(vpninfo, "INTERNAL_IP4_MTU", vpninfo->ip_info.mtu);
 	script_setenv_int(vpninfo, "VPNPID", (int)getpid());
+	script_setenv_int(vpninfo, "LOG_LEVEL", vpninfo->verbose);
 
 	if (vpninfo->idle_timeout)
 		script_setenv_int(vpninfo, "IDLE_TIMEOUT", vpninfo->idle_timeout);