Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
чт, 26 июл. 2018 г. в 1:04, Kevin Kane via Openvpn-devel < openvpn-devel@lists.sourceforge.net>: > Alright, I found the SMTP server and sent the patches out again with git > send-email. Let me know how those look. > looks good from patchwork point of view: https://patchwork.openvpn.net/project/openvpn2/list/ > > -Original Message- > From: Gert Doering > Sent: Wednesday, July 25, 2018 11:18 AM > To: Kevin Kane > Cc: Gert Doering ; openvpn-devel < > openvpn-devel@lists.sourceforge.net> > Subject: Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to > populate Windows VPN flyout > > Hi, > > On Wed, Jul 25, 2018 at 06:08:19PM +, Kevin Kane wrote: > > Ugh. Thanks, Outlook. I'd have to use a personal e-mail account to use > something other than Exchange. > > > > The other option is for me to add the files to the e-mail as > attachments. Is that acceptable, or do you really need the patch text to be > in the message body? > > For applying with "git am" and for reviewing with "I can just quote parts > of the patch and comment on it", attachments in anything that is not > text/plain format are also not ideal, but we can try that. > > We've had a few patches come in recently that were attachment in a signed > mail, and neither patchwork nor git could handle these mails in a > satisfying way - as in: patchwork did not recognize them as "patch", and > "git am" declared "no patch in there" - so "save patch as individual file, > git am, manually add in-reply-to to the auto- generated "patch applied" > reply mail, etc. > > It's a bit of try and error what works in a given environment. > > (git send-email talking SMTP to Exchange might actually work more nicely > than outlook. Maybe that was just one particularily weird version of > Exchange, or "too many virus scanner plugins hooked in", given that this > was Sophos...) > > gert > > -- > "If was one thing all people took for granted, was conviction that if you > feed honest figures into a computer, honest figures come out. Never > doubted it myself till I met a computer with a sense of humor." > Robert A. Heinlein, The Moon is a Harsh > Mistress > > Gert Doering - Munich, Germany > g...@greenie.muc.de > > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
Alright, I found the SMTP server and sent the patches out again with git send-email. Let me know how those look. -Original Message- From: Gert Doering Sent: Wednesday, July 25, 2018 11:18 AM To: Kevin Kane Cc: Gert Doering ; openvpn-devel Subject: Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout Hi, On Wed, Jul 25, 2018 at 06:08:19PM +, Kevin Kane wrote: > Ugh. Thanks, Outlook. I'd have to use a personal e-mail account to use > something other than Exchange. > > The other option is for me to add the files to the e-mail as attachments. Is > that acceptable, or do you really need the patch text to be in the message > body? For applying with "git am" and for reviewing with "I can just quote parts of the patch and comment on it", attachments in anything that is not text/plain format are also not ideal, but we can try that. We've had a few patches come in recently that were attachment in a signed mail, and neither patchwork nor git could handle these mails in a satisfying way - as in: patchwork did not recognize them as "patch", and "git am" declared "no patch in there" - so "save patch as individual file, git am, manually add in-reply-to to the auto- generated "patch applied" reply mail, etc. It's a bit of try and error what works in a given environment. (git send-email talking SMTP to Exchange might actually work more nicely than outlook. Maybe that was just one particularily weird version of Exchange, or "too many virus scanner plugins hooked in", given that this was Sophos...) gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
Hi, On Wed, Jul 25, 2018 at 06:08:19PM +, Kevin Kane wrote: > Ugh. Thanks, Outlook. I'd have to use a personal e-mail account to use > something other than Exchange. > > The other option is for me to add the files to the e-mail as attachments. Is > that acceptable, or do you really need the patch text to be in the message > body? For applying with "git am" and for reviewing with "I can just quote parts of the patch and comment on it", attachments in anything that is not text/plain format are also not ideal, but we can try that. We've had a few patches come in recently that were attachment in a signed mail, and neither patchwork nor git could handle these mails in a satisfying way - as in: patchwork did not recognize them as "patch", and "git am" declared "no patch in there" - so "save patch as individual file, git am, manually add in-reply-to to the auto- generated "patch applied" reply mail, etc. It's a bit of try and error what works in a given environment. (git send-email talking SMTP to Exchange might actually work more nicely than outlook. Maybe that was just one particularily weird version of Exchange, or "too many virus scanner plugins hooked in", given that this was Sophos...) gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
Ugh. Thanks, Outlook. I'd have to use a personal e-mail account to use something other than Exchange. The other option is for me to add the files to the e-mail as attachments. Is that acceptable, or do you really need the patch text to be in the message body? -Original Message- From: Gert Doering Sent: Wednesday, July 25, 2018 11:00 AM To: Kevin Kane Cc: openvpn-devel Subject: Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout Hi, as a side note, your mail client massacres leading whitespace, so the patch is all squeezed to the left side: On Wed, Jul 25, 2018 at 05:01:39PM +, Kevin Kane via Openvpn-devel wrote: > diff --git a/Makefile.am b/Makefile.am index 8301087..d8435ed 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -2,6 +2,7 @@ > # > # Copyright (C) 2004 Mathias Sundman > #2010 Heiko Hund > +# Portions Copyright (C) 2018 Microsoft Corporation > # ... which makes it impossible to apply without manually adding the leading space in non-changed lines. Interesting enough... > * > * Copyright (C) 2004 Mathias Sundman > *2010 Heiko Hund > + * Portions Copyright (C) 2018 Microsoft Corporation > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published > by ... the effect differs... But anyway. If possible, use "git send-email" (which is much better at not massacring things than the standard clients) - and point it to something which is not Exchange. Unfortunately, we've seen that as well, git-send-email sending via SMTP to Exchange, and Exchange hacking and slaying at the patch... thanks :) gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
Hi, as a side note, your mail client massacres leading whitespace, so the patch is all squeezed to the left side: On Wed, Jul 25, 2018 at 05:01:39PM +, Kevin Kane via Openvpn-devel wrote: > diff --git a/Makefile.am b/Makefile.am > index 8301087..d8435ed 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -2,6 +2,7 @@ > # > # Copyright (C) 2004 Mathias Sundman > #2010 Heiko Hund > +# Portions Copyright (C) 2018 Microsoft Corporation > # ... which makes it impossible to apply without manually adding the leading space in non-changed lines. Interesting enough... > * > * Copyright (C) 2004 Mathias Sundman > *2010 Heiko Hund > + * Portions Copyright (C) 2018 Microsoft Corporation > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by ... the effect differs... But anyway. If possible, use "git send-email" (which is much better at not massacring things than the standard clients) - and point it to something which is not Exchange. Unfortunately, we've seen that as well, git-send-email sending via SMTP to Exchange, and Exchange hacking and slaying at the patch... thanks :) gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
I agree. This was the consensus when we discussed this feature before, but there was some interest in possibly taking this work in an experimental branch and later building something more production-ready on top of the plumbing work. It is with that expectation I'm offering it upstream. -Original Message- From: Selva Nair Sent: Wednesday, July 25, 2018 10:28 AM To: Kevin Kane Cc: openvpn-devel Subject: Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout Hi, On Wed, Jul 25, 2018 at 1:01 PM, Kevin Kane via Openvpn-devel wrote: > From ed96e2d91a0eb9ecdaab8d7104f397f7d77e5ced Mon Sep 17 00:00:00 2001 > > From: Kevin Kane > > Date: Fri, 13 Jul 2018 09:50:00 -0700 > > Subject: Update system tray to populate Windows VPN flyout > > > > Add a DLL to be wired in as a custom dialer, which introduces new > build dependencies > > Add copyright notices as required where Microsoft has contributed code > > > > Signed-off-by: Kevin Kane > As discussed in a previous thread, I'm not sure we should have this in its current form: (i) It adds and entry per config to network connections which will be a nuisance for users who have far too many configs (there are some users with 100's of config files) -- so we at least need an option to enable/disable this. (ii) This only supports connect, not disconnect and the entry does not show whether its connected or not -- so this is a feature of very dubious utility. (iii) Communicating with the GUI using COPYDATA message (we support connect, disconnect, status etc.) should be preferred over hard-coding IDM_CONNECTMENU. Selva -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
Hi, On Wed, Jul 25, 2018 at 1:01 PM, Kevin Kane via Openvpn-devel wrote: > From ed96e2d91a0eb9ecdaab8d7104f397f7d77e5ced Mon Sep 17 00:00:00 2001 > > From: Kevin Kane > > Date: Fri, 13 Jul 2018 09:50:00 -0700 > > Subject: Update system tray to populate Windows VPN flyout > > > > Add a DLL to be wired in as a custom dialer, which introduces new build > dependencies > > Add copyright notices as required where Microsoft has contributed code > > > > Signed-off-by: Kevin Kane > As discussed in a previous thread, I'm not sure we should have this in its current form: (i) It adds and entry per config to network connections which will be a nuisance for users who have far too many configs (there are some users with 100's of config files) -- so we at least need an option to enable/disable this. (ii) This only supports connect, not disconnect and the entry does not show whether its connected or not -- so this is a feature of very dubious utility. (iii) Communicating with the GUI using COPYDATA message (we support connect, disconnect, status etc.) should be preferred over hard-coding IDM_CONNECTMENU. Selva -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [PATCH] [openvpn-gui] Update system tray to populate Windows VPN flyout
>From ed96e2d91a0eb9ecdaab8d7104f397f7d77e5ced Mon Sep 17 00:00:00 2001 From: Kevin Kane Date: Fri, 13 Jul 2018 09:50:00 -0700 Subject: Update system tray to populate Windows VPN flyout Add a DLL to be wired in as a custom dialer, which introduces new build dependencies Add copyright notices as required where Microsoft has contributed code Signed-off-by: Kevin Kane --- .gitignore | 3 + BUILD.rst| 1 + Makefile.am | 10 ++- configure.ac | 4 ++ dialer.c | 171 +++ tray.c | 117 +++ tray.h | 2 + 7 files changed, 307 insertions(+), 1 deletion(-) create mode 100644 dialer.c diff --git a/.gitignore b/.gitignore index ac37772..e36e0a6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ *.log *.tar.gz *.bak +*.lo +*.la .deps Makefile @@ -30,3 +32,4 @@ depcomp stamp-h1 install-sh missing +libtool diff --git a/BUILD.rst b/BUILD.rst index 9354784..3c70b52 100644 --- a/BUILD.rst +++ b/BUILD.rst @@ -24,6 +24,7 @@ their dependencies. You can install these packages using the standard - mingw64-x86_64-gcc-core - mingw64-x86_64-g++ - mingw64-x86_64-openssl +- libtool Build diff --git a/Makefile.am b/Makefile.am index 8301087..d8435ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ # # Copyright (C) 2004 Mathias Sundman #2010 Heiko Hund +# Portions Copyright (C) 2018 Microsoft Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,6 +23,7 @@ RCCOMPILE = $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) AUTOMAKE_OPTIONS = foreign 1.9 +ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = \ config.log config.status \ @@ -106,7 +108,13 @@ openvpn_gui_LDADD = \ -lnetapi32 \ -lole32 \ -lshlwapi \ - -lsecur32 + -lsecur32 \ + -lrasapi32 openvpn-gui-res.o: $(openvpn_gui_RESOURCES) $(srcdir)/openvpn-gui-res.h $(RCCOMPILE) -i $< -o $@ + +lib_LTLIBRARIES = libopenvpndialer.la +libopenvpndialer_la_SOURCES = dialer.c +libopenvpndialer_la_LDFLAGS = -no-undefined +libopenvpndialer_la_LIBADD = -lrasapi32 \ No newline at end of file diff --git a/configure.ac b/configure.ac index 9a2ba75..4fe6b81 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ dnl OpenVPN-GUI -- A Windows GUI for OpenVPN. dnl dnl Copyright (C) 2004 Mathias Sundman dnl2010 Heiko Hund +dnl Portions Copyright (C) 2018 Microsoft Corporation dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -29,10 +30,13 @@ AC_DEFINE([CORE_COPYRIGHT_YEAR_END], ["2018"], [Last copyright year for daemon i AC_CONFIG_AUX_DIR([.]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([main.h]) +AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC_C99 +LT_INIT([win32-dll]) +AC_LIBTOOL_WIN32_DLL AC_CHECK_TOOL([WINDRES], [windres]) AC_ARG_ENABLE( diff --git a/dialer.c b/dialer.c new file mode 100644 index 000..86a0f39 --- /dev/null +++ b/dialer.c @@ -0,0 +1,171 @@ +/* + * OpenVPN-GUI -- A Windows GUI for OpenVPN. + * + * Copyright (C) 2018 Microsoft Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +__declspec(dllexport) +DWORD WINAPI RasCustomDial( +HINSTANCE hInstDll __attribute__((unused)), +LPRASDIALEXTENSIONS lpRasDialExtensions __attribute__((unused)), +LPWSTR lpszPhonebook __attribute__((unused)), +LPRASDIALPARAMSW lpRasDialParams __attribute__((unused)), +DWORD dwNotifierType __attribute__((unused)), +LPVOID lpvNotifier __attribute__((unused)), +LPHRASCONN lphRasConn __attribute__((unused)), +DWORD dwFlags __attribute__((unused))) +{ +return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* Copied from OpenVPN-GUI main.c */ +static const TCHAR OpenVPNGuiClassName[] = _T("OpenVPN-GUI"); + +/* Copied from OpenVPN-GUI t