[asterisk-commits] oej: branch oej/callpickup r46647 - in /team/oej/callpickup: ./ build_tools/ ...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Oct 31 05:39:17 MST 2006


Author: oej
Date: Tue Oct 31 06:39:16 2006
New Revision: 46647

URL: http://svn.digium.com/view/asterisk?rev=46647&view=rev
Log:
Resetting

Added:
    team/oej/callpickup/build_tools/strip_nonapi
      - copied unchanged from r44753, trunk/build_tools/strip_nonapi
    team/oej/callpickup/channels/h323/Makefile.in
      - copied unchanged from r44753, trunk/channels/h323/Makefile.in
    team/oej/callpickup/channels/h323/ast_h323.cxx
      - copied unchanged from r44753, trunk/channels/h323/ast_h323.cxx
    team/oej/callpickup/channels/h323/caps_h323.cxx
      - copied unchanged from r44753, trunk/channels/h323/caps_h323.cxx
    team/oej/callpickup/channels/h323/caps_h323.h
      - copied unchanged from r44753, trunk/channels/h323/caps_h323.h
    team/oej/callpickup/channels/h323/cisco-h225.asn
      - copied unchanged from r44753, trunk/channels/h323/cisco-h225.asn
    team/oej/callpickup/channels/h323/cisco-h225.cxx
      - copied unchanged from r44753, trunk/channels/h323/cisco-h225.cxx
    team/oej/callpickup/channels/h323/cisco-h225.h
      - copied unchanged from r44753, trunk/channels/h323/cisco-h225.h
    team/oej/callpickup/channels/h323/compat_h323.cxx
      - copied unchanged from r44753, trunk/channels/h323/compat_h323.cxx
    team/oej/callpickup/channels/h323/compat_h323.h
      - copied unchanged from r44753, trunk/channels/h323/compat_h323.h
    team/oej/callpickup/channels/h323/noexport.map
      - copied unchanged from r44753, trunk/channels/h323/noexport.map
    team/oej/callpickup/pbx/ael/ael-test/ael-test14/
      - copied from r44753, trunk/pbx/ael/ael-test/ael-test14/
    team/oej/callpickup/pbx/ael/ael-test/ael-test14/extensions.ael
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ael-test14/extensions.ael
    team/oej/callpickup/pbx/ael/ael-test/ael-test15/
      - copied from r44753, trunk/pbx/ael/ael-test/ael-test15/
    team/oej/callpickup/pbx/ael/ael-test/ael-test15/extensions.ael
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ael-test15/extensions.ael
    team/oej/callpickup/pbx/ael/ael-test/ael-test16/
      - copied from r44753, trunk/pbx/ael/ael-test/ael-test16/
    team/oej/callpickup/pbx/ael/ael-test/ael-test16/extensions.ael
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ael-test16/extensions.ael
    team/oej/callpickup/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test14
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ref.ael-test14
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test15
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ref.ael-test15
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test16
      - copied unchanged from r44753, trunk/pbx/ael/ael-test/ref.ael-test16
Removed:
    team/oej/callpickup/channels/h323/Makefile
    team/oej/callpickup/channels/h323/ast_h323.cpp
    team/oej/callpickup/channels/h323/h323.conf.sample
Modified:
    team/oej/callpickup/   (props changed)
    team/oej/callpickup/bootstrap.sh
    team/oej/callpickup/build_tools/cflags.xml
    team/oej/callpickup/build_tools/embed_modules.xml
    team/oej/callpickup/build_tools/make_buildopts_h
    team/oej/callpickup/build_tools/make_version
    team/oej/callpickup/build_tools/menuselect-deps.in
    team/oej/callpickup/build_tools/mkpkgconfig
    team/oej/callpickup/build_tools/prep_moduledeps
    team/oej/callpickup/channels/chan_alsa.c
    team/oej/callpickup/channels/chan_features.c
    team/oej/callpickup/channels/chan_h323.c
    team/oej/callpickup/channels/chan_jingle.c
    team/oej/callpickup/channels/chan_local.c
    team/oej/callpickup/channels/chan_mgcp.c
    team/oej/callpickup/channels/chan_misdn.c
    team/oej/callpickup/channels/chan_nbs.c
    team/oej/callpickup/channels/chan_phone.c
    team/oej/callpickup/channels/chan_skinny.c
    team/oej/callpickup/channels/chan_vpb.cc
    team/oej/callpickup/channels/h323/   (props changed)
    team/oej/callpickup/channels/h323/README
    team/oej/callpickup/channels/h323/TODO
    team/oej/callpickup/channels/h323/ast_h323.h
    team/oej/callpickup/channels/h323/chan_h323.h
    team/oej/callpickup/channels/iax2-parser.h
    team/oej/callpickup/configure
    team/oej/callpickup/pbx/Makefile
    team/oej/callpickup/pbx/ael/ael-test/ael-test11/extensions.ael
    team/oej/callpickup/pbx/ael/ael-test/ael-test3/extensions.ael
    team/oej/callpickup/pbx/ael/ael-test/ael-test5/extensions.ael
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-ntest10
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-ntest12
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-ntest9
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test1
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test11
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test2
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test3
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test4
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test5
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test6
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test7
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-test8
    team/oej/callpickup/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/callpickup/pbx/ael/ael.flex
    team/oej/callpickup/pbx/ael/ael.tab.c
    team/oej/callpickup/pbx/ael/ael.y
    team/oej/callpickup/pbx/ael/ael_lex.c
    team/oej/callpickup/pbx/pbx_ael.c
    team/oej/callpickup/pbx/pbx_config.c
    team/oej/callpickup/pbx/pbx_dundi.c
    team/oej/callpickup/pbx/pbx_spool.c

Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Modified: team/oej/callpickup/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/bootstrap.sh?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/bootstrap.sh (original)
+++ team/oej/callpickup/bootstrap.sh Tue Oct 31 06:39:16 2006
@@ -9,33 +9,32 @@
 	fi
 }
 
