From f104d00af8ace124ff283e3adb7c7d4d867d6bbf Mon Sep 17 00:00:00 2001 From: Gert Doering Date: Mon, 4 Nov 2024 09:58:08 +0100 Subject: [PATCH] send uname() release as IV_PLAT_VER= on non-windows versions This is highly system specific, as the content of the uname() structure elements is not specified very well - uname(3) says: release Release level of the operating system which translates to "IV_PLAT_VER=13.3-RELEASE-p6" (FreeBSD) or "IV_PLAT_VER=22.6.0" (macOS) - the latter being the "Mach Kernel version", not what Apple calls the OS. It's still useful if a server operator needs to keep track of client versions (and the GUI does not set the corresponding environment variable, which neither Tunnelblick nor NM do). v2: manpage amendments v3: whitespace v4: reword manpage Github: OpenVPN/openvpn#637 Change-Id: Id2b0c5a517f02e5c219fea2ae3ef2bdef7690169 Signed-off-by: Gert Doering Acked-by: Antonio Quartulli Message-Id: <20241104085808.17039-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29699.html Signed-off-by: Gert Doering (cherry picked from commit d5b4713153ce95e88651d93aa1ef25b2676d0cfc) --- doc/man-sections/client-options.rst | 5 ++++- src/openvpn/ssl.c | 4 ++++ src/openvpn/syshead.h | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/man-sections/client-options.rst b/doc/man-sections/client-options.rst index b75fe5bdbad..84a626e3b14 100644 --- a/doc/man-sections/client-options.rst +++ b/doc/man-sections/client-options.rst @@ -430,7 +430,10 @@ configuration. The version of the operating system, e.g. 6.1 for Windows 7. This may be set by the client UI/GUI using ``--setenv``. On Windows systems it is automatically determined by openvpn - itself. + itself. On other platforms OpenVPN will default to sending + the information returned by the `uname()` system call in + the `release` field, which is usually the currently running + kernel version. This is highly system specific, though. :code:`UV_=` Client environment variables whose names start with diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index b4a99e2408b..4fa7ea6fc45 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2149,6 +2149,10 @@ push_peer_info(struct buffer *buf, struct tls_session *session) buf_printf(&out, "IV_SSL=%s\n", get_ssl_library_version() ); #if defined(_WIN32) buf_printf(&out, "IV_PLAT_VER=%s\n", win32_version_string(&gc, false)); +#else + struct utsname u; + uname(&u); + buf_printf(&out, "IV_PLAT_VER=%s\n", u.release); #endif } diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index 017d68d318c..3e0f31a036f 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -347,6 +347,10 @@ typedef int MIB_TCP_STATE; #include #endif +#ifndef _WIN32 +#include +#endif + /* * Pedantic mode is meant to accomplish lint-style program checking, * not to build a working executable.