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;
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) {
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)
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);
}
}
- 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);
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:
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"));
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 */
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);
/* 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);