X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=debian%2Finit.d;h=9067c546d6f36219273aecd129c75ba53ef7afdb;hp=c006fece482f41a8f3b4d6c0a8324a7c62a2f0f2;hb=18b3084d2525c59f62b75346fa657ccce6459712;hpb=2ad4f1cc5b6013be2deee82b0cb3f731adb51616 diff --git a/debian/init.d b/debian/init.d index c006fece..9067c546 100644 --- a/debian/init.d +++ b/debian/init.d @@ -1,7 +1,7 @@ #! /usr/bin/perl -w # # System startup script for tinc -# $Id: init.d,v 1.11 2000/05/21 22:08:21 guus Exp $ +# $Id: init.d,v 1.14 2000/06/01 20:21:27 guus Exp $ # # Based on Lubomir Bulej's Redhat init script. # @@ -90,10 +90,6 @@ sub vpn_load { 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/; @@ -109,12 +105,16 @@ sub vpn_load { $MSK = pack('N4', -1 << (32 - $LEN)); $BRD = join(".", unpack('C4', $ADR | ~$MSK)); $MAC = "fe:fd:" . join(":", map { sprintf "%02x", $_ } unpack('C4', $ADR)); + + if(!defined($VPNMASK)) { + $VPNMASK = $MSK; + } + $VPNMASK = pack('C4', split(/\./, $VPNMASK)); $VPNMASK = join(".", unpack('C4', $VPNMASK)); $ADR = join(".", unpack('C4', $ADR)); $MSK = join(".", unpack('C4', $MSK)); - 1; } @@ -129,7 +129,7 @@ sub vpn_start { 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"); }