+# On FreeBSD, multiple autoconf/automake versions have different names.
+# On linux, envitonment variables tell which one to use.
+
 uname -s | grep -q FreeBSD
-if [ $? = 0 ]
-then
-	check_for_app autoconf259
-	check_for_app autoheader259
-	check_for_app automake19
-	check_for_app aclocal19
-	echo "Generating the configure script ..."
-	aclocal19 2>/dev/null
-	autoconf259
-	autoheader259
-	automake19 --add-missing --copy 2>/dev/null
-else
-	AUTOCONF_VERSION=2.59
+if [ $? = 0 ] ; then	# FreeBSD case
+	MY_AC_VER=259
+	MY_AM_VER=19
+else	# linux case
+	MY_AC_VER=
+	MY_AM_VER=
+	AUTOCONF_VERSION=2.60
 	AUTOMAKE_VERSION=1.9
 	export AUTOCONF_VERSION
 	export AUTOMAKE_VERSION
-
-	check_for_app autoconf
-	check_for_app autoheader
-	check_for_app automake
-	check_for_app aclocal
-	echo "Generating the configure script ..."
-	aclocal 2>/dev/null
-	autoconf
-	autoheader
-	automake --add-missing --copy 2>/dev/null
 fi
 
+check_for_app autoconf${MY_AC_VER}
+check_for_app autoheader${MY_AC_VER}
+check_for_app automake${MY_AM_VER}
+check_for_app aclocal${MY_AM_VER}
+
+echo "Generating the configure script ..."
+
+aclocal${MY_AM_VER} 2>/dev/null
+autoconf${MY_AC_VER}
+autoheader${MY_AC_VER}
+automake${MY_AM_VER} --add-missing --copy 2>/dev/null
+
 exit 0

Modified: team/oej/callpickup/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/cflags.xml?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/cflags.xml (original)
+++ team/oej/callpickup/build_tools/cflags.xml Tue Oct 31 06:39:16 2006
@@ -7,7 +7,9 @@
 		</member>
 		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
 		</member>
-		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations from the Compiler">
+		<member name="DO_CRASH" displayname="Crash on fatal errors">
+		</member>
+		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
 		</member>
 		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
 		</member>

Modified: team/oej/callpickup/build_tools/embed_modules.xml
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/embed_modules.xml?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/embed_modules.xml (original)
+++ team/oej/callpickup/build_tools/embed_modules.xml Tue Oct 31 06:39:16 2006
@@ -5,7 +5,7 @@
 		</member>
 		<member name="channels" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
 		</member>
-		<member name="codecs" displayname="Coders/Decoders" remove_on_change="codecs/*.o">
+		<member name="codecs" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a">
 		</member>
 		<member name="formats" displayname="File Formats" remove_on_change="formats/*.o">
 		</member>

Modified: team/oej/callpickup/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/make_buildopts_h?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/make_buildopts_h (original)
+++ team/oej/callpickup/build_tools/make_buildopts_h Tue Oct 31 06:39:16 2006
@@ -7,7 +7,7 @@
  */
 
 END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
      echo "#define ${x} 1"
 done

Modified: team/oej/callpickup/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/make_version?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/make_version (original)
+++ team/oej/callpickup/build_tools/make_version Tue Oct 31 06:39:16 2006
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -f ${1}/.version ]; then
-	cat ${1}.version
+	cat ${1}/.version
 elif [ -f ${1}/.svnrevision ]; then
 	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
 elif [ -d .svn ]; then

Modified: team/oej/callpickup/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/menuselect-deps.in?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/menuselect-deps.in (original)
+++ team/oej/callpickup/build_tools/menuselect-deps.in Tue Oct 31 06:39:16 2006
@@ -4,6 +4,7 @@
 GSM=@PBX_GSM@
 GTK=@PBX_GTK@
 H323=@PBX_H323@
+OPENH323=@PBX_OPENH323@
 IKSEMEL=@PBX_IKSEMEL@
 IMAP_TK=@PBX_IMAP_TK@
 IXJUSER=@PBX_IXJUSER@
@@ -17,6 +18,7 @@
 PGSQL=@PBX_PGSQL@
 POPT=@PBX_POPT@
 PRI=@PBX_PRI@
+SS7=@PBX_SS7@
 QT=@PBX_QT@
 RADIUS=@PBX_RADIUS@
 SPEEX=@PBX_SPEEX@

Modified: team/oej/callpickup/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/mkpkgconfig?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/mkpkgconfig (original)
+++ team/oej/callpickup/build_tools/mkpkgconfig Tue Oct 31 06:39:16 2006
@@ -13,13 +13,20 @@
   exit
 fi
 
+#Solaris (and some others) don't have sed -r.  perl -p is equivalent
+if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then
+    EXTREGEX="sed -r -e"
+else
+    EXTREGEX="perl -pe"
+fi
+
 ## Clean out CFLAGS for the spec file.
 
-LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
-  sed -r -e 's/-I(include|\.\.\/include) //g' | \
-  sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
-  sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
-  sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \
+  ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \
+  ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \
+  ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \
+  ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
 
 
 cat <<EOF > $PPATH/asterisk.pc

Modified: team/oej/callpickup/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/build_tools/prep_moduledeps?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/build_tools/prep_moduledeps (original)
+++ team/oej/callpickup/build_tools/prep_moduledeps Tue Oct 31 06:39:16 2006
@@ -28,7 +28,7 @@
 	echo -e "\t</category>"
 }
 
-echo "<?xml version="1.0"?>"
+echo "<?xml version=\"1.0\"?>"
 echo
 echo "<menu name=\"Asterisk Module Selection\">"
 rm -f .makeoptstmp

