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 3e58dd0..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.12 2000/05/21 22:21:38 guus 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)) {
@@ -90,10 +91,6 @@ sub vpn_load {
        warn "tinc: Invalid argument to VpnMask\n";
        return 0;
     }
-    if(!defined($VPNMASK)) {
-        warn "tinc: No VpnMask specified. Using default 255.255.0.0\n";
-        $VPNMASK="255.255.0.0";
-    }
 
     $ADR = $VPN;
     $ADR =~ s/^([^\/]+)\/.*$/$1/;
@@ -109,12 +106,14 @@ sub vpn_load {
     $MSK = pack('N4', -1 << (32 - $LEN));
     $BRD = join(".", unpack('C4', $ADR | ~$MSK));
     $MAC = "fe:fd:" . join(":", map { sprintf "%02x", $_ } unpack('C4', $ADR));
-    $VPNMASK = pack('C4', split(/\./, $VPNMASK));
-    $VPNMASK = join(".", unpack('C4', $VPNMASK));
+
+    if(!defined($VPNMASK)) {
+       $VPNMASK = $MSK;
+       $VPNMASK = join(".", unpack('C4', $VPNMASK));
+    }
     $ADR = join(".", unpack('C4', $ADR));
     $MSK = join(".", unpack('C4', $MSK));
     
-
     1;
 }
 
@@ -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");
 }