VpnMask truely works now.

[tinc] / debian / init.d

diff --git a/debian/init.d b/debian/init.d
index d2b1497..612412e 100644 (file)
--- a/debian/init.d
+++ b/debian/init.d
@@ -1,7 +1,14 @@
 #! /usr/bin/perl -w
 #
 # System startup script for tinc
-# $Id: init.d,v 1.4 2000/05/15 09:41:34 guus Exp $
+# $Id: init.d,v 1.10 2000/05/21 22:04:56 guus Exp $
+#
+# Based on Lubomir Bulej's Redhat init script.
+#
+# Create a file $NETSFILE (/etc/tinc/nets.boot), and put all the names of
+# the networks in there.  These names must be valid directory names under
+# $TCONF (/etc/tinc).  Lines starting with a # will be ignored in this
+# file.
 #
 
 my $DAEMON="/usr/sbin/tincd";
@@ -9,24 +16,45 @@ my $NAME="tinc";
 my $DESC="tinc daemons";
 my $TCONF="/etc/tinc";
 my $EXTRA="";
+my $NETSFILE="$TCONF/nets.boot";
+my @NETS=();
 
-# $NETS is a space seperated list of all tinc networks.
-my $NETS="";
-
-if ("$NETS" eq "") { print "No tinc networks configured."; exit 0; }
 
 if (! -f $DAEMON) { exit 0; }
 
+
+
+sub find_nets {
+    if(! open(FH, $NETSFILE)) {
+       warn "Please create $NETSFILE.\n";
+       exit 0;
+    }
+    while (<FH>) {
+       chomp;
+       if( /^[ ]*([^ \#]+)/i ) {
+           push(@NETS, "$1");
+       }
+    }
+    if($#NETS == -1) {
+       warn "$NETSFILE doesn't contain any nets.\n";
+       exit 0;
+    }
+    
+}
+
+
 ##############################################################################
 # vpn_load ()          Loads VPN configuration
 # 
 # $_[0] ... VPN to load
 
-
 sub vpn_load {
     my @addr;
     $CFG="$TCONF/$_[0]/tinc.conf";
-    open($CFG, "< $CFG") || die "tinc: $CFG does not exist";
+    if(! open($CFG, "< $CFG")) {
+       warn "tinc: $CFG does not exist\n";
+       return 0;
+    }
 
     # load TINCD config
     while(<$CFG>) {
@@ -38,38 +66,54 @@ sub vpn_load {
        } elsif ( /^[ ]*(MyOwnVPNIP|MyVirtualIP)[ =]+([^ \#]+)/i ) {
            $VPN=$2;
            chomp($VPN);
+       } elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) {
+           $VPNMASK=$1;
        }
     }
     if(!defined($DEV)) {
-       die "tinc: There must be a TapDevice";
+       warn "tinc: There must be a TapDevice\n";
+       return 0;
     }
     if($DEV eq "") {
-       die "tinc: TapDevice should be of the form /dev/tapN";
+       warn "tinc: TapDevice should be of the form /dev/tapN\n";
+       return 0;
     }
     if(!defined($VPN)) {
-       die "tinc: MyVirtualIP required";
+       warn "tinc: MyVirtualIP required\n";
+       return 0;
     }
     if($VPN eq "") {
-       die "tinc: No argument to MyVirtualIP/MyOwnVPNIP";
+       warn "tinc: No argument to MyVirtualIP/MyOwnVPNIP\n";
+       return 0;
     }
+    if(defined($VPNMASK) && $VPNMASK eq "") {
+       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;
     $LEN =~ s/^.*\/([^\/]+)$/$1/;
     if($ADR eq "" || $LEN eq "") {
-       die "tinc: Badly formed MyVirtualIP/MyOwnVPNIP";
+       warn "tinc: Badly formed MyVirtualIP/MyOwnVPNIP\n";
+       return 0;
     }
     @addr = split(/\./, $ADR);
 
     $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;
 }
@@ -81,18 +125,11 @@ sub vpn_load {
 # $_[0] ... VPN to start
 
 sub vpn_start {
-    vpn_load($_[0]) || die "tinc: could not vpn_load $_[0]";
+    vpn_load($_[0]) || return 0;
 
-    if (! -c "/dev/$DEV") {
-       if (-e "/dev/$DEV") {
-           unlink("/dev/$DEV");
-       }
-       $num = $NUM + 16;
-        system("echo mknod --mode=0600 /dev/$DEV c 36 $num");
-    }
     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");
+    system("ifconfig $DEV $ADR netmask $MSK broadcast $BRD -arp");
     system("start-stop-daemon --start --quiet --pidfile /var/run/$NAME.$_[0].pid --exec $DAEMON -- -n $_[0] $EXTRA");
 }
 
@@ -102,7 +139,7 @@ sub vpn_start {
 ##############################################################################
 # vpn_stop ()          Stops specified VPN
 #
-# $1 ... VPN to stop
+# $_[0] ... VPN to stop
 
 sub vpn_stop {
     vpn_load($_[0]) || return 1;
@@ -119,28 +156,31 @@ if(!defined($ARGV[0])) {
 }
 
 if($ARGV[0] eq "start") {
+    find_nets;
     print "Starting $DESC:";
-    foreach $n (split(" ", $NETS)) {
+    foreach $n (@NETS) {
        print " $n";
        vpn_start($n);
     }
     print ".\n";
 } elsif ($ARGV[0] eq "stop") {
+    find_nets;
     print "Stopping $DESC:";
-    foreach $n (split(" ", $NETS)) {
+    foreach $n (@NETS) {
        print " $n";
        vpn_stop($n);
     }
     print ".\n";
 } elsif ($ARGV[0] eq "restart" || $ARGV[0] eq "force-reload") {
+    find_nets;
     print "Stopping $DESC:";
-    foreach $n (split(" ", $NETS)) {
+    foreach $n (@NETS) {
        print " $n";
        vpn_stop($n);
     }
     print ".\n";
     print "Starting $DESC:";
-    foreach $n (split(" ", $NETS)) {
+    foreach $n (@NETS) {
        print " $n";
        vpn_start($n);
     }