Index: asterisk =================================================================== --- asterisk (revision 4988) +++ asterisk (working copy) @@ -4,17 +4,20 @@ if [ -a /usr/sbin/asterisk ] then echo '<<>>' + + astcmd () { + asterisk -rx "$1" | sed -r 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' + } + CORECHANNELS=`asterisk -rx 'core show channels' | tail -3` - ACTIVECHAN=$(asterisk -rx 'core show channels' | tail -3 | grep channels | cut -d' ' -f1) - ACTIVECALL=$(asterisk -rx 'core show channels' | tail -3 | grep 'active calls' | cut -d' ' -f1) - ACTIVECHAN=$(echo $CORECHANNELS | grep channels | cut -d' ' -f1) - ACTIVECALL=$(echo $CORECHANNELS | grep calls | cut -d' ' -f1) - IAXCHANNELS=$(asterisk -rx 'iax2 show channels' | tail -1 | cut -d' ' -f1) - SIPCHANNELS=$(asterisk -rx 'sip show channels' | tail -1 | cut -d' ' -f1) - SIPPEERS=`asterisk -rx 'sip show peers' | tail -1` + ACTIVECHAN=$(echo $CORECHANNELS | grep -o '[0-9]* active channel' | cut -d' ' -f1) + ACTIVECALL=$(echo $CORECHANNELS | grep -o '[0-9]* active call' | cut -d' ' -f1) + IAXCHANNELS=$(astcmd 'iax2 show channels' | tail -1 | cut -d' ' -f1) + SIPCHANNELS=$(astcmd 'sip show channels' | tail -1 | cut -d' ' -f1) + SIPPEERS=`astcmd 'sip show peers' | tail -1` SIPTOTALPEERS=$(echo $SIPPEERS | cut -d' ' -f1) SIPONLINE=$(echo $SIPPEERS | grep -o '[0-9]* online' | head -1 | cut -d' ' -f1) - IAXPEERS=`asterisk -rx 'iax2 show peers' | tail -1` + IAXPEERS=`astcmd 'iax2 show peers' | tail -1` IAXTOTALPEERS=$(echo $IAXPEERS | cut -d' ' -f1) IAXONLINE=$(echo $IAXPEERS | grep -o '[0-9]* online' | head -1 | cut -d' ' -f1) Property changes on: asterisk ___________________________________________________________________ Added: svn:executable + *