Merge branch 'cpvpn' of gitlab.com:cpvpn/openconnect

diff --cc Makefile.am
Simple merge

diff --cc library.c
Simple merge

diff --cc openconnect-internal.h
index fb2ed2dd790b8b001fe860ff5ea83ed67d683116,8ffc47e7babacef570cd1a7ed709434ff7507770..cc371a6071586e7ea528ba71b52270ff60910b08
--- 1/openconnect-internal.h
--- 2/openconnect-internal.h
+++ b/openconnect-internal.h
@@@ -216,12 -177,10 +216,16 @@@ struct pkt 
                        uint16_t proto;
                        unsigned char hdr[18];
                } ppp;
 +#ifdef HAVE_VHOST
 +              struct {
 +                      unsigned char pad[12];
 +                      struct virtio_net_hdr_mrg_rxbuf h;
 +              } virtio;
 +#endif
+               struct {
+                       unsigned char pad[16];
+                       unsigned char hdr[8];
+               } cpsnx;
        };
        unsigned char data[];
  };

diff --cc openconnect.8.in
Simple merge

diff --cc www/Makefile.am
index ca4f4f26fb459720ae3818911475325f0c729faa,4d3a020ef7aa8e164633c215eeccc4fbd402913a..52c9c6369657d5d76eefc96dc02f8873c021c51a
--- 1/www/Makefile.am
--- 2/www/Makefile.am
+++ b/www/Makefile.am
@@@ -6,11 -6,10 +6,11 @@@ CONV  = "$(srcdir)/html.py
  FTR_PAGES = csd.html charset.html token.html pkcs11.html tpm.html features.html gui.html nonroot.html hip.html tncc.html
  START_PAGES = building.html connecting.html manual.html vpnc-script.html
  INDEX_PAGES = changelog.html download.html index.html packages.html platforms.html licence.html
- PROTO_PAGES = protocols.html anyconnect.html array.html fortinet.html f5.html globalprotect.html juniper.html pulse.html
+ PROTO_PAGES = protocols.html anyconnect.html array.html fortinet.html f5.html globalprotect.html juniper.html pulse.html cp.html
 -TOPLEVEL_PAGES = contribute.html mail.html
 +CONTR_PAGES = contribute.html mitm.html
 +TOPLEVEL_PAGES = mail.html
  
 -ALL_PAGES = $(FTR_PAGES) $(START_PAGES) $(INDEX_PAGES) $(TOPLEVEL_PAGES) $(PROTO_PAGES)
 +ALL_PAGES = $(FTR_PAGES) $(START_PAGES) $(INDEX_PAGES) $(TOPLEVEL_PAGES) $(PROTO_PAGES) $(CONTR_PAGES)
  
  html_DATA = $(ALL_PAGES)