From: Daniel Lenski <dlenski@gmail.com>
Date: Fri, 12 Feb 2021 01:37:47 +0000 (-0800)
Subject: Remove attempt_period from protocol-specific udp_setup() functions
X-Git-Tag: v8.20~294
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=950bdf0f2cd1214e092e7f093550f6f0c03ccc0f;p=users%2Fdwmw2%2Fopenconnect.git

Remove attempt_period from protocol-specific udp_setup() functions

All protocols just plunk it into vpninfo->dtls_attempt_period. Let's
just do that in the library wrapper function.

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

diff --git a/dtls.c b/dtls.c
index 0626dcaf..3381de54 100644
--- a/dtls.c
+++ b/dtls.c
@@ -183,7 +183,7 @@ static int dtls_reconnect(struct openconnect_info *vpninfo)
 	return connect_dtls_socket(vpninfo);
 }
 
-int dtls_setup(struct openconnect_info *vpninfo, int dtls_attempt_period)
+int dtls_setup(struct openconnect_info *vpninfo)
 {
 	struct oc_vpn_option *dtls_opt = vpninfo->dtls_options;
 	int dtls_port = 0;
@@ -191,8 +191,7 @@ int dtls_setup(struct openconnect_info *vpninfo, int dtls_attempt_period)
 	if (vpninfo->dtls_state == DTLS_DISABLED)
 		return -EINVAL;
 
-	vpninfo->dtls_attempt_period = dtls_attempt_period;
-	if (!dtls_attempt_period)
+	if (!vpninfo->dtls_attempt_period)
 		return 0;
 
 	while (dtls_opt) {
diff --git a/esp.c b/esp.c
index 385110c1..630e8a70 100644
--- a/esp.c
+++ b/esp.c
@@ -74,7 +74,7 @@ int print_esp_keys(struct openconnect_info *vpninfo, const char *name, struct es
 	return 0;
 }
 
-int esp_setup(struct openconnect_info *vpninfo, int dtls_attempt_period)
+int esp_setup(struct openconnect_info *vpninfo)
 {
 	if (vpninfo->dtls_state == DTLS_DISABLED ||
 	    vpninfo->dtls_state == DTLS_NOSECRET)
@@ -83,9 +83,7 @@ int esp_setup(struct openconnect_info *vpninfo, int dtls_attempt_period)
 	if (vpninfo->esp_ssl_fallback)
 		vpninfo->dtls_times.dpd = vpninfo->esp_ssl_fallback;
 	else
-		vpninfo->dtls_times.dpd = dtls_attempt_period;
-
-	vpninfo->dtls_attempt_period = dtls_attempt_period;
+		vpninfo->dtls_times.dpd = vpninfo->dtls_attempt_period;
 
 	print_esp_keys(vpninfo, _("incoming"), &vpninfo->esp_in[vpninfo->current_esp_in]);
 	print_esp_keys(vpninfo, _("outgoing"), &vpninfo->esp_out);
diff --git a/gnutls-dtls.c b/gnutls-dtls.c
index c6c716e4..2aa7fd77 100644
--- a/gnutls-dtls.c
+++ b/gnutls-dtls.c
@@ -467,7 +467,7 @@ int dtls_try_handshake(struct openconnect_info *vpninfo)
 			}
 		}
 
-		vpninfo->dtls_times.last_rekey = vpninfo->dtls_times.last_rx = 
+		vpninfo->dtls_times.last_rekey = vpninfo->dtls_times.last_rx =
 			vpninfo->dtls_times.last_tx = time(NULL);
 
 		dtls_detect_mtu(vpninfo);
diff --git a/gpst.c b/gpst.c
index 4e53023a..64b24c04 100644
--- a/gpst.c
+++ b/gpst.c
@@ -1282,7 +1282,7 @@ int gpst_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable)
 			return ret;
 		}
 		if (vpninfo->proto->udp_setup)
-			vpninfo->proto->udp_setup(vpninfo, vpninfo->dtls_attempt_period);
+			vpninfo->proto->udp_setup(vpninfo);
 		return 1;
 
 	case KA_KEEPALIVE:
diff --git a/library.c b/library.c
index fd499207..e7cf1991 100644
--- a/library.c
+++ b/library.c
@@ -320,8 +320,9 @@ int openconnect_setup_dtls(struct openconnect_info *vpninfo,
 			   int attempt_period)
 
 {
+	vpninfo->dtls_attempt_period = attempt_period;
 	if (vpninfo->proto->udp_setup)
-		return vpninfo->proto->udp_setup(vpninfo, attempt_period);
+		return vpninfo->proto->udp_setup(vpninfo);
 
 	vpn_progress(vpninfo, PRG_ERR,
 		     _("Built against SSL library with no Cisco DTLS support\n"));
diff --git a/openconnect-internal.h b/openconnect-internal.h
index ca77770a..e3a8a758 100644
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -324,7 +324,7 @@ struct vpn_proto {
 	void (*add_http_headers)(struct openconnect_info *vpninfo, struct oc_text_buf *buf);
 
 	/* Set up the UDP (DTLS) connection. Doesn't actually *start* it. */
-	int (*udp_setup)(struct openconnect_info *vpninfo, int attempt_period);
+	int (*udp_setup)(struct openconnect_info *vpninfo);
 
 	/* This will actually complete the UDP connection setup/handshake on the wire,
 	   as well as transporting packets */
@@ -956,7 +956,7 @@ void *establish_eap_ttls(struct openconnect_info *vpninfo);
 void destroy_eap_ttls(struct openconnect_info *vpninfo, void *sess);
 
 /* dtls.c */
-int dtls_setup(struct openconnect_info *vpninfo, int dtls_attempt_period);
+int dtls_setup(struct openconnect_info *vpninfo);
 int udp_tos_update(struct openconnect_info *vpninfo, struct pkt *pkt);
 int dtls_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable);
 void dtls_close(struct openconnect_info *vpninfo);
@@ -1106,7 +1106,7 @@ int load_pkcs11_certificate(struct openconnect_info *vpninfo);
 /* esp.c */
 int verify_packet_seqno(struct openconnect_info *vpninfo,
 			struct esp *esp, uint32_t seq);
-int esp_setup(struct openconnect_info *vpninfo, int dtls_attempt_period);
+int esp_setup(struct openconnect_info *vpninfo);
 int esp_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable);
 void esp_close(struct openconnect_info *vpninfo);
 void esp_shutdown(struct openconnect_info *vpninfo);