Merge branch 'nx' of https://gitlab.com/Rondom/openconnect into f5

diff --cc ppp.c
index 1f225dcff10cfdbd09b93bbbff1c8d1da83a937e,f2a3342a1197e0a469dd716f2ff60f505567de72..d470072b49df1099f7878868b43142f5aa050eb4
--- 1/ppp.c
--- 2/ppp.c
+++ b/ppp.c
@@@ -156,36 -156,16 +156,37 @@@ static int unhdlc_in_place(struct openc
        }
  }
  
 -static const char *ppps_names[] = { "DEAD", "ESTABLISH", "OPENED", "AUTHENTICATE", "NETWORK", "TERMINATE" };
 -static const char *encap_names[PPP_ENCAP_MAX+1] = { NULL,
 -                         "F5", "F5 HDLC", "FORTINET HDLC", "NX HDLC" };
 -static const char *lcp_names[] = { NULL,
 -                         "Configure-Request", "Configure-Ack",
 -                         "Configure-Nak", "Configure-Reject",
 -                         "Terminate-Request", "Terminate-Ack",
 -                         "Code-Reject", "Protocol-Reject",
 -                         "Echo-Request", "Echo-Reply",
 -                         "Discard-Request" };
 +static const char *ppps_names[] = {
 +      "DEAD",
 +      "ESTABLISH",
 +      "OPENED",
 +      "AUTHENTICATE",
 +      "NETWORK",
 +      "TERMINATE"
 +};
 +
 +static const char *encap_names[PPP_ENCAP_MAX+1] = {
 +      NULL,
 +      "F5",
 +      "F5 HDLC",
 +      "FORTINET HDLC",
++      "NX HDLC",
 +};
 +
 +static const char *lcp_names[] = {
 +      NULL,
 +      "Configure-Request",
 +      "Configure-Ack",
 +      "Configure-Nak",
 +      "Configure-Reject",
 +      "Terminate-Request",
 +      "Terminate-Ack",
 +      "Code-Reject",
 +      "Protocol-Reject",
 +      "Echo-Request",
 +      "Echo-Reply",
 +      "Discard-Request",
 +};
  
  struct oc_ppp *openconnect_ppp_new(int encap, int want_ipv4, int want_ipv6)
  {