From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 18 Apr 2022 19:55:17 +0000 (+0100)
Subject: Merge branch 'cpvpn' of gitlab.com:cpvpn/openconnect
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fcpvpn;p=users%2Fdwmw2%2Fopenconnect.git

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

993e34baadde223b7cbb0f8041b74e477a2fc84d
diff --cc openconnect-internal.h
index fb2ed2dd,8ffc47e7..cc371a60
--- a/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 www/Makefile.am
index ca4f4f26,4d3a020e..52c9c636
--- a/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)