On Sun, May 14, 2017 at 5:05 PM, Daniel Lenski <dlenski at gmail.com> wrote: > On Sun, May 14, 2017 at 4:34 PM, David Woodhouse <dwmw2 at infradead.org> wrote: > > On Sun, 2017-05-14 at 16:28 -0700, Daniel Lenski <dlenski at gmail.com> wrote: > >> > >> I've been using this build of openconnect with *multiple* AnyConnect > >> and *multiple* Juniper VPNs for months, and they're all now working > >> fine. But if you want me to try to rearrange these to separate them > >> more cleanly, I can take a crack at it. > > > > Yes please. I'd love to see that cleaned up a little into a series of > > patches that tell a story and I can merge. I've pulled in some of it > > but only a start. As requested, I've restructured the remaining diffs from my GlobalProtect-supporting fork (https://github.com/dlenski/openconnect) into a more coherent story line of patches. I've verified that each patch along the way builds correctly and still connects to Juniper VPNs correctly (in the case of the patches that touch ESP). Daniel Lenski (8): factor out common dump_buf_hex() and free_optlist() utility functions add OC_FORM_OPT_FILL_{USERNAME,PASSWORD} flags to hint at purpose of a form field without requiring a specific name add PAN GlobalProtect protocol support (HTTPS tunnel only) tweak the dtls_state handling in preparation for supporting GlobalProtect ESP add vpn_proto member functions .udp_send_probes and .udp_catch_probe in preparation for supporting GlobalProtect ESP add new_keys argument to esp_setup_keys() in preparation for supporting GlobalProtect ESP Add support for GlobalProtect ESP tunnel when connecting to a GlobalProtect portal (not gateway), generate an xmlconfig so that NetworkManager can list all the gateway servers Makefile.am | 5 +- auth-globalprotect.c | 387 ++++++++++++++++++++++ cstp.c | 16 +- dtls.c | 1 + esp.c | 139 +++++++- gnutls-esp.c | 23 +- gpst.c | 858 ++++++++++++++++++++++++++++++++++++++++++++++++ http.c | 25 +- library.c | 23 +- main.c | 4 +- mainloop.c | 1 - oncp.c | 40 +-- openconnect-internal.h | 32 +- openconnect.8.in | 7 +- openconnect.h | 2 + openssl-esp.c | 23 +- www/Makefile.am | 2 +- www/globalprotect.xml | 75 +++++ www/mail.xml | 4 +- www/menu2-protocols.xml | 1 + 20 files changed, 1583 insertions(+), 85 deletions(-) create mode 100644 auth-globalprotect.c create mode 100644 gpst.c create mode 100644 www/globalprotect.xml -- 2.7.4
