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

When VpnMask is not present in the config file, silently use $MSK as vpnmask.

Browse source
This commit is contained in:
Ivo Timmermans 2000-05-21 22:27:31 +00:00
parent 73b3e7ce03
commit 2469acc090
1 changed files with 6 additions and 6 deletions

12
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.12 2000/05/21 22:21:38 guus Exp $ # $Id: init.d,v 1.13 2000/05/21 22:27:31 zarq Exp $
# #
# Based on Lubomir Bulej's Redhat init script. # Based on Lubomir Bulej's Redhat init script.
# #
@ -90,10 +90,6 @@ 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/;
@ -109,12 +105,16 @@ sub vpn_load {
$MSK = pack('N4', -1 << (32 - $LEN)); $MSK = pack('N4', -1 << (32 - $LEN));
$BRD = join(".", unpack('C4', $ADR | ~$MSK)); $BRD = 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 = pack('C4', split(/\./, $VPNMASK)); $VPNMASK = pack('C4', split(/\./, $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));
1; 1;
} }