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

Merge changes from 1.6-1.8.

Browse source
This commit is contained in:
Ivo Timmermans 2000-06-17 20:30:44 +00:00
parent ef294a6967
commit 1c8adb5e1f
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
redhat/tinc
View file

@ -117,7 +117,7 @@ mask_to_prefix () {
vpn_load () { vpn_load () {
CFG="$TCONF/$1/tinc.conf" CFG="$TCONF/$1/tinc.conf"
[ -f $CFG ] || { MSG="$CFG does not exist!"; return 1 } [ -f $CFG ] || { MSG="$CFG does not exist!"; return 1; }
# load TINCD config # load TINCD config
DEV="$(grep -i -e '^[[:space:]]*TapDevice' $CFG | sed 's/[[:space:]]//g; s/^.*=//g')" DEV="$(grep -i -e '^[[:space:]]*TapDevice' $CFG | sed 's/[[:space:]]//g; s/^.*=//g')"
@ -126,24 +126,24 @@ vpn_load () {
# TapDevice syntax validation # TapDevice syntax validation
[ -z "$DEV" ] && \ [ -z "$DEV" ] && \
{ MSG="TapDevice required!"; return 1 } { MSG="TapDevice required!"; return 1; }
[ $(echo $DEV | wc -l) -gt 1 ] && \ [ $(echo $DEV | wc -l) -gt 1 ] && \
{ MSG="multiple TapDevice entries not allowed!"; return 1 } { MSG="multiple TapDevice entries not allowed!"; return 1; }
echo $DEV | grep -q -x -E '/dev/tap[[:digit:]]+' || echo $DEV | grep -q -x -E '/dev/tap[[:digit:]]+' ||
{ MSG="TapDevice should be in form /dev/tapX!"; return 1 } { MSG="TapDevice should be in form /dev/tapX!"; return 1; }
# MyOwnVPNIP/MyVirtualIP syntax validation # MyOwnVPNIP/MyVirtualIP syntax validation
[ -z "$VPN" ] && \ [ -z "$VPN" ] && \
{ MSG="MyOwnVPNIP/MyVirtualIP required!"; return 1 } { MSG="MyOwnVPNIP/MyVirtualIP required!"; return 1; }
[ $(echo $VPN | wc -l) -gt 1 ] && \ [ $(echo $VPN | wc -l) -gt 1 ] && \
{ MSG="multiple MyOwnVPNIP/MyVirtualIP entries not allowed!"; return 1 } { MSG="multiple MyOwnVPNIP/MyVirtualIP entries not allowed!"; return 1; }
echo $VPN | grep -q -x -E \ echo $VPN | grep -q -x -E \
'([[:digit:]]{1,3}\.){3}[[:digit:]]{1,3}/[[:digit:]]{1,2}' || \ '([[:digit:]]{1,3}\.){3}[[:digit:]]{1,3}/[[:digit:]]{1,2}' || \
{ MSG="badly formed MyOwnVPNIP/MyVirtualIP address $VPN!"; return 1 } { MSG="badly formed MyOwnVPNIP/MyVirtualIP address $VPN!"; return 1; }
# VPNMask syntax validation # VPNMask syntax validation
[ $(echo $IFM | wc -l) -gt 1 ] && \ [ $(echo $IFM | wc -l) -gt 1 ] && \
{ MSG="multiple VPNMask entries not allowed!"; return 1 } { MSG="multiple VPNMask entries not allowed!"; return 1; }
# device & IP address extraction # device & IP address extraction
@ -180,7 +180,7 @@ vpn_load () {
NET=$(ipcalc --network $ADR $MSK | cut -d"=" -f2) NET=$(ipcalc --network $ADR $MSK | cut -d"=" -f2)
# MAC address # MAC address
MAC=$(printf "fe:fd:%0.2x:%0.2x:%0.2x:%0.2x" $(echo $ADR | { IFS=. ; read a b c d; echo $a $b $c $d })) MAC=$(printf "fe:fd:%0.2x:%0.2x:%0.2x:%0.2x" $(echo $ADR | { IFS=. ; read a b c d; echo $a $b $c $d; }))
# debugging # debugging
# echo >&2 # echo >&2
@ -208,21 +208,21 @@ vpn_start () {
# load device module # load device module
ERR="$(insmod ethertap -o "ethertap$NUM" unit="$NUM" 2>&1 1> /dev/null)" || ERR="$(insmod ethertap -o "ethertap$NUM" unit="$NUM" 2>&1 1> /dev/null)" ||
{ MSG="could not insmod ethertap as unit $NUM!"; return 2 } { MSG="could not insmod ethertap as unit $NUM!"; return 2; }
# configure the interface # configure the interface
ERR="$(ip link set $TAP address $MAC 2>&1)" || ERR="$(ip link set $TAP address $MAC 2>&1)" ||
{ MSG="could not set address for device $TAP!"; return 3 } { MSG="could not set address for device $TAP!"; return 3; }
ERR="$(ip link set $TAP up 2>&1)" || ERR="$(ip link set $TAP up 2>&1)" ||
{ MSG="could not bring up device $TAP!"; return 3 } { MSG="could not bring up device $TAP!"; return 3; }
ERR="$(ip addr add $VPN brd $BRD dev $TAP 2>&1)" || ERR="$(ip addr add $VPN brd $BRD dev $TAP 2>&1)" ||
{ MSG="could not set IP address for device $TAP!"; return 3 } { MSG="could not set IP address for device $TAP!"; return 3; }
# start tincd # start tincd
$TINCD --net="$1" $DEBUG || \ $TINCD --net="$1" $DEBUG || \
{ MSG="could not start daemon for network $1"; return 3 } { MSG="could not start daemon for network $1"; return 3; }
# setup custom static routes # setup custom static routes
/etc/sysconfig/network-scripts/ifup-routes $TAP /etc/sysconfig/network-scripts/ifup-routes $TAP