From: David Sommerseth Date: Thu, 24 Nov 2011 21:45:21 +0000 (+0100) Subject: Fix bug after removing Linux 2.2 support X-Git-Tag: v2.3-alpha1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7d1ac82f9a21ef91030e4f104d4ef0810b07f8e;p=thirdparty%2Fopenvpn.git Fix bug after removing Linux 2.2 support In commit ce637abdafdc19547fc97192033a4d1703ecaf23 the Linux 2.2 support was removed. When this happened an extra error check was avoided which would normally kicked in if the tun/tap device would not be available. Instead the following line was filling the log continously: Thu Nov 24 22:33:15 2011 read from TUN/TAP : File descriptor in bad state (code=77) This patch changes the msg() declarations to use the M_FATAL *) flag, which will halt the execution of the program in these error sitauations. As the program will really halt, the return declarations was also removed. *) #define M_ERR (M_FATAL | M_ERRNO) (from error.h) Signed-off-by: David Sommerseth Acked-by: Gert Doering --- diff --git a/tun.c b/tun.c index 7a3b2e9df..d71d902e9 100644 --- a/tun.c +++ b/tun.c @@ -1397,8 +1397,7 @@ open_tun (const char *dev, const char *dev_type, const char *dev_node, struct tu */ if ((tt->fd = open (node, O_RDWR)) < 0) { - msg (M_WARN | M_ERRNO, "Note: Cannot open TUN/TAP dev %s", node); - return; + msg (M_ERR, "ERROR: Cannot open TUN/TAP dev %s", node); } /* @@ -1441,8 +1440,7 @@ open_tun (const char *dev, const char *dev_type, const char *dev_node, struct tu */ if (ioctl (tt->fd, TUNSETIFF, (void *) &ifr) < 0) { - msg (M_WARN | M_ERRNO, "Note: Cannot ioctl TUNSETIFF %s", dev); - return; + msg (M_ERR, "ERROR: Cannot ioctl TUNSETIFF %s", dev); } msg (M_INFO, "TUN/TAP device %s opened", ifr.ifr_name);