X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=debian%2Finit.d;h=62c9de35a497c3dff7c14f41ab14f8ca93f09560;hp=bb27b141e2f0841070b6879ebac903ada62d8a27;hb=56d8e862409ae91c63a27968b01a48a94aafb205;hpb=01352f4c525862f05988ed8687f26210c5ba10a2

diff --git a/debian/init.d b/debian/init.d
index bb27b141..62c9de35 100644
--- 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.8 2000/05/19 00:15:37 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)) {
@@ -90,6 +91,7 @@ sub vpn_load {
 	warn "tinc: Invalid argument to VpnMask\n";
 	return 0;
     }
+
     $ADR = $VPN;
     $ADR =~ s/^([^\/]+)\/.*$/$1/;
     $LEN = $VPN;
@@ -103,13 +105,15 @@ sub vpn_load {
     $ADR = pack('C4', @addr);
     $MSK = pack('N4', -1 << (32 - $LEN));
     $BRD = join(".", unpack('C4', $ADR | ~$MSK));
-#    $NET = join(".", unpack('C4', $ADR & $MSK));
     $MAC = "fe:fd:" . join(":", map { sprintf "%02x", $_ } unpack('C4', $ADR));
+
+    if(!defined($VPNMASK)) {
+	$VPNMASK = $MSK;
+	$VPNMASK = join(".", unpack('C4', $VPNMASK));
+    }
     $ADR = join(".", unpack('C4', $ADR));
     $MSK = join(".", unpack('C4', $MSK));
     
-#    print "$DEV $VPN $NUM $LEN @addr $MAC $MASK $BRD $NET\n";
-
     1;
 }
 
@@ -124,11 +128,8 @@ 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 $MSK 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");
-    if(defined($VPNMASK)) {
-	system("route add -net $ADR netmask $VPNMASK dev $DEV");
-    }
 }