Einrückungen Korrigiert

Signed-off-by: Jan-Tarek Butt <buttjantarek@googlemail.com>
This commit is contained in:
Jan-Tarek Butt 2013-10-08 23:28:45 +02:00 committed by Tim Niemeyer
parent af17b5196f
commit b59b5c945d
2 changed files with 112 additions and 115 deletions

View File

@ -90,8 +90,7 @@ scan_wlan() {
} }
fsm_load() { fsm_load() {
if [ -f "$STATEFILE" ] if [ -f "$STATEFILE" ] then
then
STATE="" STATE=""
SINCE="" SINCE=""
. "$STATEFILE" || return 1 . "$STATEFILE" || return 1
@ -118,19 +117,17 @@ fsm_entry() {
} }
fsm_transition() { fsm_transition() {
local AGE=-1 local AGE=-1
[ -n "$SINCE" ] && AGE=$(( $(get_time) - $SINCE )) [ -n "$SINCE" ] && AGE=$(( $(get_time) - $SINCE ))
local OLDSTATE=$STATE local OLDSTATE=$STATE
case $STATE in case $STATE in
working) working)
if [ $(count_neighbours) -eq 0 ] && [ $(count_clients) -eq 0 ] if [ $(count_neighbours) -eq 0 ] && [ $(count_clients) -eq 0 ] then
then
STATE=pending STATE=pending
fi fi
;; ;;
pending) pending)
if [ $AGE -ge $TIMEOUT_MEDIUM ] if [ $AGE -ge $TIMEOUT_MEDIUM ] then
then
STATE=error STATE=error
elif [ $(count_originators) -eq 0 ] && [ $AGE -ge $TIMEOUT_SHORT ] elif [ $(count_originators) -eq 0 ] && [ $AGE -ge $TIMEOUT_SHORT ]
then then
@ -149,12 +146,12 @@ case $STATE in
STATE=working STATE=working
fi fi
;; ;;
esac esac
if [ ! "$OLDSTATE" == "$STATE" ] if [ ! "$OLDSTATE" == "$STATE" ]
then then
echo "$(date) '$OLDSTATE' -> '$STATE'" echo "$(date) '$OLDSTATE' -> '$STATE'"
fsm_entry fsm_entry
fi fi
} }
# program # program