Use LCP protocol code values for feature bitmask

In preparation for handling ConfRej

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/ppp.c b/ppp.c
index 609277eed702d286fe0b696e8f8bf091964c88d4..b3ee22f5094e7336d97f40d7301ea110ea931591 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -187,13 +187,22 @@ struct oc_ppp *openconnect_ppp_new(int encap, int want_ipv4, int want_ipv6)
                break;
 
        default:
-               /* XX: fail */
-               break;
+               free(ppp);
+               return NULL;
        }
 
        ppp->want_ipv4 = want_ipv4;
        ppp->want_ipv6 = want_ipv6;
        ppp->exp_ppp_hdr_size = 4; /* Address(1), Control(1), Proto(2) */
+
+       ppp->out_asyncmap = 0;
+       ppp->out_lcp_opts = BIT_MRU | BIT_ASYNCMAP | BIT_MAGIC | BIT_PFCOMP | BIT_ACCOMP;
+
+       if (openconnect_random(&ppp->out_lcp_magic, sizeof(ppp->out_lcp_magic))) {
+               free(ppp);
+               return NULL;
+       }
+
        return ppp;
 }
 
@@ -300,12 +309,12 @@ static int handle_config_request(struct openconnect_info *vpninfo,
                case PROTO_TAG_LEN(PPP_LCP, LCP_PFCOMP, 0):
                        vpn_progress(vpninfo, PRG_DEBUG,
                                     _("Received protocol field compression from server\n"));
-                       ppp->in_lcp_opts |= PFCOMP;
+                       ppp->in_lcp_opts |= BIT_PFCOMP;
                        break;
                case PROTO_TAG_LEN(PPP_LCP, LCP_ACCOMP, 0):
                        vpn_progress(vpninfo, PRG_DEBUG,
                                     _("Received address and control field compression from server\n"));
-                       ppp->in_lcp_opts |= ACCOMP;
+                       ppp->in_lcp_opts |= BIT_ACCOMP;
                        break;
                case PROTO_TAG_LEN(PPP_IPCP, IPCP_IPADDRS, 8):
                        /* XX: Ancient and deprecated. We're supposed to ignore it if we receive it, unless
@@ -393,18 +402,22 @@ static int queue_config_request(struct openconnect_info *vpninfo, int proto)
        switch (proto) {
        case PPP_LCP:
                ncp = &ppp->lcp;
-               ppp->out_asyncmap = 0;
-               ppp->out_lcp_magic = ~ppp->in_lcp_magic;
-               ppp->out_lcp_opts = ACCOMP | PFCOMP;
                if (!vpninfo->ip_info.mtu)
                        vpninfo->ip_info.mtu = 1300; /* FIXME */
 
-               buf_append_ppp_tlv_be16(buf, LCP_MRU, vpninfo->ip_info.mtu);
-               buf_append_ppp_tlv_be32(buf, LCP_ASYNCMAP, ppp->out_asyncmap);
-               buf_append_ppp_tlv(buf, LCP_MAGIC, 4, &ppp->out_lcp_magic);
-               if (ppp->out_lcp_opts & PFCOMP)
+               if (ppp->out_lcp_opts & BIT_MRU)
+                       buf_append_ppp_tlv_be16(buf, LCP_MRU, vpninfo->ip_info.mtu);
+
+               if (ppp->out_lcp_opts & BIT_ASYNCMAP)
+                       buf_append_ppp_tlv_be32(buf, LCP_ASYNCMAP, ppp->out_asyncmap);
+
+               if (ppp->out_lcp_opts & BIT_MAGIC)
+                       buf_append_ppp_tlv(buf, LCP_MAGIC, 4, &ppp->out_lcp_magic);
+
+               if (ppp->out_lcp_opts & BIT_PFCOMP)
                        buf_append_ppp_tlv(buf, LCP_PFCOMP, 0, NULL);
-               if (ppp->out_lcp_opts & ACCOMP)
+
+               if (ppp->out_lcp_opts & BIT_ACCOMP)
                        buf_append_ppp_tlv(buf, LCP_ACCOMP, 0, NULL);
                break;
 
@@ -848,9 +861,9 @@ int ppp_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable)
 
                /* XX: store PPP header, in reverse */
                this->data[--n] = proto & 0xff;
-               if (proto > 0xff || !(ppp->out_lcp_opts & PFCOMP))
+               if (proto > 0xff || !(ppp->out_lcp_opts & BIT_PFCOMP))
                        this->data[--n] = proto >> 8;
-               if (proto == PPP_LCP || !(ppp->out_lcp_opts & ACCOMP)) {
+               if (proto == PPP_LCP || !(ppp->out_lcp_opts & BIT_ACCOMP)) {
                        this->data[--n] = 0x03; /* Control */
                        this->data[--n] = 0xff; /* Address */
                }

diff --git a/ppp.h b/ppp.h
index a63ebb59870b69d6999d9886995a5d61a2059b2d..177a8719037877cc8ca2fc1639edc7ad7e7a51a7 100644 (file)
--- a/ppp.h
+++ b/ppp.h
@@ -43,11 +43,6 @@
 #define PPPGOODFCS16    0xf0b8  /* Good final FCS value */
 #define ASYNCMAP_LCP 0xffffffffUL /* When sending LCP, always escape characters < 0x20 */
 
-/* Negotiable options (our own values, not wire protocol) */
-#define ACCOMP 1               /* https://tools.ietf.org/html/rfc1661#section-6.6 */
-#define PFCOMP 2               /* https://tools.ietf.org/html/rfc1661#section-6.5 */
-#define VJCOMP 4               /* https://tools.ietf.org/html/rfc1332#section-4 */
-
 /* PPP states (https://tools.ietf.org/html/rfc1661#section-3.2) */
 #define PPPS_DEAD              0
 #define PPPS_ESTABLISH         1
@@ -73,6 +68,12 @@
 #define LCP_PFCOMP             7
 #define LCP_ACCOMP             8
 
+#define BIT_MRU                (1 << LCP_MRU)
+#define BIT_ASYNCMAP   (1 << LCP_ASYNCMAP)
+#define BIT_MAGIC      (1 << LCP_MAGIC)
+#define BIT_PFCOMP     (1 << LCP_PFCOMP)
+#define BIT_ACCOMP     (1 << LCP_ACCOMP)
+
 /* RFC1332 */
 #define IPCP_IPADDRS           1
 #define IPCP_IPCOMP            2