Add 'attempt-reconnect' vpnc-script reason

In https://gitlab.com/openconnect/openconnect/issues/17 we think we need
to give the vpnc-script a chance to reinstate the host route to the VPN
server before we can reconnect.

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

diff --git a/ssl.c b/ssl.c
index 29250a09bb6d89f30a3da91632db388fe36ebd79..eb32f38011eccf7379337f8a62892b1dd6ab651e 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -1012,7 +1012,12 @@ int ssl_reconnect(struct openconnect_info *vpninfo)
        free(vpninfo->tun_pkt);
        vpninfo->tun_pkt = NULL;
 
-       while ((ret = vpninfo->proto->tcp_connect(vpninfo))) {
+       while (1) {
+               script_config_tun(vpninfo, "attempt-reconnect");
+               ret = vpninfo->proto->tcp_connect(vpninfo);
+               if (!ret)
+                       break;
+
                if (timeout <= 0)
                        return ret;
                if (ret == -EPERM) {

diff --git a/www/changelog.xml b/www/changelog.xml
index 2b57db93e4291ed495b51fb021f3a9125c48457c..2ae897388602e974df98d0a148fc6ceea8593cc5 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -21,6 +21,7 @@
        <li>Fix GnuTLS builds without libtasn1.</li>
        <li>Fix DTLS support with OpenSSL 1.1.1+.</li>
        <li>Add Cisco-compatible DTLSv1.2 support.</li>
+       <li>Invoke script with <tt>reason=attempt-reconnect</tt> before doing so.</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-8.01.tar.gz">OpenConnect v8.01</a></b>