Merge branch 'check_address_sanity' into f5

diff --cc Makefile.am
index 7e73364213ebae20b63c472d19c9552b9804f624,d519f848888747c1458ea13e50b0f6ebf9bbf8ba..9a247a10adcf39da7ecaf9289c8aabd8fb1e8eb3
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -27,16 -27,11 +27,16 @@@ openconnect_LDADD = libopenconnect.la $
  if OPENCONNECT_WIN32
  openconnect_SOURCES += openconnect.rc
  endif
 -library_srcs = ssl.c http.c http-auth.c auth-common.c library.c compat.c lzs.c mainloop.c script.c ntlm.c digest.c openconnect-internal.h
 +library_srcs = ssl.c http.c http-auth.c auth-common.c library.c compat.c lzs.c mainloop.c script.c ntlm.c digest.c mtucalc.c openconnect-internal.h
  lib_srcs_cisco = auth.c cstp.c
  lib_srcs_juniper = oncp.c lzo.c auth-juniper.c
 +lib_srcs_nx = nx.c
  lib_srcs_pulse = pulse.c
- lib_srcs_globalprotect = gpst.c auth-globalprotect.c
 +lib_srcs_nullppp = nullppp.c
 +lib_srcs_f5 = f5.c
 +lib_srcs_ppp = ppp.c ppp.h
 +lib_srcs_fortinet = fortinet.c
+ lib_srcs_globalprotect = gpst.c win32-ipicmp.h auth-globalprotect.c
  lib_srcs_oath = oath.c
  lib_srcs_oidc = oidc.c
  

diff --cc cstp.c
Simple merge

diff --cc gpst.c
Simple merge

diff --cc library.c
Simple merge

diff --cc oncp.c
Simple merge

diff --cc openconnect-internal.h
index 0d1e8517cfc976cc93e5a8b5b272b7e26facc96a,9ff851506ea857a6c200cfe44239b3fd1a081b39..432f526f7250611d7171ba6112e64dd1ddd627d1
--- 1/openconnect-internal.h
--- 2/openconnect-internal.h
+++ b/openconnect-internal.h
@@@ -910,11 -891,8 +910,12 @@@ int openconnect_dtls_write(struct openc
  char *openconnect_bin2hex(const char *prefix, const uint8_t *data, unsigned len);
  char *openconnect_bin2base64(const char *prefix, const uint8_t *data, unsigned len);
  
 +/* mtucalc.c */
 +
 +int calculate_mtu(struct openconnect_info *vpninfo, int is_udp, int unpadded_overhead, int padded_overhead, int block_size);
 +
  /* cstp.c */
+ int check_address_sanity(struct openconnect_info *vpninfo, const char *old_addr, const char *old_netmask, const char *old_addr6, const char *old_netmask6);
  void cstp_common_headers(struct openconnect_info *vpninfo, struct oc_text_buf *buf);
  int cstp_connect(struct openconnect_info *vpninfo);
  int cstp_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable);

diff --cc pulse.c
Simple merge