With recent kernels the tun device file is located in /dev/net.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index c3f89ca..33416b3 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.105 2001/05/07 19:08:43 guus Exp $
+    $Id: net.c,v 1.35.4.107 2001/05/25 10:08:11 guus Exp $
 */
 
 #include "config.h"
@@ -285,7 +285,7 @@ cp
    {
 #ifdef HAVE_LINUX
 # ifdef HAVE_TUNTAP
-      tapfname = "/dev/misc/net/tun";
+      tapfname = "/dev/net/tun";
 # else
       tapfname = "/dev/tap0";
 # endif
@@ -848,11 +848,13 @@ cp
   cfg = get_config_val(upstreamcfg, config_connectto);
 
   if(!cfg)
-    if(upstreamcfg == config)
     {
-      /* No upstream IP given, we're listen only. */
-      signal(SIGALRM, SIG_IGN);
-      return;
+      if(upstreamcfg == config)
+      {
+        /* No upstream IP given, we're listen only. */
+        signal(SIGALRM, SIG_IGN);
+        return;
+      }
     }
   else
     {
@@ -1075,6 +1077,8 @@ cp
       return;
     }
 
+  cl->last_ping_time = time(NULL);
+
   receive_udppacket(cl, &pkt);
 cp
 }
@@ -1147,7 +1151,7 @@ cp
       syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
     }
 
-  /* Inactivate */
+  /* Deactivate */
 
   cl->status.active = 0;
 cp