Modified: team/oej/callpickup/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/channels/chan_alsa.c?rev=46647&r1=46646&r2=46647&view=diff
==============================================================================
--- team/oej/callpickup/channels/chan_alsa.c (original)
+++ team/oej/callpickup/channels/chan_alsa.c Tue Oct 31 06:39:16 2006
@@ -73,8 +73,7 @@
 #endif
 
 /*! Global jitterbuffer configuration - by default, jb is disabled */
-static struct ast_jb_conf default_jbconf =
-{
+static struct ast_jb_conf default_jbconf = {
 	.flags = 0,
 	.max_size = -1,
 	.resync_threshold = -1,
@@ -90,7 +89,7 @@
 
 /* Lets use 160 sample frames, just like GSM.  */
 #define FRAME_SIZE 160
-#define PERIOD_FRAMES 80 /* 80 Frames, at 2 bytes each */
+#define PERIOD_FRAMES 80		/* 80 Frames, at 2 bytes each */
 
 /* When you set the frame size, you have to come up with
    the right buffer format as well. */
@@ -129,9 +128,9 @@
 static char exten[AST_MAX_EXTENSION] = "s";
 static char mohinterpret[MAX_MUSICCLASS];
 
-static int hookstate=0;
-
-static short silence[FRAME_SIZE] = {0, };
+static int hookstate = 0;
+
+static short silence[FRAME_SIZE] = { 0, };
 
 struct sound {
 	int ind;
@@ -143,11 +142,11 @@
 };
 
 static struct sound sounds[] = {
-	{ AST_CONTROL_RINGING, ringtone, sizeof(ringtone)/2, 16000, 32000, 1 },
-	{ AST_CONTROL_BUSY, busy, sizeof(busy)/2, 4000, 4000, 1 },
-	{ AST_CONTROL_CONGESTION, busy, sizeof(busy)/2, 2000, 2000, 1 },
-	{ AST_CONTROL_RING, ring10, sizeof(ring10)/2, 16000, 32000, 1 },
-	{ AST_CONTROL_ANSWER, answer, sizeof(answer)/2, 2200, 0, 0 },
+	{AST_CONTROL_RINGING, ringtone, sizeof(ringtone) / 2, 16000, 32000, 1},
+	{AST_CONTROL_BUSY, busy, sizeof(busy) / 2, 4000, 4000, 1},
+	{AST_CONTROL_CONGESTION, busy, sizeof(busy) / 2, 2000, 2000, 1},
+	{AST_CONTROL_RING, ring10, sizeof(ring10) / 2, 16000, 32000, 1},
+	{AST_CONTROL_ANSWER, answer, sizeof(answer) / 2, 2200, 0, 0},
 };
 
 /* Sound command pipe */
@@ -163,7 +162,7 @@
 	snd_pcm_t *card;
 #endif
 	snd_pcm_t *icard, *ocard;
-	
+
 } alsa;
 
 /* Number of buffers...  Each is FRAMESIZE/8 ms long.  For example
@@ -182,9 +181,9 @@
 
 static int cursound = -1;
 static int sampsent = 0;
-static int silencelen=0;
-static int offset=0;
-static int nosound=0;
+static int silencelen = 0;
+static int offset = 0;
+static int nosound = 0;
 
 /* ZZ */
 static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause);
@@ -203,7 +202,7 @@
 	.description = tdesc,
 	.capabilities = AST_FORMAT_SLINEAR,
 	.requester = alsa_request,
-	.send_digit = alsa_digit,
+	.send_digit_end = alsa_digit,
 	.send_text = alsa_text,
 	.hangup = alsa_hangup,
 	.answer = alsa_answer,
@@ -219,63 +218,60 @@
 	short myframe[FRAME_SIZE];
 	int total = FRAME_SIZE;
 	short *frame = NULL;
-	int amt=0;
-	int res;
-	int myoff;
+	int amt = 0, res, myoff;
 	snd_pcm_state_t state;
 
-	if (cursound > -1) {
-		res = total;
-		if (sampsent < sounds[cursound].samplen) {
-			myoff=0;
-			while(total) {
-				amt = total;
-				if (amt > (sounds[cursound].datalen - offset)) 
-					amt = sounds[cursound].datalen - offset;
-				memcpy(myframe + myoff, sounds[cursound].data + offset, amt * 2);
-				total -= amt;
-				offset += amt;
-				sampsent += amt;
-				myoff += amt;
-				if (offset >= sounds[cursound].datalen)
-					offset = 0;
+	if (cursound == -1)
+		return 0;
+
+	res = total;
+	if (sampsent < sounds[cursound].samplen) {
+		myoff = 0;
+		while (total) {
+			amt = total;
+			if (amt > (sounds[cursound].datalen - offset))
+				amt = sounds[cursound].datalen - offset;
+			memcpy(myframe + myoff, sounds[cursound].data + offset, amt * 2);
+			total -= amt;
+			offset += amt;
+			sampsent += amt;
+			myoff += amt;
+			if (offset >= sounds[cursound].datalen)
+				offset = 0;
+		}
+		/* Set it up for silence */
+		if (sampsent >= sounds[cursound].samplen)
+			silencelen = sounds[cursound].silencelen;
+		frame = myframe;
+	} else {
+		if (silencelen > 0) {
+			frame = silence;
+			silencelen -= res;
+		} else {
+			if (sounds[cursound].repeat) {
+				/* Start over */
+				sampsent = 0;
+				offset = 0;
+			} else {
+				cursound = -1;
+				nosound = 0;
 			}
-			/* Set it up for silence */
-			if (sampsent >= sounds[cursound].samplen) 
-				silencelen = sounds[cursound].silencelen;
-			frame = myframe;
-		} else {
-			if (silencelen > 0) {
-				frame = silence;
-				silencelen -= res;
-			} else {
-				if (sounds[cursound].repeat) {
-					/* Start over */
-					sampsent = 0;
-					offset = 0;
-				} else {
-					cursound = -1;
-					nosound = 0;
-				}
 			return 0;
-			}
-		}
-		
-		if (res == 0 || !frame) {
-			return 0;
-		}
+		}
+	}
+
+	if (res == 0 || !frame)
+		return 0;
+
 #ifdef ALSA_MONITOR
-		alsa_monitor_write((char *)frame, res * 2);
-#endif		
-		state = snd_pcm_state(alsa.ocard);
-		if (state == SND_PCM_STATE_XRUN) {
-			snd_pcm_prepare(alsa.ocard);
-		}
-		res = snd_pcm_writei(alsa.ocard, frame, res);
-		if (res > 0)
-			return 0;
+	alsa_monitor_write((char *) frame, res * 2);
+#endif
+	state = snd_pcm_state(alsa.ocard);
+	if (state == SND_PCM_STATE_XRUN)
+		snd_pcm_prepare(alsa.ocard);
+	res = snd_pcm_writei(alsa.ocard, frame, res);
+	if (res > 0)
 		return 0;
-	}
 	return 0;
 }
 
