[asterisk-commits] branch russell/codetest - r7708 in
/team/russell/codetest: ./ apps/ cdr/ chan...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Jan 1 20:43:26 CST 2006
Author: russell
Date: Sun Jan 1 20:42:25 2006
New Revision: 7708
URL: http://svn.digium.com/view/asterisk?rev=7708&view=rev
Log:
Merged revisions 7627,7633,7635-7636,7638-7640,7642-7643,7646-7649,7655-7662,7664,7666-7668,7674,7678,7682,7688,7690-7691,7693,7699,7705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r7627 | markster | 2005-12-25 19:47:28 -0500 (Sun, 25 Dec 2005) | 3 lines
Add "local channel" variation so that we don't read/write to the same
channel... (bug #6058)
................
r7633 | tilghman | 2005-12-26 11:48:12 -0500 (Mon, 26 Dec 2005) | 2 lines
Bug 6057 - Deprecate builtins that have been replaced by functions
................
r7635 | russell | 2005-12-26 13:35:28 -0500 (Mon, 26 Dec 2005) | 10 lines
Merged revisions 7634 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7634 | russell | 2005-12-26 13:19:12 -0500 (Mon, 26 Dec 2005) | 2 lines
cast time_t to an int in printf/scanf (issue #5635)
........
................
r7636 | jdixon | 2005-12-26 15:01:35 -0500 (Mon, 26 Dec 2005) | 3 lines
Added support for Feature Group C CAMA trunks (both DP and MF), and support
for Feature Group D Tamdem trunks inbound (outbound was already there)
................
r7638 | tilghman | 2005-12-26 15:34:46 -0500 (Mon, 26 Dec 2005) | 3 lines
Merged revisions 7637 via svnmerge from
/branches/1.2
................
r7639 | russell | 2005-12-26 16:38:50 -0500 (Mon, 26 Dec 2005) | 5 lines
- normalize some loops
- simplify and reduce code by keeping track of return value
- replace some simple if/then sections with conditional expressions
(issue #6065)
................
r7640 | markster | 2005-12-26 18:56:44 -0500 (Mon, 26 Dec 2005) | 2 lines
Don't do DTMF detect on pseudo's!
................
r7642 | tilghman | 2005-12-26 21:02:23 -0500 (Mon, 26 Dec 2005) | 2 lines
Add SQL_ESC to allow single ticks to be escaped
................
r7643 | tilghman | 2005-12-26 21:05:56 -0500 (Mon, 26 Dec 2005) | 2 lines
Reduce warnings on signedness conversions
................
r7646 | tilghman | 2005-12-27 01:24:28 -0500 (Tue, 27 Dec 2005) | 2 lines
Bug 5183 - Inline stack backtraces
................
r7647 | tilghman | 2005-12-27 01:42:29 -0500 (Tue, 27 Dec 2005) | 2 lines
Bug 5854 - Allow quotation of the second field in extconfig, for the purpose of including commas (for LDAP configuration)
................
r7648 | tilghman | 2005-12-27 01:50:25 -0500 (Tue, 27 Dec 2005) | 2 lines
Bug 5906 - ARRAY dialplan function
................
r7649 | tilghman | 2005-12-27 02:13:37 -0500 (Tue, 27 Dec 2005) | 2 lines
Bug 5382 - Allow VM_CATEGORY in voicemail emails
................
r7655 | russell | 2005-12-27 12:24:54 -0500 (Tue, 27 Dec 2005) | 3 lines
when doing tab completion, iterate the list of matches to count how many there
are instead of having the list of matches generated twice (issue #6066)
................
r7656 | tilghman | 2005-12-27 12:53:48 -0500 (Tue, 27 Dec 2005) | 2 lines
Bug 5237 - Optional filename argument
................
r7657 | russell | 2005-12-27 13:18:41 -0500 (Tue, 27 Dec 2005) | 3 lines
avoid repeated calls to strlen in command completion functions and normalize
some loops
................
r7658 | tilghman | 2005-12-27 14:13:13 -0500 (Tue, 27 Dec 2005) | 2 lines
Bug 4880 - add priority label matching and dialplan function retrieval
................
r7659 | russell | 2005-12-27 14:48:44 -0500 (Tue, 27 Dec 2005) | 2 lines
avoid unneeded calls to strlen in iax2 completion functions
................
r7660 | russell | 2005-12-27 14:59:09 -0500 (Tue, 27 Dec 2005) | 3 lines
avoid duplicate strlen calls for the command completion functions for
'show application' and 'show applications'
................
r7661 | russell | 2005-12-27 15:03:07 -0500 (Tue, 27 Dec 2005) | 2 lines
minor cleanups for another cli completion function ...
................
r7662 | russell | 2005-12-27 16:03:18 -0500 (Tue, 27 Dec 2005) | 2 lines
fix permissions of created recordings (issue #6067)
................
r7664 | russell | 2005-12-28 12:31:12 -0500 (Wed, 28 Dec 2005) | 2 lines
restore alphabetical order for builtin cli commands (issue #6073)
................
r7666 | russell | 2005-12-28 12:37:35 -0500 (Wed, 28 Dec 2005) | 10 lines
Merged revisions 7665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7665 | russell | 2005-12-28 12:35:56 -0500 (Wed, 28 Dec 2005) | 2 lines
fix memory leak in build_rpid (issue #6070)
........
................
r7667 | russell | 2005-12-29 03:15:48 -0500 (Thu, 29 Dec 2005) | 2 lines
avoid multiple strlen calls in complete_queue
................
r7668 | russell | 2005-12-29 03:25:06 -0500 (Thu, 29 Dec 2005) | 2 lines
normalize a loop and avoid multiple strlen calls when completing voicemail users
................
r7674 | oej | 2005-12-30 06:20:13 -0500 (Fri, 30 Dec 2005) | 3 lines
- Reformatting the app_sms help text from html to txt to comply with the rest of the documentation
- Renaming help files to README.<name>
................
r7678 | tilghman | 2005-12-30 09:57:00 -0500 (Fri, 30 Dec 2005) | 3 lines
Merged revisions 7677 via svnmerge from
/branches/1.2
................
r7682 | russell | 2005-12-30 16:18:06 -0500 (Fri, 30 Dec 2005) | 2 lines
update doxygen docs to specify authors
................
r7688 | russell | 2005-12-31 11:35:48 -0500 (Sat, 31 Dec 2005) | 2 lines
update comments to doxygen style
................
r7690 | russell | 2005-12-31 14:45:30 -0500 (Sat, 31 Dec 2005) | 3 lines
- fix some doxygen errors
- add the flag definitions to the page about global options
................
r7691 | russell | 2006-01-01 03:45:29 -0500 (Sun, 01 Jan 2006) | 3 lines
remove some duplicated code (issue #6098)
Also, touch up some formatting
................
r7693 | russell | 2006-01-01 12:50:37 -0500 (Sun, 01 Jan 2006) | 2 lines
clean up some loops and replace some duplicate code with a for loop (issue #6100)
................
r7699 | russell | 2006-01-01 13:37:50 -0500 (Sun, 01 Jan 2006) | 2 lines
fix a couple of doxygen errors
................
r7705 | bweschke | 2006-01-01 20:53:26 -0500 (Sun, 01 Jan 2006) | 3 lines
Fix compiler warnings.
................
Added:
team/russell/codetest/doc/README.app_sms
- copied unchanged from r7705, trunk/doc/README.app_sms
team/russell/codetest/doc/README.channels
- copied unchanged from r7705, trunk/doc/README.channels
team/russell/codetest/doc/README.linkedlists
- copied unchanged from r7705, trunk/doc/README.linkedlists
Removed:
team/russell/codetest/doc/app_sms.html
team/russell/codetest/doc/channel.txt
team/russell/codetest/doc/linkedlists.README
Modified:
team/russell/codetest/ (props changed)
team/russell/codetest/Makefile
team/russell/codetest/UPGRADE.txt
team/russell/codetest/acl.c
team/russell/codetest/aescrypt.c
team/russell/codetest/aeskey.c
team/russell/codetest/alaw.c
team/russell/codetest/app.c
team/russell/codetest/apps/app_adsiprog.c
team/russell/codetest/apps/app_authenticate.c
team/russell/codetest/apps/app_cdr.c
team/russell/codetest/apps/app_chanisavail.c
team/russell/codetest/apps/app_chanspy.c
team/russell/codetest/apps/app_controlplayback.c
team/russell/codetest/apps/app_curl.c
team/russell/codetest/apps/app_db.c
team/russell/codetest/apps/app_dial.c
team/russell/codetest/apps/app_dictate.c
team/russell/codetest/apps/app_directed_pickup.c
team/russell/codetest/apps/app_directory.c
team/russell/codetest/apps/app_dumpchan.c
team/russell/codetest/apps/app_echo.c
team/russell/codetest/apps/app_externalivr.c
team/russell/codetest/apps/app_festival.c
team/russell/codetest/apps/app_flash.c
team/russell/codetest/apps/app_forkcdr.c
team/russell/codetest/apps/app_getcpeid.c
team/russell/codetest/apps/app_hasnewvoicemail.c
team/russell/codetest/apps/app_ices.c
team/russell/codetest/apps/app_image.c
team/russell/codetest/apps/app_intercom.c
team/russell/codetest/apps/app_ivrdemo.c
team/russell/codetest/apps/app_lookupblacklist.c
team/russell/codetest/apps/app_lookupcidname.c
team/russell/codetest/apps/app_macro.c
team/russell/codetest/apps/app_meetme.c
team/russell/codetest/apps/app_milliwatt.c
team/russell/codetest/apps/app_mixmonitor.c
team/russell/codetest/apps/app_mp3.c
team/russell/codetest/apps/app_nbscat.c
team/russell/codetest/apps/app_osplookup.c
team/russell/codetest/apps/app_page.c
team/russell/codetest/apps/app_parkandannounce.c
team/russell/codetest/apps/app_playback.c
team/russell/codetest/apps/app_privacy.c
team/russell/codetest/apps/app_queue.c
team/russell/codetest/apps/app_read.c
team/russell/codetest/apps/app_readfile.c
team/russell/codetest/apps/app_realtime.c
team/russell/codetest/apps/app_record.c
team/russell/codetest/apps/app_rpt.c
team/russell/codetest/apps/app_sayunixtime.c
team/russell/codetest/apps/app_senddtmf.c
team/russell/codetest/apps/app_sendtext.c
team/russell/codetest/apps/app_setcallerid.c
team/russell/codetest/apps/app_setcdruserfield.c
team/russell/codetest/apps/app_settransfercapability.c
team/russell/codetest/apps/app_skel.c
team/russell/codetest/apps/app_sms.c
team/russell/codetest/apps/app_softhangup.c
team/russell/codetest/apps/app_sql_postgres.c
team/russell/codetest/apps/app_stack.c
team/russell/codetest/apps/app_system.c
team/russell/codetest/apps/app_talkdetect.c
team/russell/codetest/apps/app_test.c
team/russell/codetest/apps/app_transfer.c
team/russell/codetest/apps/app_url.c
team/russell/codetest/apps/app_verbose.c
team/russell/codetest/apps/app_voicemail.c
team/russell/codetest/apps/app_waitforring.c
team/russell/codetest/apps/app_waitforsilence.c
team/russell/codetest/apps/app_while.c
team/russell/codetest/apps/app_zapateller.c
team/russell/codetest/apps/app_zapbarge.c
team/russell/codetest/apps/app_zapras.c
team/russell/codetest/apps/app_zapscan.c
team/russell/codetest/asterisk.c
team/russell/codetest/astmm.c
team/russell/codetest/autoservice.c
team/russell/codetest/buildinfo.c
team/russell/codetest/callerid.c
team/russell/codetest/cdr.c
team/russell/codetest/cdr/cdr_csv.c
team/russell/codetest/cdr/cdr_custom.c
team/russell/codetest/cdr/cdr_tds.c
team/russell/codetest/channel.c
team/russell/codetest/channels/chan_agent.c
team/russell/codetest/channels/chan_alsa.c
team/russell/codetest/channels/chan_features.c
team/russell/codetest/channels/chan_h323.c
team/russell/codetest/channels/chan_iax2.c
team/russell/codetest/channels/chan_local.c
team/russell/codetest/channels/chan_mgcp.c
team/russell/codetest/channels/chan_modem.c
team/russell/codetest/channels/chan_modem_aopen.c
team/russell/codetest/channels/chan_modem_bestdata.c
team/russell/codetest/channels/chan_modem_i4l.c
team/russell/codetest/channels/chan_oss.c
team/russell/codetest/channels/chan_phone.c
team/russell/codetest/channels/chan_sip.c
team/russell/codetest/channels/chan_zap.c
team/russell/codetest/channels/iax2-parser.c
team/russell/codetest/channels/iax2-provision.c
team/russell/codetest/chanvars.c
team/russell/codetest/cli.c
team/russell/codetest/config.c
team/russell/codetest/configs/extconfig.conf.sample
team/russell/codetest/configs/func_odbc.conf.sample
team/russell/codetest/configs/zapata.conf.sample
team/russell/codetest/cryptostub.c
team/russell/codetest/db.c
team/russell/codetest/devicestate.c
team/russell/codetest/dnsmgr.c
team/russell/codetest/dsp.c
team/russell/codetest/enum.c
team/russell/codetest/file.c
team/russell/codetest/frame.c
team/russell/codetest/fskmodem.c
team/russell/codetest/funcs/func_cdr.c
team/russell/codetest/funcs/func_cut.c
team/russell/codetest/funcs/func_db.c
team/russell/codetest/funcs/func_enum.c
team/russell/codetest/funcs/func_logic.c
team/russell/codetest/funcs/func_math.c
team/russell/codetest/funcs/func_md5.c
team/russell/codetest/funcs/func_moh.c
team/russell/codetest/funcs/func_odbc.c
team/russell/codetest/funcs/func_strings.c
team/russell/codetest/funcs/func_timeout.c
team/russell/codetest/funcs/func_uri.c
team/russell/codetest/funcs/pbx_functions.c
team/russell/codetest/image.c
team/russell/codetest/include/asterisk/callerid.h
team/russell/codetest/include/asterisk/channel.h
team/russell/codetest/include/asterisk/doxyref.h
team/russell/codetest/include/asterisk/logger.h
team/russell/codetest/include/asterisk/options.h
team/russell/codetest/io.c
team/russell/codetest/loader.c
team/russell/codetest/logger.c
team/russell/codetest/manager.c
team/russell/codetest/muted.c
team/russell/codetest/netsock.c
team/russell/codetest/pbx.c
team/russell/codetest/pbx/pbx_dundi.c
team/russell/codetest/plc.c
team/russell/codetest/privacy.c
team/russell/codetest/res/res_adsi.c
team/russell/codetest/res/res_agi.c
team/russell/codetest/res/res_config_odbc.c
team/russell/codetest/res/res_crypto.c
team/russell/codetest/res/res_features.c
team/russell/codetest/res/res_monitor.c
team/russell/codetest/res/res_musiconhold.c
team/russell/codetest/res/res_odbc.c
team/russell/codetest/res/res_osp.c
team/russell/codetest/rtp.c
team/russell/codetest/say.c
team/russell/codetest/sched.c
team/russell/codetest/slinfactory.c
team/russell/codetest/srv.c
team/russell/codetest/tdd.c
team/russell/codetest/term.c
team/russell/codetest/translate.c
team/russell/codetest/ulaw.c
Propchange: team/russell/codetest/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jan 1 20:42:25 2006
@@ -1,1 +1,1 @@
-/trunk:1-7620
+/trunk:1-7707
Modified: team/russell/codetest/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/Makefile?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/Makefile (original)
+++ team/russell/codetest/Makefile Sun Jan 1 20:42:25 2006
@@ -45,6 +45,11 @@
#Tell gcc to optimize the code
OPTIMIZE+=-O6
+else
+ # Stack backtraces, while useful for debugging, are incompatible with optimizations
+ ifeq (${OSARCH},Linux)
+ CFLAGS+=-DSTACK_BACKTRACES
+ endif
endif
#Overwite config files on "make samples"
@@ -335,7 +340,10 @@
ASTCFLAGS+= $(MALLOC_DEBUG)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
+ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
ASTCFLAGS+= -fomit-frame-pointer
+endif
+
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Modified: team/russell/codetest/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/UPGRADE.txt?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/UPGRADE.txt (original)
+++ team/russell/codetest/UPGRADE.txt Sun Jan 1 20:42:25 2006
@@ -8,3 +8,21 @@
marked deprecated in Asterisk 1.2. An option to disable it was provided with
the default value set to 'on'. The default value for the global priority
jumping option is now 'off'.
+
+* The applications Cut, Sort, DBGet, DBPut, SetCIDNum, SetCIDName, SetRDNIS,
+ AbsoluteTimeout, DigitTimeout, ResponseTimeout, SetLanguage, GetGroupCount,
+ and GetGroupMatchCount were all deprecated in version 1.2, and therefore have
+ been removed in this version. You should use the equivalent dialplan
+ function in places where you have previously used one of these applications.
+
+* The application SetVar has been renamed to Set. The syntax SetVar was marked
+ deprecated in version 1.2 and is no longer recognized in this version.
+
+Variables:
+
+* The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
+ ${CALLERANI}, ${DNID}, ${RDNIS}, ${DATETIME}, ${TIMESTAMP}, ${ACCOUNTCODE},
+ and ${LANGUAGE} have all been deprecated in favor of their related dialplan
+ functions. You are encouraged to move towards the associated dialplan
+ function, as these variables will be removed in a future release.
+
Modified: team/russell/codetest/acl.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/acl.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/acl.c (original)
+++ team/russell/codetest/acl.c Sun Jan 1 20:42:25 2006
@@ -19,7 +19,8 @@
/*! \file
*
* \brief Various sorts of access control
- *
+ *
+ * \author Mark Spencer <markster at digium.com>
*/
#include <stdio.h>
Modified: team/russell/codetest/aescrypt.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/aescrypt.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/aescrypt.c (original)
+++ team/russell/codetest/aescrypt.c Sun Jan 1 20:42:25 2006
@@ -31,12 +31,16 @@
Issue Date: 26/08/2003
*/
+
/*! \file
-\brief This file contains the code for implementing encryption and decryption
- for AES (Rijndael) for block and key sizes of 16, 24 and 32 bytes. It
- can optionally be replaced by code written in assembler using NASM. For
- further details see the file aesopt.h
-*/
+ *
+ * \brief This file contains the code for implementing encryption and decryption
+ * for AES (Rijndael) for block and key sizes of 16, 24 and 32 bytes. It
+ * can optionally be replaced by code written in assembler using NASM. For
+ * further details see the file aesopt.h
+ *
+ * \author Dr Brian Gladman <brg at gladman.me.uk>
+ */
#include "aesopt.h"
Modified: team/russell/codetest/aeskey.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/aeskey.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/aeskey.c (original)
+++ team/russell/codetest/aeskey.c Sun Jan 1 20:42:25 2006
@@ -31,11 +31,15 @@
Issue Date: 26/08/2003
*/
+
/*! \file
-\brief This file contains the code for implementing the key schedule for AES
- (Rijndael) for block and key sizes of 16, 24, and 32 bytes. See aesopt.h
- for further details including optimisation.
-*/
+ *
+ * \brief This file contains the code for implementing the key schedule for AES
+ * (Rijndael) for block and key sizes of 16, 24, and 32 bytes. See aesopt.h
+ * for further details including optimisation.
+ *
+ * \author Dr Brian Gladman <brg at gladman.me.uk>
+ */
#include "aesopt.h"
Modified: team/russell/codetest/alaw.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/alaw.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/alaw.c (original)
+++ team/russell/codetest/alaw.c Sun Jan 1 20:42:25 2006
@@ -19,7 +19,8 @@
/*! \file
*
* \brief u-Law to Signed linear conversion
- *
+ *
+ * \author Mark Spencer <markster at digium.com>
*/
#include "asterisk.h"
Modified: team/russell/codetest/app.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/app.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/app.c (original)
+++ team/russell/codetest/app.c Sun Jan 1 20:42:25 2006
@@ -19,7 +19,8 @@
/*! \file
*
* \brief Convenient Application Routines
- *
+ *
+ * \author Mark Spencer <markster at digium.com>
*/
#include <stdio.h>
Modified: team/russell/codetest/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_adsiprog.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_adsiprog.c (original)
+++ team/russell/codetest/apps/app_adsiprog.c Sun Jan 1 20:42:25 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Program Asterisk ADSI Scripts into phone
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_authenticate.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_authenticate.c (original)
+++ team/russell/codetest/apps/app_authenticate.c Sun Jan 1 20:42:25 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Execute arbitrary authenticate commands
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_cdr.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_cdr.c (original)
+++ team/russell/codetest/apps/app_cdr.c Sun Jan 1 20:42:25 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Applications connected with CDR engine
+ *
+ * Martin Pycko <martinp at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_chanisavail.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_chanisavail.c (original)
+++ team/russell/codetest/apps/app_chanisavail.c Sun Jan 1 20:42:25 2006
@@ -18,8 +18,12 @@
*/
/*! \file
-* \brief Check if Channel is Available
-*
+ *
+ * \brief Check if Channel is Available
+ *
+ * \author Mark Spencer <markster at digium.com>
+ * \author James Golovich <james at gnuinter.net>
+
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_chanspy.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_chanspy.c (original)
+++ team/russell/codetest/apps/app_chanspy.c Sun Jan 1 20:42:25 2006
@@ -17,8 +17,11 @@
*/
/*! \file
+ *
* \brief ChanSpy: Listen in on any channel.
- *
+ *
+ * \author Anthony Minessale II <anthmct at yahoo.com>
+ *
* \ingroup applications
*/
@@ -439,8 +442,8 @@
if (recbase) {
char filename[512];
- snprintf(filename,sizeof(filename),"%s/%s.%ld.raw",ast_config_AST_MONITOR_DIR, recbase, time(NULL));
- if ((fd = open(filename, O_CREAT | O_WRONLY, O_TRUNC)) <= 0) {
+ snprintf(filename,sizeof(filename),"%s/%s.%d.raw",ast_config_AST_MONITOR_DIR, recbase, (int)time(NULL));
+ if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0644)) <= 0) {
ast_log(LOG_WARNING, "Cannot open %s for recording\n", filename);
fd = 0;
}
Modified: team/russell/codetest/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_controlplayback.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_controlplayback.c (original)
+++ team/russell/codetest/apps/app_controlplayback.c Sun Jan 1 20:42:25 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Trivial application to control playback of a sound file
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_curl.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_curl.c (original)
+++ team/russell/codetest/apps/app_curl.c Sun Jan 1 20:42:25 2006
@@ -18,7 +18,12 @@
*/
/*! \file
+ *
* \brief Curl - App to load a URL
+ *
+ * \author Tilghman Lesher <curl-20050919 at the-tilghman.com>
+ *
+ * \note Brian Wilkins <bwilkins at cfl.rr.com> (Added POST option)
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_db.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_db.c (original)
+++ team/russell/codetest/apps/app_db.c Sun Jan 1 20:42:25 2006
@@ -21,6 +21,9 @@
/*! \file
*
* \brief Database access functions
+ *
+ * \author Mark Spencer <markster at digium.com>
+ * \author Jefferson Noxon <jeff at debian.org>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_dial.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_dial.c (original)
+++ team/russell/codetest/apps/app_dial.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief dial() & retrydial() - Trivial application to dial a channel and send an URL on answer
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_dictate.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_dictate.c (original)
+++ team/russell/codetest/apps/app_dictate.c Sun Jan 1 20:42:25 2006
@@ -21,6 +21,8 @@
/*! \file
*
* \brief Virtual Dictation Machine Application For Asterisk
+ *
+ * \author Anthony Minessale II <anthmct at yahoo.com>
*
* \ingroup applications
*/
@@ -47,7 +49,7 @@
static char *tdesc = "Virtual Dictation Machine";
static char *app = "Dictate";
static char *synopsis = "Virtual Dictation Machine";
-static char *desc = " Dictate([<base_dir>])\n"
+static char *desc = " Dictate([<base_dir>[|<filename>]])\n"
"Start dictation machine using optional base dir for files.\n";
@@ -80,7 +82,7 @@
static int dictate_exec(struct ast_channel *chan, void *data)
{
- char *mydata, *argv[2], *path = NULL, filein[256];
+ char *mydata, *argv[3], *path = NULL, filein[256], *filename = "";
char dftbase[256];
char *base;
struct ast_flags flags = {0};
@@ -112,7 +114,9 @@
} else {
base = dftbase;
}
-
+ if (argc && argv[1]) {
+ filename = argv[1];
+ }
oldr = chan->readformat;
if ((res = ast_set_read_format(chan, AST_FORMAT_SLINEAR)) < 0) {
ast_log(LOG_WARNING, "Unable to set to linear mode.\n");
@@ -122,13 +126,17 @@
ast_answer(chan);
ast_safe_sleep(chan, 200);
- for(res = 0; !res;) {
- if (ast_app_getdata(chan, "dictate/enter_filename", filein, sizeof(filein), 0) ||
- ast_strlen_zero(filein)) {
- res = -1;
- break;
+ for (res = 0; !res;) {
+ if (ast_strlen_zero(filename)) {
+ if (ast_app_getdata(chan, "dictate/enter_filename", filein, sizeof(filein), 0) ||
+ ast_strlen_zero(filein)) {
+ res = -1;
+ break;
+ }
+ } else {
+ ast_copy_string(filein, filename, sizeof(filein));
+ filename = "";
}
-
mkdir(base, 0755);
len = strlen(base) + strlen(filein) + 2;
if (!path || len > maxlen) {
Modified: team/russell/codetest/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_directed_pickup.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_directed_pickup.c (original)
+++ team/russell/codetest/apps/app_directed_pickup.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Directed Call Pickup Support
+ *
+ * \author Joshua Colp <jcolp at asterlink.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_directory.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_directory.c (original)
+++ team/russell/codetest/apps/app_directory.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Provide a directory of extensions
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_dumpchan.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_dumpchan.c (original)
+++ team/russell/codetest/apps/app_dumpchan.c Sun Jan 1 20:42:25 2006
@@ -21,7 +21,9 @@
/*! \file
*
* \brief Application to dump channel variables
- *
+ *
+ * \author Anthony Minessale <anthmct at yahoo.com>
+ *
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_echo.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_echo.c (original)
+++ team/russell/codetest/apps/app_echo.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Echo application -- play back what you hear to evaluate latency
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_externalivr.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_externalivr.c (original)
+++ team/russell/codetest/apps/app_externalivr.c Sun Jan 1 20:42:25 2006
@@ -22,7 +22,12 @@
/*! \file
*
* \brief External IVR application interface
- *
+ *
+ * \author Kevin P. Fleming <kpfleming at digium.com>
+ *
+ * \note Portions taken from the file-based music-on-hold work
+ * created by Anthony Minessale II in res_musiconhold.c
+ *
* \ingroup applications
*/
@@ -94,9 +99,9 @@
char tmp[256];
if (!data) {
- snprintf(tmp, sizeof(tmp), "%c,%10ld", event, time(NULL));
+ snprintf(tmp, sizeof(tmp), "%c,%10d", event, (int)time(NULL));
} else {
- snprintf(tmp, sizeof(tmp), "%c,%10ld,%s", event, time(NULL), data);
+ snprintf(tmp, sizeof(tmp), "%c,%10d,%s", event, (int)time(NULL), data);
}
fprintf(handle, "%s\n", tmp);
Modified: team/russell/codetest/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_festival.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_festival.c (original)
+++ team/russell/codetest/apps/app_festival.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Connect to festival
+ *
+ * \author Christos Ricudis <ricudis at itc.auth.gr>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_flash.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_flash.c (original)
+++ team/russell/codetest/apps/app_flash.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief App to flash a zap trunk
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_forkcdr.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_forkcdr.c (original)
+++ team/russell/codetest/apps/app_forkcdr.c Sun Jan 1 20:42:25 2006
@@ -18,6 +18,10 @@
/*! \file
*
* \brief Fork CDR application
+ *
+ * \author Anthony Minessale anthmct at yahoo.com
+ *
+ * \note Development of this app Sponsered/Funded by TAAN Softworks Corp
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_getcpeid.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_getcpeid.c (original)
+++ team/russell/codetest/apps/app_getcpeid.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Get ADSI CPE ID
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_hasnewvoicemail.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_hasnewvoicemail.c (original)
+++ team/russell/codetest/apps/app_hasnewvoicemail.c Sun Jan 1 20:42:25 2006
@@ -23,6 +23,11 @@
/*! \file
*
* \brief HasVoicemail application
+ *
+ * \author Todd Freeman <freeman at andrews.edu>
+ *
+ * \note 95% based on HasNewVoicemail by
+ * Tilghman Lesher <asterisk-hasnewvoicemail-app at the-tilghman.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_ices.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_ices.c (original)
+++ team/russell/codetest/apps/app_ices.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Stream to an icecast server via ICES (see contrib/asterisk-ices.xml)
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_image.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_image.c (original)
+++ team/russell/codetest/apps/app_image.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief App to transmit an image
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_intercom.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_intercom.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_intercom.c (original)
+++ team/russell/codetest/apps/app_intercom.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Use /dev/dsp as an intercom.
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_ivrdemo.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_ivrdemo.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_ivrdemo.c (original)
+++ team/russell/codetest/apps/app_ivrdemo.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief IVR Demo application
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_lookupblacklist.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_lookupblacklist.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_lookupblacklist.c (original)
+++ team/russell/codetest/apps/app_lookupblacklist.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief App to lookup the callerid number, and see if it is blacklisted
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*
Modified: team/russell/codetest/apps/app_lookupcidname.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_lookupcidname.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_lookupcidname.c (original)
+++ team/russell/codetest/apps/app_lookupcidname.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief App to set callerid name from database, based on directory number
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_macro.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_macro.c (original)
+++ team/russell/codetest/apps/app_macro.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Dial plan macro Implementation
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/russell/codetest/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/codetest/apps/app_meetme.c?rev=7708&r1=7707&r2=7708&view=diff
==============================================================================
--- team/russell/codetest/apps/app_meetme.c (original)
+++ team/russell/codetest/apps/app_meetme.c Sun Jan 1 20:42:25 2006
@@ -19,6 +19,8 @@
/*! \file
*
* \brief Meet me conference bridge
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
@@ -139,6 +141,7 @@
ast_mutex_t listenlock; /* Conference specific lock (listeners) */
char confno[AST_MAX_EXTENSION]; /* Conference */
struct ast_channel *chan; /* Announcements channel */
+ struct ast_channel *lchan; /* Listen/Record channel */
int fd; /* Announcements fd */
int zapconf; /* Zaptel Conf # */
int users; /* Number of active users */
@@ -509,7 +512,18 @@
cnf = NULL;
goto cnfout;
}
-
+ cnf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
+ if (cnf->lchan) {
+ ast_set_read_format(cnf->lchan, AST_FORMAT_SLINEAR);
+ ast_set_write_format(cnf->lchan, AST_FORMAT_SLINEAR);
+ ztc.chan = 0;
+ ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
+ if (ioctl(cnf->lchan->fds[0], ZT_SETCONF, &ztc)) {
+ ast_log(LOG_WARNING, "Error setting conference\n");
+ ast_hangup(cnf->lchan);
+ cnf->lchan = NULL;
+ }
+ }
/* Fill the conference struct */
cnf->start = time(NULL);
cnf->zapconf = ztc.confno;
@@ -816,6 +830,8 @@
}
if (conf->origframe)
ast_frfree(conf->origframe);
+ if (conf->lchan)
+ ast_hangup(conf->lchan);
if (conf->chan)
ast_hangup(conf->chan);
else
@@ -885,7 +901,7 @@
}
}
- if ((conf->recording == MEETME_RECORD_OFF) && ((confflags & CONFFLAG_RECORDCONF) || (conf->chan))) {
+ if ((conf->recording == MEETME_RECORD_OFF) && ((confflags & CONFFLAG_RECORDCONF) || (conf->lchan))) {
pthread_attr_init(&conf->attr);
pthread_attr_setdetachstate(&conf->attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&conf->recordthread, &conf->attr, recordthread, conf);
@@ -2231,16 +2247,16 @@
int x;
const char *oldrecordingfilename = NULL;
[... 4639 lines stripped ...]
More information about the asterisk-commits
mailing list