diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-05-31 14:59:35 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-11-15 14:39:38 +0100 |
| commit | f3a2cd255a3bc73a546a5e2d09fa30a16cce0d7d (patch) | |
| tree | 46431bc931a16c958af277997bfebe2661339682 /src | |
| parent | d0cb816cf8be68359617b61a55799f6330901f6a (diff) | |
| download | openvpn-f3a2cd255a3bc73a546a5e2d09fa30a16cce0d7d.tar.gz openvpn-f3a2cd255a3bc73a546a5e2d09fa30a16cce0d7d.tar.xz openvpn-f3a2cd255a3bc73a546a5e2d09fa30a16cce0d7d.zip | |
Add reporting of UI version to basic push-peer-info set.
If a GUIs sets IV_OPENVPN_GUI_VERSION the version will be pushed to the
server.
Usage convention for IV_OPENVPN_GUI_VERSION is "<gui_id><space><version>",
for example "de.blinkt.openvpn 0.5.47" for the ICS Android version.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Acked-by: James Yonan <james@openvpn.net>
Message-Id: <1370005175-14871-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7646
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/ssl.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 69f77f3..58ba238 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1834,15 +1834,17 @@ push_peer_info(struct buffer *buf, struct tls_session *session) get_default_gateway (&rgi); if (rgi.flags & RGI_HWADDR_DEFINED) buf_printf (&out, "IV_HWADDR=%s\n", format_hex_ex (rgi.hwaddr, 6, 0, 1, ":", &gc)); + } - /* push env vars that begin with UV_ */ - for (e=es->list; e != NULL; e=e->next) + /* push env vars that begin with UV_ and IV_OPENVPN_GUI_VERSION */ + for (e=es->list; e != NULL; e=e->next) + { + if (e->string) { - if (e->string) - { - if (!strncmp(e->string, "UV_", 3) && buf_safe(&out, strlen(e->string)+1)) - buf_printf (&out, "%s\n", e->string); - } + if (((strncmp(e->string, "UV_", 3)==0 && session->opt->push_peer_info_detail >= 2) + || (strncmp(e->string,"IV_OPENVPN_GUI_VERSION=",sizeof("IV_OPENVPN_GUI_VERSION=")-1)==0)) + && buf_safe(&out, strlen(e->string)+1)) + buf_printf (&out, "%s\n", e->string); } } |