@@ -283,9 +279,9 @@
 {
 	fd_set rfds;
 	fd_set wfds;
-	int max;
-	int res;
-	for(;;) {
+	int max, res;
+
+	for (;;) {
 		FD_ZERO(&rfds);
 		FD_ZERO(&wfds);
 		max = sndcmd[0];
@@ -313,7 +309,7 @@
 			snd_pcm_state_t state;
 			short buf[FRAME_SIZE];
 			int r;
-			
+
 			state = snd_pcm_state(alsa.ocard);
 			if (state == SND_PCM_STATE_XRUN) {
 				snd_pcm_prepare(alsa.ocard);
@@ -330,9 +326,9 @@
 			} else if (r < 0) {
 				ast_log(LOG_ERROR, "Read error: %s\n", snd_strerror(r));
 			} else
-				alsa_monitor_read((char *)buf, r * 2);
-		}		
-#endif		
+				alsa_monitor_read((char *) buf, r * 2);
+		}
+#endif
 		if (FD_ISSET(sndcmd[0], &rfds)) {
 			read(sndcmd[0], &cursound, sizeof(cursound));
 			silencelen = 0;
@@ -371,123 +367,113 @@
 		ast_log(LOG_ERROR, "snd_pcm_open failed: %s\n", snd_strerror(err));
 		return NULL;
 	} else {
-		ast_log(LOG_DEBUG, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write");
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write");
 	}
 
 	snd_pcm_hw_params_alloca(&hwparams);
 	snd_pcm_hw_params_any(handle, hwparams);
 
 	err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "set_access failed: %s\n", snd_strerror(err));
-	}
 
 	err = snd_pcm_hw_params_set_format(handle, hwparams, format);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "set_format failed: %s\n", snd_strerror(err));
-	}
 
 	err = snd_pcm_hw_params_set_channels(handle, hwparams, 1);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "set_channels failed: %s\n", snd_strerror(err));
-	}
 
 	direction = 0;
 	err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &rate, &direction);
-	if (rate != DESIRED_RATE) {
+	if (rate != DESIRED_RATE)
 		ast_log(LOG_WARNING, "Rate not correct, requested %d, got %d\n", DESIRED_RATE, rate);
-	}
 
 	direction = 0;
 	err = snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, &direction);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "period_size(%ld frames) is bad: %s\n", period_size, snd_strerror(err));
-	} else {
-		ast_log(LOG_DEBUG, "Period size is %d\n", err);
-	}
-
-	buffer_size = 4096 * 2; /* period_size * 16; */
+	else {
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Period size is %d\n", err);
+	}
+
+	buffer_size = 4096 * 2;		/* period_size * 16; */
 	err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &buffer_size);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_WARNING, "Problem setting buffer size of %ld: %s\n", buffer_size, snd_strerror(err));
-	} else {
-		ast_log(LOG_DEBUG, "Buffer size is set to %d frames\n", err);
+	else {
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Buffer size is set to %d frames\n", err);
 	}
 
 #if 0
 	direction = 0;
 	err = snd_pcm_hw_params_set_periods_min(handle, hwparams, &per_min, &direction);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "periods_min: %s\n", snd_strerror(err));
-	}
 
 	err = snd_pcm_hw_params_set_periods_max(handle, hwparams, &per_max, 0);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "periods_max: %s\n", snd_strerror(err));
-	}
 #endif
 
 	err = snd_pcm_hw_params(handle, hwparams);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "Couldn't set the new hw params: %s\n", snd_strerror(err));
-	}
 
 	snd_pcm_sw_params_alloca(&swparams);
 	snd_pcm_sw_params_current(handle, swparams);
 
 #if 1
-	if (stream == SND_PCM_STREAM_PLAYBACK) {
+	if (stream == SND_PCM_STREAM_PLAYBACK)
 		start_threshold = period_size;
-	} else {
+	else
 		start_threshold = 1;
-	}
 
 	err = snd_pcm_sw_params_set_start_threshold(handle, swparams, start_threshold);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "start threshold: %s\n", snd_strerror(err));
-	}
 #endif
 
 #if 1
-	if (stream == SND_PCM_STREAM_PLAYBACK) {
+	if (stream == SND_PCM_STREAM_PLAYBACK)
 		stop_threshold = buffer_size;
-	} else {
+	else
 		stop_threshold = buffer_size;
-	}
+
 	err = snd_pcm_sw_params_set_stop_threshold(handle, swparams, stop_threshold);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "stop threshold: %s\n", snd_strerror(err));
-	}
 #endif
 #if 0
 	err = snd_pcm_sw_params_set_xfer_align(handle, swparams, PERIOD_FRAMES);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "Unable to set xfer alignment: %s\n", snd_strerror(err));
