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

Mask the vpn net with the vpn netmask, route would give an error if the netmask didn't match the net.

Browse source
This commit is contained in:
Ivo Timmermans 2000-05-19 01:17:32 +00:00
parent 20e404ab57
commit 9ec4decec1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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.8 2000/05/19 00:15:37 zarq Exp $ # $Id: init.d,v 1.9 2000/05/19 01:17:32 zarq Exp $
# #
# Based on Lubomir Bulej's Redhat init script. # Based on Lubomir Bulej's Redhat init script.
# #
@ -105,6 +105,9 @@ sub vpn_load {
$BRD = join(".", unpack('C4', $ADR | ~$MSK)); $BRD = join(".", unpack('C4', $ADR | ~$MSK));
# $NET = 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));
$VPNNET = join(".", unpack('C4', $ADR & $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));
@ -127,7 +130,7 @@ sub vpn_start {
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)) { if(defined($VPNMASK)) {
system("route add -net $ADR netmask $VPNMASK dev $DEV"); system("route add -net $VPNNET netmask $VPNMASK dev $DEV");
} }
} }