denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some return code changes proposed by Marius Tomaschewski

Browse Source
This commit is contained in:
Andreas Steffen
2007-11-29 18:27:04 +00:00
parent 0b72091970
commit 89f112ff34
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ipsec/ipsec.in
+35 -15
View File
@@ -160,23 +160,21 @@ ready)
fi fi
;; ;;
reload) reload)
rc=7
if [ -e $IPSEC_STARTER_PID ] if [ -e $IPSEC_STARTER_PID ]
then then
echo "Reloading strongSwan IPsec configuration..." >&2 echo "Reloading strongSwan IPsec configuration..." >&2
kill -s USR1 `cat $IPSEC_STARTER_PID` kill -s USR1 `cat $IPSEC_STARTER_PID` 2>/dev/null && rc=0
exit 0
else else
echo "ipsec starter is not running" >&2 echo "ipsec starter is not running" >&2
exit 7
fi fi
exit 0 exit "$rc"
;; ;;
restart) restart)
$IPSEC_SBINDIR/ipsec stop $IPSEC_SBINDIR/ipsec stop
sleep 2 sleep 2
shift shift
$IPSEC_SBINDIR/ipsec start "$@" exec $IPSEC_SBINDIR/ipsec start "$@"
exit 0
;; ;;
route|unroute) route|unroute)
op="$1" op="$1"
@@ -230,44 +228,66 @@ start)
;; ;;
status|statusall) status|statusall)
op="$1" op="$1"
rc=7 # Return value is slightly different for the status command:
# 0 - service up and running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
shift shift
if [ $# -eq 0 ] if [ $# -eq 0 ]
then then
if [ -e $IPSEC_PLUTO_PID ] if [ -e $IPSEC_PLUTO_PID ]
then then
$IPSEC_WHACK "--$op" $IPSEC_WHACK "--$op"
rc="$?"
fi fi
if [ -e $IPSEC_CHARON_PID ] if [ -e $IPSEC_CHARON_PID ]
then then
$IPSEC_STROKE "$op" $IPSEC_STROKE "$op"
rc="$?"
fi fi
else else
if [ -e $IPSEC_PLUTO_PID ] if [ -e $IPSEC_PLUTO_PID ]
then then
$IPSEC_WHACK --name "$1" "--$op" $IPSEC_WHACK --name "$1" "--$op"
rc="$?"
fi fi
if [ -e $IPSEC_CHARON_PID ] if [ -e $IPSEC_CHARON_PID ]
then then
$IPSEC_STROKE "$op" "$1" $IPSEC_STROKE "$op" "$1"
rc="$?"
fi fi
fi fi
exit "$rc" if [ -e $IPSEC_STARTER_PID ]
then
kill -0 `cat $IPSEC_STARTER_PID` 2>/dev/null
exit $?
fi
exit 3
;; ;;
stop) stop)
# stopping a not-running service is considered as success
if [ -e $IPSEC_STARTER_PID ] if [ -e $IPSEC_STARTER_PID ]
then then
echo "Stopping strongSwan IPsec..." >&2 echo "Stopping strongSwan IPsec..." >&2
kill `cat $IPSEC_STARTER_PID` spid=`cat $IPSEC_STARTER_PID`
exit 0 if [ -n "$spid" ]
then
kill $spid 2>/dev/null
loop=5
while [ $loop -gt 0 ] ; do
kill -s 0 $spid 2>/dev/null || break
sleep 1
loop=$(($loop - 1))
done
if [ $loop -eq 0 ]
then
kill -s KILL $spid 2>/dev/null
rm -f $IPSEC_STARTER_PID
fi
fi
else else
echo "ipsec starter is not running" >&2 echo "ipsec starter is not running" >&2
exit 7
fi fi
exit 0
;; ;;
up) up)
shift shift