-	}
 #endif
 
 #if 0
 	err = snd_pcm_sw_params_set_silence_threshold(handle, swparams, silencethreshold);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "Unable to set silence threshold: %s\n", snd_strerror(err));
-	}
 #endif
 	err = snd_pcm_sw_params(handle, swparams);
-	if (err < 0) {
+	if (err < 0)
 		ast_log(LOG_ERROR, "sw_params: %s\n", snd_strerror(err));
-	}
 
 	err = snd_pcm_poll_descriptors_count(handle);
-	if (err <= 0) {
+	if (err <= 0)
 		ast_log(LOG_ERROR, "Unable to get a poll descriptors count, error is %s\n", snd_strerror(err));
-	}
-
 	if (err != 1) {
-		ast_log(LOG_DEBUG, "Can't handle more than one device\n");
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Can't handle more than one device\n");
 	}
 
 	snd_pcm_poll_descriptors(handle, &pfd, err);
-	ast_log(LOG_DEBUG, "Acquired fd %d from the poll descriptor\n", pfd.fd);
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Acquired fd %d from the poll descriptor\n", pfd.fd);
 
 	if (stream == SND_PCM_STREAM_CAPTURE)
 		readdev = pfd.fd;
@@ -513,7 +499,7 @@
 static int alsa_digit(struct ast_channel *c, char digit)
 {
 	ast_mutex_lock(&alsalock);
-	ast_verbose( " << Console Received digit %c >> \n", digit);
+	ast_verbose(" << Console Received digit %c >> \n", digit);
 	ast_mutex_unlock(&alsalock);
 	return 0;
 }
