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 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. Okay, I think my preferred "story-line" of patches would look something like this? 1. Factoring out common utility functions for code reuse 2. Adding HTTPS-only support for GlobalProtect (because it basically *doesn't touch common functions at all*) 3. Adding ESP support for GlobalProtect (adds a bunch of GP-specific functions to esp.c, and also makes those subtle tweaks to the common dtls_state model) 4. Protocol enumeration and form-handling patches for NetworkManager plugin (5. Juniper oncp_bye can be kept entirely separate.) Does this seem like a reasonable way to restructure things into a series of 4 big patches? -Dan