From: Daniel Lenski <dlenski@gmail.com>
Date: Sat, 16 May 2020 00:54:41 +0000 (-0700)
Subject: fix logging of unknown TLV lengths, and copy-paste mistake
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26f14cf079e3fdec43b8e17097cf2c07cb3f67cb;p=users%2Fdwmw2%2Fopenconnect.git

fix logging of unknown TLV lengths, and copy-paste mistake

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/ppp.c b/ppp.c
index 6bcb8a06..ff28d4c5 100644
--- a/ppp.c
+++ b/ppp.c
@@ -374,7 +374,7 @@ static int handle_config_request(struct openconnect_info *vpninfo,
 		unknown:
 			vpn_progress(vpninfo, PRG_DEBUG,
 				     _("Received unknown proto 0x%04x TLV (tag %d, len %d+2) from server:\n"),
-				     proto, t, l);
+				     proto, t, l-2);
 			dump_buf_hex(vpninfo, PRG_DEBUG, '<', p, (int)p[1]);
 		reject:
 			if (!rejbuf)
@@ -530,13 +530,13 @@ static int handle_config_reject(struct openconnect_info *vpninfo,
 			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 |= BIT_ACCOMP;
+				     _("Server reject LCP ACCOMP option\n"));
+			ppp->in_lcp_opts &= ~BIT_ACCOMP;
 			break;
 		default:
 			vpn_progress(vpninfo, PRG_DEBUG,
 				     _("Server rejected unknown proto 0x%04x TLV (tag %d, len %d+2)\n"),
-				     proto, t, l);
+				     proto, t, l-2);
 			dump_buf_hex(vpninfo, PRG_DEBUG, '<', p, (int)p[1]);
 			/* XX: Should abort negotiation */
 			return -EINVAL;