@@ -521,14 +507,14 @@
 static int alsa_text(struct ast_channel *c, const char *text)
 {
 	ast_mutex_lock(&alsalock);
-	ast_verbose( " << Console Received text %s >> \n", text);
+	ast_verbose(" << Console Received text %s >> \n", text);
 	ast_mutex_unlock(&alsalock);
 	return 0;
 }
 
 static void grab_owner(void)
 {
-	while(alsa.owner && ast_mutex_trylock(&alsa.owner->lock)) {
+	while (alsa.owner && ast_mutex_trylock(&alsa.owner->lock)) {
 		ast_mutex_unlock(&alsalock);
 		usleep(1);
 		ast_mutex_lock(&alsalock);
@@ -540,9 +526,9 @@
 	int res = 3;
 	struct ast_frame f = { AST_FRAME_CONTROL };
 	ast_mutex_lock(&alsalock);
-	ast_verbose( " << Call placed to '%s' on console >> \n", dest);
+	ast_verbose(" << Call placed to '%s' on console >> \n", dest);
 	if (autoanswer) {
-		ast_verbose( " << Auto-answered >> \n" );
+		ast_verbose(" << Auto-answered >> \n");
 		grab_owner();
 		if (alsa.owner) {
 			f.subclass = AST_CONTROL_ANSWER;
@@ -550,7 +536,7 @@
 			ast_mutex_unlock(&alsa.owner->lock);
 		}
 	} else {
-		ast_verbose( " << Type 'answer' to answer, or use 'autoanswer' for future calls >> \n");
+		ast_verbose(" << Type 'answer' to answer, or use 'autoanswer' for future calls >> \n");
 		grab_owner();
 		if (alsa.owner) {
 			f.subclass = AST_CONTROL_RINGING;
@@ -571,13 +557,13 @@
 	nosound = 1;
 	res = 4;
 	write(sndcmd[1], &res, sizeof(res));
-	
+
 }
 
 static int alsa_answer(struct ast_channel *c)
 {
 	ast_mutex_lock(&alsalock);
-	ast_verbose( " << Console call has been answered >> \n");
+	ast_verbose(" << Console call has been answered >> \n");
 	answer_sound();
 	ast_setstate(c, AST_STATE_UP);
 	cursound = -1;
@@ -594,18 +580,16 @@
 	cursound = -1;
 	c->tech_pvt = NULL;
 	alsa.owner = NULL;
-	ast_verbose( " << Hangup on console >> \n");
+	ast_verbose(" << Hangup on console >> \n");
 	ast_mutex_lock(&usecnt_lock);
 	usecnt--;
 	ast_mutex_unlock(&usecnt_lock);
 	if (hookstate) {
-		if (autoanswer) {
-			hookstate = 0;
-		} else {
+		hookstate = 0;
+		if (!autoanswer) {
 			/* Congestion noise */
 			res = 2;
 			write(sndcmd[1], &res, sizeof(res));
-			hookstate = 0;
 		}
 	}
 	snd_pcm_drop(alsa.icard);
@@ -622,9 +606,11 @@
 	int res = 0;
 	/* size_t frames = 0; */
 	snd_pcm_state_t state;
+
 	/* Immediately return if no sound is enabled */
 	if (nosound)
 		return 0;
+
 	ast_mutex_lock(&alsalock);
 	/* Stop any currently playing sound */
 	if (cursound != -1) {
@@ -632,7 +618,7 @@
 		snd_pcm_prepare(alsa.ocard);
 		cursound = -1;
 	}
-	
+
 
 	/* We have to digest the frame in 160-byte portions */
 	if (f->datalen > sizeof(sizbuf) - sizpos) {
@@ -646,17 +632,17 @@
 		alsa_monitor_write(sizbuf, len);
 #endif
 		state = snd_pcm_state(alsa.ocard);
-		if (state == SND_PCM_STATE_XRUN) {
+		if (state == SND_PCM_STATE_XRUN)
 			snd_pcm_prepare(alsa.ocard);
-		}
-		res = snd_pcm_writei(alsa.ocard, sizbuf, len/2);
+		res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2);
 		if (res == -EPIPE) {
 #if DEBUG
-			ast_log(LOG_DEBUG, "XRUN write\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "XRUN write\n");
 #endif
 			snd_pcm_prepare(alsa.ocard);
-			res = snd_pcm_writei(alsa.ocard, sizbuf, len/2);
-			if (res != len/2) {
+			res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2);
+			if (res != len / 2) {
 				ast_log(LOG_ERROR, "Write error: %s\n", snd_strerror(res));
 				res = -1;
 			} else if (res < 0) {
@@ -664,9 +650,9 @@
 				res = -1;
 			}
 		} else {
-			if (res == -ESTRPIPE) {
+			if (res == -ESTRPIPE)
 				ast_log(LOG_ERROR, "You've got some big problems\n");
-			} else if (res < 0)
+			else if (res < 0)
 				ast_log(LOG_NOTICE, "Error %d on write\n", res);
 		}
 	}
@@ -680,7 +666,7 @@
 static struct ast_frame *alsa_read(struct ast_channel *chan)
 {
 	static struct ast_frame f;
-	static short __buf[FRAME_SIZE + AST_FRIENDLY_OFFSET/2];
+	static short __buf[FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
 	short *buf;
 	static int readpos = 0;
 	static int left = FRAME_SIZE;
@@ -689,7 +675,7 @@
 	int off = 0;
 
 	ast_mutex_lock(&alsalock);
-	/* Acknowledge any pending cmd */	
+	/* Acknowledge any pending cmd */
 	f.frametype = AST_FRAME_NULL;
 	f.subclass = 0;
 	f.samples = 0;
@@ -702,12 +688,11 @@
 	f.delivery.tv_usec = 0;
 
 	state = snd_pcm_state(alsa.icard);
-	if ((state != SND_PCM_STATE_PREPARED) && 
-	    (state != SND_PCM_STATE_RUNNING)) {
+	if ((state != SND_PCM_STATE_PREPARED) && (state != SND_PCM_STATE_RUNNING)) {
 		snd_pcm_prepare(alsa.icard);
 	}
 
-	buf = __buf + AST_FRIENDLY_OFFSET/2;
+	buf = __buf + AST_FRIENDLY_OFFSET / 2;
 
 	r = snd_pcm_readi(alsa.icard, buf + readpos, left);
 	if (r == -EPIPE) {
@@ -745,8 +730,8 @@
 		f.src = "Console";
 		f.mallocd = 0;
 #ifdef ALSA_MONITOR
-		alsa_monitor_read((char *)buf, FRAME_SIZE * 2);
-#endif		
+		alsa_monitor_read((char *) buf, FRAME_SIZE * 2);
+#endif
 
 	}
 	ast_mutex_unlock(&alsalock);
@@ -767,114 +752,117 @@
 	int res = 0;
 
 	ast_mutex_lock(&alsalock);
-	
-	switch(cond) {
-	case AST_CONTROL_BUSY:
-		res = 1;
-		break;
-	case AST_CONTROL_CONGESTION:
-		res = 2;
-		break;
-	case AST_CONTROL_RINGING:
-		break;
-	case -1:
-		res = -1;
-		break;
-	case AST_CONTROL_VIDUPDATE:
-		res = -1;
-		break;
-	case AST_CONTROL_HOLD:
-		ast_verbose( " << Console Has Been Placed on Hold >> \n");
-		ast_moh_start(chan, data, mohinterpret);
-		break;
-	case AST_CONTROL_UNHOLD:
-		ast_verbose( " << Console Has Been Retrieved from Hold >> \n");
-		ast_moh_stop(chan);
-		break;
-	default:
-		ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
-		res = -1;
-	}
-	
+
+	switch (cond) {
+		case AST_CONTROL_BUSY:
+			res = 1;
+			break;
+		case AST_CONTROL_CONGESTION:
+			res = 2;
+			break;
+		case AST_CONTROL_RINGING:
+			break;
+		case -1:
+			res = -1;
+			break;
+		case AST_CONTROL_VIDUPDATE:
+			res = -1;
+			break;
+		case AST_CONTROL_HOLD:
+			ast_verbose(" << Console Has Been Placed on Hold >> \n");
+			ast_moh_start(chan, data, mohinterpret);
+			break;
+		case AST_CONTROL_UNHOLD:
+			ast_verbose(" << Console Has Been Retrieved from Hold >> \n");
+			ast_moh_stop(chan);
+			break;
+		default:
+			ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
+			res = -1;
+	}
+
 	if (res > -1)
 		write(sndcmd[1], &res, sizeof(res));
 
 	ast_mutex_unlock(&alsalock);
 
-	return res;	
+	return res;
 }
 
 static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state)
 {
-	struct ast_channel *tmp;
-	tmp = ast_channel_alloc(1);
-	if (tmp) {
-		tmp->tech = &alsa_tech;
-		ast_string_field_build(tmp, name, "ALSA/%s", indevname);
-		tmp->fds[0] = readdev;
-		tmp->nativeformats = AST_FORMAT_SLINEAR;
-		tmp->readformat = AST_FORMAT_SLINEAR;
-		tmp->writeformat = AST_FORMAT_SLINEAR;
-		tmp->tech_pvt = p;
-		if (!ast_strlen_zero(p->context))
-			ast_copy_string(tmp->context, p->context, sizeof(tmp->context));
-		if (!ast_strlen_zero(p->exten))
-			ast_copy_string(tmp->exten, p->exten, sizeof(tmp->exten));
-		if (!ast_strlen_zero(language))
-			ast_string_field_set(tmp, language, language);
-		p->owner = tmp;
-		ast_setstate(tmp, state);
-		ast_mutex_lock(&usecnt_lock);
-		usecnt++;
-		ast_mutex_unlock(&usecnt_lock);
-		ast_update_use_count();
-		ast_jb_configure(tmp, &global_jbconf);
-		if (state != AST_STATE_DOWN) {
-			if (ast_pbx_start(tmp)) {
-				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
-				ast_hangup(tmp);
-				tmp = NULL;
-			}
-		}
-	}
+	struct ast_channel *tmp = NULL;
+
+	if (!(tmp = ast_channel_alloc(1)))
+		return NULL;
+
+	tmp->tech = &alsa_tech;
+	ast_string_field_build(tmp, name, "ALSA/%s", indevname);
+	tmp->fds[0] = readdev;
+	tmp->nativeformats = AST_FORMAT_SLINEAR;
+	tmp->readformat = AST_FORMAT_SLINEAR;
+	tmp->writeformat = AST_FORMAT_SLINEAR;
+	tmp->tech_pvt = p;
+	if (!ast_strlen_zero(p->context))
+		ast_copy_string(tmp->context, p->context, sizeof(tmp->context));
+	if (!ast_strlen_zero(p->exten))
+		ast_copy_string(tmp->exten, p->exten, sizeof(tmp->exten));
+	if (!ast_strlen_zero(language))
+		ast_string_field_set(tmp, language, language);
+	p->owner = tmp;
+	ast_setstate(tmp, state);
+	ast_mutex_lock(&usecnt_lock);
+	usecnt++;
+	ast_mutex_unlock(&usecnt_lock);
+	ast_update_use_count();
+	ast_jb_configure(tmp, &global_jbconf);
+	if (state != AST_STATE_DOWN) {
+		if (ast_pbx_start(tmp)) {
+			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
+			ast_hangup(tmp);
+			tmp = NULL;
+		}
+	}
+
 	return tmp;
 }
 
 static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause)
 {
 	int oldformat = format;
-	struct ast_channel *tmp=NULL;
+	struct ast_channel *tmp = NULL;
+
 	format &= AST_FORMAT_SLINEAR;
 	if (!format) {
 		ast_log(LOG_NOTICE, "Asked to get a channel of format '%d'\n", oldformat);
 		return NULL;
 	}
-	ast_mutex_lock(&alsalock);
+
+	ast_mutex_lock(&alsalock);
+
 	if (alsa.owner) {
 		ast_log(LOG_NOTICE, "Already have a call on the ALSA channel\n");
 		*cause = AST_CAUSE_BUSY;
-	} else {
-		tmp= alsa_new(&alsa, AST_STATE_DOWN);
-		if (!tmp) {
-			ast_log(LOG_WARNING, "Unable to create new ALSA channel\n");
-		}
-	}
-	ast_mutex_unlock(&alsalock);
+	} else if (!(tmp = alsa_new(&alsa, AST_STATE_DOWN)))
+		ast_log(LOG_WARNING, "Unable to create new ALSA channel\n");
+
+	ast_mutex_unlock(&alsalock);
+
 	return tmp;
 }
 
 static int console_autoanswer(int fd, int argc, char *argv[])
 {
 	int res = RESULT_SUCCESS;;
-	if ((argc != 1) && (argc != 2))
+	if ((argc != 2) && (argc != 3))
 		return RESULT_SHOWUSAGE;
 	ast_mutex_lock(&alsalock);
-	if (argc == 1) {
+	if (argc == 2) {
 		ast_cli(fd, "Auto answer is %s.\n", autoanswer ? "on" : "off");
 	} else {
-		if (!strcasecmp(argv[1], "on"))
+		if (!strcasecmp(argv[2], "on"))
 			autoanswer = -1;
-		else if (!strcasecmp(argv[1], "off"))
+		else if (!strcasecmp(argv[2], "off"))
 			autoanswer = 0;
 		else
 			res = RESULT_SHOWUSAGE;
@@ -888,31 +876,34 @@
 #ifndef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
-	switch(state) {
-	case 0:
-		if (!ast_strlen_zero(word) && !strncasecmp(word, "on", MIN(strlen(word), 2)))
-			return ast_strdup("on");
-	case 1:
-		if (!ast_strlen_zero(word) && !strncasecmp(word, "off", MIN(strlen(word), 3)))
-			return ast_strdup("off");
-	default:
-		return NULL;
+	switch (state) {
+		case 0:
+			if (!ast_strlen_zero(word) && !strncasecmp(word, "on", MIN(strlen(word), 2)))
+				return ast_strdup("on");
+		case 1:
+			if (!ast_strlen_zero(word) && !strncasecmp(word, "off", MIN(strlen(word), 3)))
+				return ast_strdup("off");
+		default:
+			return NULL;
 	}
 	return NULL;
 }
 
 static const char autoanswer_usage[] =
-"Usage: autoanswer [on|off]\n"
-"       Enables or disables autoanswer feature.  If used without\n"
-"       argument, displays the current on/off status of autoanswer.\n"
-"       The default value of autoanswer is in 'alsa.conf'.\n";
+	"Usage: console autoanswer [on|off]\n"
+	"       Enables or disables autoanswer feature.  If used without\n"
+	"       argument, displays the current on/off status of autoanswer.\n"
+	"       The default value of autoanswer is in 'alsa.conf'.\n";
 
 static int console_answer(int fd, int argc, char *argv[])
 {
 	int res = RESULT_SUCCESS;
-	if (argc != 1)
+
+	if (argc != 2)
 		return RESULT_SHOWUSAGE;
-	ast_mutex_lock(&alsalock);
+
+	ast_mutex_lock(&alsalock);
+
 	if (!alsa.owner) {
 		ast_cli(fd, "No one is calling us\n");
 		res = RESULT_FAILURE;
@@ -927,23 +918,29 @@
 		}
 		answer_sound();
 	}
+
 	snd_pcm_prepare(alsa.icard);
 	snd_pcm_start(alsa.icard);
-	ast_mutex_unlock(&alsalock);
+
+	ast_mutex_unlock(&alsalock);
+
 	return RESULT_SUCCESS;
 }
 
 static char sendtext_usage[] =
-"Usage: send text <message>\n"
-"       Sends a text message for display on the remote terminal.\n";
+	"Usage: console send text <message>\n"
+	"       Sends a text message for display on the remote terminal.\n";
 
 static int console_sendtext(int fd, int argc, char *argv[])
 {
-	int tmparg = 2;
+	int tmparg = 3;
 	int res = RESULT_SUCCESS;
-	if (argc < 2)
+
+	if (argc < 3)
 		return RESULT_SHOWUSAGE;
-	ast_mutex_lock(&alsalock);
+
+	ast_mutex_lock(&alsalock);
+
 	if (!alsa.owner) {
 		ast_cli(fd, "No one is calling us\n");
 		res = RESULT_FAILURE;
@@ -951,7 +948,7 @@
 		struct ast_frame f = { AST_FRAME_TEXT, 0 };
 		char text2send[256] = "";
 		text2send[0] = '\0';
-		while(tmparg < argc) {
+		while (tmparg < argc) {
 			strncat(text2send, argv[tmparg++], sizeof(text2send) - strlen(text2send) - 1);
 			strncat(text2send, " ", sizeof(text2send) - strlen(text2send) - 1);
 		}
@@ -969,21 +966,27 @@
 			ast_mutex_unlock(&alsa.owner->lock);
 		}
 	}
-	ast_mutex_unlock(&alsalock);
+
+	ast_mutex_unlock(&alsalock);
+
 	return res;
 }
 
 static char answer_usage[] =
-"Usage: answer\n"
-"       Answers an incoming call on the console (ALSA) channel.\n";
+	"Usage: console answer\n"
+	"       Answers an incoming call on the console (ALSA) channel.\n";
 
 static int console_hangup(int fd, int argc, char *argv[])
 {
 	int res = RESULT_SUCCESS;
-	if (argc != 1)
+
+	if (argc != 2)
 		return RESULT_SHOWUSAGE;
+
 	cursound = -1;
-	ast_mutex_lock(&alsalock);
+
+	ast_mutex_lock(&alsalock);
+
 	if (!alsa.owner && !hookstate) {
 		ast_cli(fd, "No call to hangup up\n");
 		res = RESULT_FAILURE;
@@ -995,14 +998,15 @@
 			ast_mutex_unlock(&alsa.owner->lock);
 		}
 	}
-	ast_mutex_unlock(&alsalock);
+
+	ast_mutex_unlock(&alsalock);
+
 	return res;
 }
 
 static char hangup_usage[] =
-"Usage: hangup\n"
-"       Hangs up any call currently placed on the console.\n";
-
+	"Usage: console hangup\n"
+	"       Hangs up any call currently placed on the console.\n";
 
 static int console_dial(int fd, int argc, char *argv[])
 {
@@ -1010,16 +1014,19 @@
 	char *mye, *myc;
 	char *d;
 	int res = RESULT_SUCCESS;
-	if ((argc != 1) && (argc != 2))
+
+	if ((argc != 2) && (argc != 3))
 		return RESULT_SHOWUSAGE;
-	ast_mutex_lock(&alsalock);
+
+	ast_mutex_lock(&alsalock);
+
 	if (alsa.owner) {
-		if (argc == 2) {
-			d = argv[1];
+		if (argc == 3) {
+			d = argv[2];
 			grab_owner();
 			if (alsa.owner) {
 				struct ast_frame f = { AST_FRAME_DTMF };
-				while(*d) {
+				while (*d) {
 					f.subclass = *d;
 					ast_queue_frame(alsa.owner, &f);
 					d++;
@@ -1033,10 +1040,10 @@
 	} else {
 		mye = exten;
 		myc = context;
-		if (argc == 2) {
-			char *stringp=NULL;
-			strncpy(tmp, argv[1], sizeof(tmp)-1);
-			stringp=tmp;
+		if (argc == 3) {
+			char *stringp = NULL;
+			strncpy(tmp, argv[2], sizeof(tmp) - 1);
+			stringp = tmp;
 			strsep(&stringp, "@");
 			tmp2 = strsep(&stringp, "@");
 			if (!ast_strlen_zero(tmp))
@@ -1045,34 +1052,47 @@
 				myc = tmp2;
 		}
 		if (ast_exists_extension(NULL, myc, mye, 1, NULL)) {
-			strncpy(alsa.exten, mye, sizeof(alsa.exten)-1);
-			strncpy(alsa.context, myc, sizeof(alsa.context)-1);
+			strncpy(alsa.exten, mye, sizeof(alsa.exten) - 1);
+			strncpy(alsa.context, myc, sizeof(alsa.context) - 1);
 			hookstate = 1;
 			alsa_new(&alsa, AST_STATE_RINGING);
 		} else
 			ast_cli(fd, "No such extension '%s' in context '%s'\n", mye, myc);
 	}
-	ast_mutex_unlock(&alsalock);
+
+	ast_mutex_unlock(&alsalock);
+
 	return res;
 }
 
 static char dial_usage[] =
-"Usage: dial [extension[@context]]\n"
-"       Dials a given extension (and context if specified)\n";
-
-
-static struct ast_cli_entry myclis[] = {
-	{ { "answer", NULL }, console_answer, "Answer an incoming console call", answer_usage },
-	{ { "hangup", NULL }, console_hangup, "Hangup a call on the console", hangup_usage },
-	{ { "dial", NULL }, console_dial, "Dial an extension on the console", dial_usage },
-	{ { "send", "text", NULL }, console_sendtext, "Send text to the remote device", sendtext_usage },
-	{ { "autoanswer", NULL }, console_autoanswer, "Sets/displays autoanswer", autoanswer_usage, autoanswer_complete }
+	"Usage: console dial [extension[@context]]\n"

[... 25184 lines stripped ...]


More information about the asterisk-commits mailing list