DESC=anytun
CONFIG_DIR=/etc/anytun
VARCONFIG_DIR=/var/run/anytun-controld
-VARRUN_DIR=/var/run/anytun
+VARRUN_DIR=/var/run/$NAME/
test -x $DAEMON || exit 0
test -d $VARCONFIG_DIR || mkdir -p $VARCONFIG_DIR
chmod 700 $VARCONFIG_DIR
rm -f $VARCONFIG_DIR/$NAME 2>/dev/null
+ KDPRF=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'kd-prf' | sed 's/^/ --/' | xargs echo`
for CLIENTNAME in `ls $CONFIG_DIR/$NAME/conf.d`; do
echo -n " ($CLIENTNAME)"
DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/conf.d/$CLIENTNAME | grep -e '\w' | sed 's/^/ --/' | xargs echo`
- $ANYTUNCONFIG $DAEMONARG >> $VARCONFIG_DIR/$NAME
+ $ANYTUNCONFIG $DAEMONARG $CIPHER $AUTHALGO $KDPRF >> $VARCONFIG_DIR/$NAME
done
- CONTROLHOST=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed 's/^/ --/'`
+ CONTROLHOST=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed 's/^/ --/' | xargs echo`
$CONTROLDAEMON -f $VARCONFIG_DIR/$NAME $DAEMONOPTS $CONTROLHOST \
--write-pid $VARCONFIG_DIR/$NAME.pid
# rm -f $VARCONFIG_DIR/$NAME
}
stop_configd () {
if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
- echo -n " ($NAME)"
+ echo -n " ($NAME-controlld)"
kill `cat $VARCONFIG_DIR/$NAME.pid` || true
rm $VARCONFIG_DIR/$NAME.pid
fi
echo -n "Stoping $DESC:"
if test -z "$2" ; then
for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
- NAME=`echo $PIDFILE | cut -c17-`
+ NAME=`basename $PIDFILE`
NAME=${NAME%%.pid}
echo -n " $NAME"
stop_vpn
[ -z "$1" ] && break
if test -e $VARRUN_DIR/$1.pid ; then
PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
- NAME=`echo $PIDFILE | cut -c17-`
+ NAME=`basename $PIDFILE`
NAME=${NAME%%.pid}
echo -n " $NAME"
stop_vpn
echo -n "Reloading $DESC:"
if test -z "$2" ; then
for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
- NAME=`echo $PIDFILE | cut -c17-`
+ NAME=`basename $PIDFILE`
NAME=${NAME%%.pid}
echo -n " $NAME"
if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
[ -z "$1" ] && break
if test -e $VARRUN_DIR/$1.pid ; then
PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
- NAME=`echo $PIDFILE | cut -c17-`
+ NAME=`basename $PIDFILE`
NAME=${NAME%%.pid}
echo -n " $NAME"
if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
echo -n "Restarting $DESC:"
if test -z "$2" ; then
for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
- NAME=`echo $PIDFILE | cut -c17-`
+ NAME=`basename $PIDFILE`
NAME=${NAME%%.pid}
echo -n " $NAME"
stop_vpn
[ -z "$1" ] && break
if test -e $VARRUN_DIR/$1.pid ; then
PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
- NAME=`echo $PIDFILE | cut -c17-`
+ NAME=`basename $PIDFILE`
NAME=${NAME%%.pid}
echo -n " $NAME"
stop_vpn