Fixed last typo. Init.d now uses ifconfig command to set both the tap's IP

[tinc] / debian / init.d

diff --git a/debian/init.d b/debian/init.d
index c054ccb..3e58dd0 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.7 2000/05/18 23:09:31 zarq Exp $
+# $Id: init.d,v 1.12 2000/05/21 22:21:38 guus Exp $
 #
 # Based on Lubomir Bulej's Redhat init script.
 #
@@ -25,7 +25,10 @@ if (! -f $DAEMON) { exit 0; }
 
 
 sub find_nets {
-    open(FH, $NETSFILE) || die "Please create $NETSFILE.\n";
+    if(! open(FH, $NETSFILE)) {
+       warn "Please create $NETSFILE.\n";
+       exit 0;
+    }
     while (<FH>) {
        chomp;
        if( /^[ ]*([^ \#]+)/i ) {
@@ -33,7 +36,8 @@ sub find_nets {
        }
     }
     if($#NETS == -1) {
-       die "$NETSFILE doesn't contain any nets.\n";
+       warn "$NETSFILE doesn't contain any nets.\n";
+       exit 0;
     }
     
 }
@@ -86,6 +90,11 @@ 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/;
     $LEN = $VPN;
@@ -99,12 +108,12 @@ 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));
+    $VPNMASK = pack('C4', split(/\./, $VPNMASK));
+    $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;
 }
@@ -120,11 +129,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 -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");
-    }
 }