Include linux/sockios.h and net/if.h anyway, regardless of the value of HAVE_TUNTAP.

[tinc] / debian / init.d

diff --git a/debian/init.d b/debian/init.d
index 3e2a664..62c9de3 100644 (file)
--- a/debian/init.d
+++ b/debian/init.d
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 #
 # System startup script for tinc
-# $Id: init.d,v 1.13 2000/05/21 22:27:31 zarq Exp $
+# $Id: init.d,v 1.14.2.2 2000/08/20 23:08:17 zarq Exp $
 #
 # Based on Lubomir Bulej's Redhat init script.
 #
@@ -68,6 +68,7 @@ sub vpn_load {
            chomp($VPN);
        } elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) {
            $VPNMASK=$1;
+           chomp($VPNMASK);
        }
     }
     if(!defined($DEV)) {
@@ -108,10 +109,8 @@ sub vpn_load {
 
     if(!defined($VPNMASK)) {
        $VPNMASK = $MSK;
+       $VPNMASK = join(".", unpack('C4', $VPNMASK));
     }
-    
-    $VPNMASK = pack('C4', split(/\./, $VPNMASK));
-    $VPNMASK = join(".", unpack('C4', $VPNMASK));
     $ADR = join(".", unpack('C4', $ADR));
     $MSK = join(".", unpack('C4', $MSK));
     
@@ -129,7 +128,7 @@ sub vpn_start {
 
     system("insmod ethertap -s --name=\"ethertap$NUM\" unit=\"$NUM\" >/dev/null");
     system("ifconfig $DEV hw ether $MAC");
-    system("ifconfig $DEV $ADR netmask $VPNMASK broadcast $BRD -arp");
+    system("ifconfig $DEV $ADR netmask $VPNMASK broadcast $BRD mtu 1448 -arp");
     system("start-stop-daemon --start --quiet --pidfile /var/run/$NAME.$_[0].pid --exec $DAEMON -- -n $_[0] $EXTRA");
 }