j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

VpnMask truely works now.

Browse source
This commit is contained in:
Guus Sliepen 2000-05-21 22:04:56 +00:00
parent 9ec4decec1
commit e25fc3a3dc
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
debian/init.d vendored
View file

@ -1,7 +1,7 @@
#! /usr/bin/perl -w #! /usr/bin/perl -w
# #
# System startup script for tinc # System startup script for tinc
# $Id: init.d,v 1.9 2000/05/19 01:17:32 zarq Exp $ # $Id: init.d,v 1.10 2000/05/21 22:04:56 guus Exp $
# #
# Based on Lubomir Bulej's Redhat init script. # Based on Lubomir Bulej's Redhat init script.
# #
@ -90,6 +90,11 @@ sub vpn_load {
warn "tinc: Invalid argument to VpnMask\n"; warn "tinc: Invalid argument to VpnMask\n";
return 0; 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 = $VPN;
$ADR =~ s/^([^\/]+)\/.*$/$1/; $ADR =~ s/^([^\/]+)\/.*$/$1/;
$LEN = $VPN; $LEN = $VPN;
@ -103,15 +108,12 @@ sub vpn_load {
$ADR = pack('C4', @addr); $ADR = pack('C4', @addr);
$MSK = pack('N4', -1 << (32 - $LEN)); $MSK = pack('N4', -1 << (32 - $LEN));
$BRD = join(".", unpack('C4', $ADR | ~$MSK)); $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));
$VPNMASK = pack('C4', split(/\./, $VPNMASK)); $VPNMASK = pack('C4', split(/\./, $VPNMASK));
$VPNNET = join(".", unpack('C4', $ADR & $VPNMASK));
$VPNMASK = join(".", unpack('C4', $VPNMASK)); $VPNMASK = join(".", unpack('C4', $VPNMASK));
$ADR = join(".", unpack('C4', $ADR)); $ADR = join(".", unpack('C4', $ADR));
$MSK = join(".", unpack('C4', $MSK)); $MSK = join(".", unpack('C4', $MSK));
# print "$DEV $VPN $NUM $LEN @addr $MAC $MASK $BRD $NET\n";
1; 1;
} }
@ -129,9 +131,6 @@ sub vpn_start {
system("ifconfig $DEV hw ether $MAC"); system("ifconfig $DEV hw ether $MAC");
system("ifconfig $DEV $ADR netmask $MSK broadcast $BRD -arp"); 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"); system("start-stop-daemon --start --quiet --pidfile /var/run/$NAME.$_[0].pid --exec $DAEMON -- -n $_[0] $EXTRA");
if(defined($VPNMASK)) {
system("route add -net $VPNNET netmask $VPNMASK dev $DEV");
}
} }