we should still try to cleanly close the session if tun device creation fails

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

diff --git a/main.c b/main.c
index cc3dd91ee3328e38ef7dd0992670acf37f16933e..682afacf05a9a143fd5282f5e6a377ffc6abd83a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -2014,6 +2014,10 @@ int main(int argc, char **argv)
                vpn_progress(vpninfo, PRG_INFO, _("User detached from session (SIGHUP); exiting.\n"));
                ret = 0;
                break;
+       case -EIO:
+               vpn_progress(vpninfo, PRG_INFO, _("Unrecoverable I/O error; exiting.\n"));
+               ret = 0;
+               break;
        default:
                vpn_progress(vpninfo, PRG_ERR, _("Unknown error; exiting.\n"));
                ret = 1;

diff --git a/mainloop.c b/mainloop.c
index c158f63ab360303995258bde0a6c276825801b7c..c16ef00c7e039bb2b89b2e7a6a090960325f63e0 100644 (file)
--- a/mainloop.c
+++ b/mainloop.c
@@ -132,6 +132,8 @@ static int setup_tun_device(struct openconnect_info *vpninfo)
        ret = openconnect_setup_tun_device(vpninfo, vpninfo->vpnc_script, vpninfo->ifname);
        if (ret) {
                fprintf(stderr, _("Set up tun device failed\n"));
+               if (!vpninfo->quit_reason)
+                       vpninfo->quit_reason = "Set up tun device failed";
                return ret;
        }