projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add checks for the presence of the universal tun/tap device driver.
[tinc]
/
debian
/
init.d
diff --git
a/debian/init.d
b/debian/init.d
index
bb27b14
..
62c9de3
100644
(file)
--- a/
debian/init.d
+++ b/
debian/init.d
@@
-1,7
+1,7
@@
#! /usr/bin/perl -w
#
# System startup script for tinc
#! /usr/bin/perl -w
#
# System startup script for tinc
-# $Id: init.d,v 1.
8 2000/05/19 00:15:3
7 zarq Exp $
+# $Id: init.d,v 1.
14.2.2 2000/08/20 23:08:1
7 zarq Exp $
#
# Based on Lubomir Bulej's Redhat init script.
#
#
# Based on Lubomir Bulej's Redhat init script.
#
@@
-68,6
+68,7
@@
sub vpn_load {
chomp($VPN);
} elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) {
$VPNMASK=$1;
chomp($VPN);
} elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) {
$VPNMASK=$1;
+ chomp($VPNMASK);
}
}
if(!defined($DEV)) {
}
}
if(!defined($DEV)) {
@@
-90,6
+91,7
@@
sub vpn_load {
warn "tinc: Invalid argument to VpnMask\n";
return 0;
}
warn "tinc: Invalid argument to VpnMask\n";
return 0;
}
+
$ADR = $VPN;
$ADR =~ s/^([^\/]+)\/.*$/$1/;
$LEN = $VPN;
$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));
$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));
$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));
$ADR = join(".", unpack('C4', $ADR));
$MSK = join(".", unpack('C4', $MSK));
-# print "$DEV $VPN $NUM $LEN @addr $MAC $MASK $BRD $NET\n";
-
1;
}
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("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");
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");
- }
}
}