[svn-commits] branch crichter/frame-data - r7990 in
/team/crichter/frame-data: ./ apps/ cha...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Jan 11 16:39:21 CST 2006
Author: crichter
Date: Wed Jan 11 16:37:20 2006
New Revision: 7990
URL: http://svn.digium.com/view/asterisk?rev=7990&view=rev
Log:
Merged revisions 7650-7651,7669-7670,7839-7840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/team/crichter/0.3.0
................
r7650 | crichter | 2005-12-27 11:04:29 +0100 (Di, 27 Dez 2005) | 1 line
added support for reading ptp config from /etc/misdn-init.conf, added option for path of misdn-init.conf. Updated docs and samples. Now there is no L2 Setting in misdn.conf anymore.
................
r7651 | crichter | 2005-12-27 11:23:55 +0100 (Di, 27 Dez 2005) | 275 lines
Merged revisions 7565-7570,7573-7576,7578-7579,7583,7587,7589-7590,7594,7600,7602,7604,7607,7609,7613-7620,7627,7633,7635-7636,7638-7640,7642-7643,7646-7649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r7565 | markster | 2005-12-21 00:36:22 +0100 (Mi, 21 Dez 2005) | 2 lines
Avoid multiple free
................
r7566 | jdixon | 2005-12-21 00:41:59 +0100 (Mi, 21 Dez 2005) | 2 lines
New version, including half/semi-half duplex modes and system announcements
................
r7567 | jdixon | 2005-12-21 00:53:26 +0100 (Mi, 21 Dez 2005) | 2 lines
Added docs for new features (duplex mode & tailmessages)
................
r7568 | russell | 2005-12-21 09:44:51 +0100 (Mi, 21 Dez 2005) | 4 lines
- change the default value of the global priority jumping option to 'off'
- update the UPGRADE.txt file to reflect this change
- remove old information from UPGRADE.txt
................
r7569 | russell | 2005-12-21 09:51:44 +0100 (Mi, 21 Dez 2005) | 4 lines
add a header to indicate who the call was parked by to the ParkedCall manager
events generated when parking status is requested. This header was already
in the events that are generated when the call is first parked. (issue #5883)
................
r7570 | russell | 2005-12-21 10:33:41 +0100 (Mi, 21 Dez 2005) | 2 lines
add Log application for generating custom log messages from the dialplan (issue #5287)
................
r7573 | tilghman | 2005-12-21 16:16:08 +0100 (Mi, 21 Dez 2005) | 2 lines
Bug 5734 - add status variables indicating the success or failure of the realtime apps
................
r7574 | russell | 2005-12-21 17:36:48 +0100 (Mi, 21 Dez 2005) | 2 lines
move heading to the top of the file
................
r7575 | tilghman | 2005-12-21 18:09:54 +0100 (Mi, 21 Dez 2005) | 2 lines
Bug 5440 - Add STAT() dialplan function
................
r7576 | tilghman | 2005-12-21 19:43:10 +0100 (Mi, 21 Dez 2005) | 2 lines
Bug 5055 - Simple SQL commands from the dialplan
................
r7578 | tilghman | 2005-12-21 20:24:56 +0100 (Mi, 21 Dez 2005) | 3 lines
Merged revisions 7577 via svnmerge from
/branches/1.2
................
r7579 | bweschke | 2005-12-21 20:44:51 +0100 (Mi, 21 Dez 2005) | 3 lines
Bug #6040 - Documentation correction
................
r7583 | tilghman | 2005-12-21 21:02:36 +0100 (Mi, 21 Dez 2005) | 3 lines
Merged revisions 7582 via svnmerge from
/branches/1.2
................
r7587 | russell | 2005-12-22 03:20:44 +0100 (Do, 22 Dez 2005) | 7 lines
- construct the difference and have only one call to snprintf in build_via
- convert some while loops to for loops
- localize some variables and remove unneeded initializations
- store result of get_header locally so it only has to be called once
- remove some duplicate calls to strcasecmp by storing result
(issue #5955)
................
r7589 | kpfleming | 2005-12-22 04:49:41 +0100 (Do, 22 Dez 2005) | 2 lines
don't try to build func_odbc when ODBC headers/libraries are not present
................
r7590 | kpfleming | 2005-12-22 04:50:44 +0100 (Do, 22 Dez 2005) | 2 lines
forward-port per-peer videosupport changes from branches/1.2
................
r7594 | russell | 2005-12-22 17:14:38 +0100 (Do, 22 Dez 2005) | 2 lines
remove stray unlock (issue #5955)
................
r7600 | russell | 2005-12-22 21:38:43 +0100 (Do, 22 Dez 2005) | 11 lines
Merged revisions 7599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7599 | russell | 2005-12-22 15:36:47 -0500 (Thu, 22 Dec 2005) | 3 lines
revert changes to videosupport to allow per-peer setting, since it isn't quite
complete and there is not an obvious fix at this point
........
................
r7602 | tilghman | 2005-12-22 23:06:35 +0100 (Do, 22 Dez 2005) | 3 lines
Merged revisions 7601 via svnmerge from
/branches/1.2
................
r7604 | bweschke | 2005-12-23 00:59:13 +0100 (Fr, 23 Dez 2005) | 3 lines
Another app documentation tweak.
................
r7607 | kpfleming | 2005-12-23 04:04:38 +0100 (Fr, 23 Dez 2005) | 11 lines
Merged revisions 7606 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7606 | kpfleming | 2005-12-22 21:01:24 -0600 (Thu, 22 Dec 2005) | 3 lines
add license reference to copyright notice displayed when CLI session begins
add 'show warranty' and 'show license' CLI commands (still need a complete list of non-GPL components included in Asterisk)
........
................
r7609 | tilghman | 2005-12-23 07:39:44 +0100 (Fr, 23 Dez 2005) | 3 lines
Merged revisions 7608 via svnmerge from
/branches/1.2
................
r7613 | tilghman | 2005-12-23 21:43:11 +0100 (Fr, 23 Dez 2005) | 2 lines
Make the English language of date format 'Q' and 'q' sound a little bit more natural
................
r7614 | tilghman | 2005-12-23 22:03:25 +0100 (Fr, 23 Dez 2005) | 2 lines
Bug 5327 - new function FILTER and optional argument to CALLERID
................
r7615 | tilghman | 2005-12-23 23:47:26 +0100 (Fr, 23 Dez 2005) | 2 lines
Alphabetize the functions list
................
r7616 | tilghman | 2005-12-24 00:42:58 +0100 (Sa, 24 Dez 2005) | 2 lines
Bug 5759 - Remove unused datetime code (current DateTime app is in app_sayunixtime)
................
r7617 | russell | 2005-12-24 06:18:40 +0100 (Sa, 24 Dez 2005) | 5 lines
minor cleanups ...
- use for loops instead of while loops for basic list traversals
- remove an unused 'res' variable
- formatting tweaks
................
r7618 | russell | 2005-12-24 07:23:36 +0100 (Sa, 24 Dez 2005) | 7 lines
minor cleanups ...
- use for loops instead of while loops for basic list traversals
- only calculate word length one time in CLI complete functions
- use calloc instead of malloc + memset
- remove some unnecessary casts
- formatting tweaks
................
r7619 | tilghman | 2005-12-25 01:25:41 +0100 (So, 25 Dez 2005) | 2 lines
Bug 5727 - reduce duplicate code
................
r7620 | markster | 2005-12-25 02:27:47 +0100 (So, 25 Dez 2005) | 2 lines
Fix multiple free of a frame (bug #6058)
................
r7627 | markster | 2005-12-26 01:47:28 +0100 (Mo, 26 Dez 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 17:48:12 +0100 (Mo, 26 Dez 2005) | 2 lines
Bug 6057 - Deprecate builtins that have been replaced by functions
................
r7635 | russell | 2005-12-26 19:35:28 +0100 (Mo, 26 Dez 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 21:01:35 +0100 (Mo, 26 Dez 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 21:34:46 +0100 (Mo, 26 Dez 2005) | 3 lines
Merged revisions 7637 via svnmerge from
/branches/1.2
................
r7639 | russell | 2005-12-26 22:38:50 +0100 (Mo, 26 Dez 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-27 00:56:44 +0100 (Di, 27 Dez 2005) | 2 lines
Don't do DTMF detect on pseudo's!
................
r7642 | tilghman | 2005-12-27 03:02:23 +0100 (Di, 27 Dez 2005) | 2 lines
Add SQL_ESC to allow single ticks to be escaped
................
r7643 | tilghman | 2005-12-27 03:05:56 +0100 (Di, 27 Dez 2005) | 2 lines
Reduce warnings on signedness conversions
................
r7646 | tilghman | 2005-12-27 07:24:28 +0100 (Di, 27 Dez 2005) | 2 lines
Bug 5183 - Inline stack backtraces
................
r7647 | tilghman | 2005-12-27 07:42:29 +0100 (Di, 27 Dez 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 07:50:25 +0100 (Di, 27 Dez 2005) | 2 lines
Bug 5906 - ARRAY dialplan function
................
r7649 | tilghman | 2005-12-27 08:13:37 +0100 (Di, 27 Dez 2005) | 2 lines
Bug 5382 - Allow VM_CATEGORY in voicemail emails
................
................
r7669 | crichter | 2005-12-30 09:59:56 +0100 (Fr, 30 Dez 2005) | 1 line
added send_text functionality for displaying text on ISDN Phones
................
r7670 | crichter | 2005-12-30 10:21:41 +0100 (Fr, 30 Dez 2005) | 76 lines
Merged revisions 7655-7662,7664,7666-7668 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r7655 | russell | 2005-12-27 18:24:54 +0100 (Di, 27 Dez 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 18:53:48 +0100 (Di, 27 Dez 2005) | 2 lines
Bug 5237 - Optional filename argument
................
r7657 | russell | 2005-12-27 19:18:41 +0100 (Di, 27 Dez 2005) | 3 lines
avoid repeated calls to strlen in command completion functions and normalize
some loops
................
r7658 | tilghman | 2005-12-27 20:13:13 +0100 (Di, 27 Dez 2005) | 2 lines
Bug 4880 - add priority label matching and dialplan function retrieval
................
r7659 | russell | 2005-12-27 20:48:44 +0100 (Di, 27 Dez 2005) | 2 lines
avoid unneeded calls to strlen in iax2 completion functions
................
r7660 | russell | 2005-12-27 20:59:09 +0100 (Di, 27 Dez 2005) | 3 lines
avoid duplicate strlen calls for the command completion functions for
'show application' and 'show applications'
................
r7661 | russell | 2005-12-27 21:03:07 +0100 (Di, 27 Dez 2005) | 2 lines
minor cleanups for another cli completion function ...
................
r7662 | russell | 2005-12-27 22:03:18 +0100 (Di, 27 Dez 2005) | 2 lines
fix permissions of created recordings (issue #6067)
................
r7664 | russell | 2005-12-28 18:31:12 +0100 (Mi, 28 Dez 2005) | 2 lines
restore alphabetical order for builtin cli commands (issue #6073)
................
r7666 | russell | 2005-12-28 18:37:35 +0100 (Mi, 28 Dez 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 09:15:48 +0100 (Do, 29 Dez 2005) | 2 lines
avoid multiple strlen calls in complete_queue
................
r7668 | russell | 2005-12-29 09:25:06 +0100 (Do, 29 Dez 2005) | 2 lines
normalize a loop and avoid multiple strlen calls when completing voicemail users
................
................
r7839 | crichter | 2006-01-06 16:02:11 +0100 (Fr, 06 Jan 2006) | 1 line
merged the changes from the config-update branch 7714:7838
................
r7840 | crichter | 2006-01-06 17:22:57 +0100 (Fr, 06 Jan 2006) | 1 line
removed README.misdn-init and misdn-init script, they live now @ mISDN
................
Added:
team/crichter/frame-data/contrib/init.d/rc.suse.asterisk (props changed)
- copied unchanged from r7981, team/crichter/0.3.0/contrib/init.d/rc.suse.asterisk
team/crichter/frame-data/contrib/scripts/safe_asterisk_restart
- copied unchanged from r7981, team/crichter/0.3.0/contrib/scripts/safe_asterisk_restart
team/crichter/frame-data/doc/README.app_sms (props changed)
- copied unchanged from r7981, team/crichter/0.3.0/doc/README.app_sms
team/crichter/frame-data/doc/README.channels (props changed)
- copied unchanged from r7981, team/crichter/0.3.0/doc/README.channels
team/crichter/frame-data/doc/README.linkedlists (props changed)
- copied unchanged from r7981, team/crichter/0.3.0/doc/README.linkedlists
team/crichter/frame-data/funcs/func_base64.c
- copied unchanged from r7981, team/crichter/0.3.0/funcs/func_base64.c
team/crichter/frame-data/funcs/func_rand.c
- copied unchanged from r7981, team/crichter/0.3.0/funcs/func_rand.c
team/crichter/frame-data/include/asterisk/stringfields.h
- copied unchanged from r7981, team/crichter/0.3.0/include/asterisk/stringfields.h
Removed:
team/crichter/frame-data/ast_expr.y
team/crichter/frame-data/channels/chan_modem.c
team/crichter/frame-data/channels/chan_modem_aopen.c
team/crichter/frame-data/channels/chan_modem_bestdata.c
team/crichter/frame-data/channels/chan_modem_i4l.c
team/crichter/frame-data/doc/app_sms.html
team/crichter/frame-data/doc/channel.txt
team/crichter/frame-data/doc/linkedlists.README
Modified:
team/crichter/frame-data/UPGRADE.txt
team/crichter/frame-data/acl.c
team/crichter/frame-data/alaw.c
team/crichter/frame-data/app.c
team/crichter/frame-data/apps/ (props changed)
team/crichter/frame-data/apps/app_adsiprog.c
team/crichter/frame-data/apps/app_authenticate.c
team/crichter/frame-data/apps/app_cdr.c
team/crichter/frame-data/apps/app_chanisavail.c
team/crichter/frame-data/apps/app_chanspy.c
team/crichter/frame-data/apps/app_controlplayback.c
team/crichter/frame-data/apps/app_curl.c
team/crichter/frame-data/apps/app_db.c
team/crichter/frame-data/apps/app_dial.c
team/crichter/frame-data/apps/app_dictate.c
team/crichter/frame-data/apps/app_directed_pickup.c
team/crichter/frame-data/apps/app_directory.c
team/crichter/frame-data/apps/app_disa.c
team/crichter/frame-data/apps/app_dumpchan.c
team/crichter/frame-data/apps/app_echo.c
team/crichter/frame-data/apps/app_externalivr.c
team/crichter/frame-data/apps/app_festival.c
team/crichter/frame-data/apps/app_flash.c
team/crichter/frame-data/apps/app_forkcdr.c
team/crichter/frame-data/apps/app_getcpeid.c
team/crichter/frame-data/apps/app_hasnewvoicemail.c
team/crichter/frame-data/apps/app_ices.c
team/crichter/frame-data/apps/app_image.c
team/crichter/frame-data/apps/app_intercom.c
team/crichter/frame-data/apps/app_ivrdemo.c
team/crichter/frame-data/apps/app_lookupblacklist.c
team/crichter/frame-data/apps/app_lookupcidname.c
team/crichter/frame-data/apps/app_macro.c
team/crichter/frame-data/apps/app_meetme.c
team/crichter/frame-data/apps/app_milliwatt.c
team/crichter/frame-data/apps/app_mixmonitor.c
team/crichter/frame-data/apps/app_mp3.c
team/crichter/frame-data/apps/app_nbscat.c
team/crichter/frame-data/apps/app_osplookup.c
team/crichter/frame-data/apps/app_page.c
team/crichter/frame-data/apps/app_parkandannounce.c
team/crichter/frame-data/apps/app_playback.c
team/crichter/frame-data/apps/app_privacy.c
team/crichter/frame-data/apps/app_queue.c
team/crichter/frame-data/apps/app_read.c
team/crichter/frame-data/apps/app_readfile.c
team/crichter/frame-data/apps/app_realtime.c
team/crichter/frame-data/apps/app_record.c
team/crichter/frame-data/apps/app_rpt.c
team/crichter/frame-data/apps/app_sayunixtime.c
team/crichter/frame-data/apps/app_senddtmf.c
team/crichter/frame-data/apps/app_sendtext.c
team/crichter/frame-data/apps/app_setcallerid.c
team/crichter/frame-data/apps/app_setcdruserfield.c
team/crichter/frame-data/apps/app_settransfercapability.c
team/crichter/frame-data/apps/app_skel.c
team/crichter/frame-data/apps/app_sms.c
team/crichter/frame-data/apps/app_softhangup.c
team/crichter/frame-data/apps/app_sql_postgres.c
team/crichter/frame-data/apps/app_stack.c
team/crichter/frame-data/apps/app_system.c
team/crichter/frame-data/apps/app_talkdetect.c
team/crichter/frame-data/apps/app_test.c
team/crichter/frame-data/apps/app_transfer.c
team/crichter/frame-data/apps/app_url.c
team/crichter/frame-data/apps/app_verbose.c
team/crichter/frame-data/apps/app_voicemail.c
team/crichter/frame-data/apps/app_waitforring.c
team/crichter/frame-data/apps/app_waitforsilence.c
team/crichter/frame-data/apps/app_while.c
team/crichter/frame-data/apps/app_zapateller.c
team/crichter/frame-data/apps/app_zapbarge.c
team/crichter/frame-data/apps/app_zapras.c
team/crichter/frame-data/apps/app_zapscan.c
team/crichter/frame-data/ast_expr2.fl
team/crichter/frame-data/ast_expr2f.c
team/crichter/frame-data/asterisk.c
team/crichter/frame-data/astmm.c
team/crichter/frame-data/autoservice.c
team/crichter/frame-data/buildinfo.c
team/crichter/frame-data/cdr.c
team/crichter/frame-data/channel.c
team/crichter/frame-data/channels/ (props changed)
team/crichter/frame-data/channels/Makefile
team/crichter/frame-data/channels/chan_agent.c
team/crichter/frame-data/channels/chan_alsa.c
team/crichter/frame-data/channels/chan_features.c
team/crichter/frame-data/channels/chan_h323.c
team/crichter/frame-data/channels/chan_iax2.c
team/crichter/frame-data/channels/chan_local.c
team/crichter/frame-data/channels/chan_mgcp.c
team/crichter/frame-data/channels/chan_oss.c
team/crichter/frame-data/channels/chan_phone.c
team/crichter/frame-data/channels/chan_sip.c
team/crichter/frame-data/channels/chan_zap.c
team/crichter/frame-data/channels/iax2-parser.c
team/crichter/frame-data/channels/iax2-provision.c
team/crichter/frame-data/channels/misdn/isdn_lib.c
team/crichter/frame-data/chanvars.c
team/crichter/frame-data/cli.c
team/crichter/frame-data/config.c
team/crichter/frame-data/configs/features.conf.sample
team/crichter/frame-data/configs/manager.conf.sample
team/crichter/frame-data/configs/sip.conf.sample
team/crichter/frame-data/configs/zapata.conf.sample
team/crichter/frame-data/contrib/scripts/managerproxy.pl
team/crichter/frame-data/db.c
team/crichter/frame-data/db1-ast/ (props changed)
team/crichter/frame-data/devicestate.c
team/crichter/frame-data/dns.c
team/crichter/frame-data/dnsmgr.c
team/crichter/frame-data/doc/CODING-GUIDELINES
team/crichter/frame-data/doc/README.cdr
team/crichter/frame-data/doc/README.variables
team/crichter/frame-data/dsp.c
team/crichter/frame-data/editline/ (props changed)
team/crichter/frame-data/enum.c
team/crichter/frame-data/frame.c
team/crichter/frame-data/fskmodem.c
team/crichter/frame-data/funcs/ (props changed)
team/crichter/frame-data/funcs/Makefile
team/crichter/frame-data/funcs/func_cdr.c
team/crichter/frame-data/funcs/func_cut.c
team/crichter/frame-data/funcs/func_db.c
team/crichter/frame-data/funcs/func_enum.c
team/crichter/frame-data/funcs/func_logic.c
team/crichter/frame-data/funcs/func_math.c
team/crichter/frame-data/funcs/func_md5.c
team/crichter/frame-data/funcs/func_moh.c
team/crichter/frame-data/funcs/func_odbc.c
team/crichter/frame-data/funcs/func_strings.c
team/crichter/frame-data/funcs/func_timeout.c
team/crichter/frame-data/funcs/func_uri.c
team/crichter/frame-data/funcs/pbx_functions.c
team/crichter/frame-data/image.c
team/crichter/frame-data/include/asterisk/app.h
team/crichter/frame-data/include/asterisk/astmm.h
team/crichter/frame-data/include/asterisk/astobj.h
team/crichter/frame-data/include/asterisk/callerid.h
team/crichter/frame-data/include/asterisk/channel.h
team/crichter/frame-data/include/asterisk/chanspy.h
team/crichter/frame-data/include/asterisk/dns.h
team/crichter/frame-data/include/asterisk/doxyref.h
team/crichter/frame-data/include/asterisk/frame.h
team/crichter/frame-data/include/asterisk/image.h
team/crichter/frame-data/include/asterisk/linkedlists.h
team/crichter/frame-data/include/asterisk/manager.h
team/crichter/frame-data/include/asterisk/options.h
team/crichter/frame-data/include/asterisk/pbx.h
team/crichter/frame-data/include/asterisk/rtp.h
team/crichter/frame-data/include/asterisk/strings.h
team/crichter/frame-data/include/asterisk/translate.h
team/crichter/frame-data/include/asterisk/utils.h
team/crichter/frame-data/io.c
team/crichter/frame-data/loader.c
team/crichter/frame-data/logger.c
team/crichter/frame-data/manager.c
team/crichter/frame-data/muted.c
team/crichter/frame-data/netsock.c
team/crichter/frame-data/pbx/ (props changed)
team/crichter/frame-data/pbx.c
team/crichter/frame-data/pbx/pbx_config.c
team/crichter/frame-data/pbx/pbx_spool.c
team/crichter/frame-data/plc.c
team/crichter/frame-data/res/res_adsi.c
team/crichter/frame-data/res/res_config_odbc.c
team/crichter/frame-data/res/res_features.c
team/crichter/frame-data/res/res_monitor.c
team/crichter/frame-data/res/res_odbc.c
team/crichter/frame-data/rtp.c
team/crichter/frame-data/say.c
team/crichter/frame-data/sched.c
team/crichter/frame-data/slinfactory.c
team/crichter/frame-data/stdtime/ (props changed)
team/crichter/frame-data/tdd.c
team/crichter/frame-data/term.c
team/crichter/frame-data/translate.c
team/crichter/frame-data/ulaw.c
team/crichter/frame-data/utils.c
Modified: team/crichter/frame-data/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/UPGRADE.txt?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/UPGRADE.txt (original)
+++ team/crichter/frame-data/UPGRADE.txt Wed Jan 11 16:37:20 2006
@@ -18,6 +18,9 @@
* 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.
+* app_read has been updated to use the newer options codes, using "skip" or
+ "noanswer" will not work. Use s or n. Also there is a new feature i, for
+ using indication tones, so typing in skip would give you unexpected results.
Variables:
* The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
@@ -26,3 +29,6 @@
functions. You are encouraged to move towards the associated dialplan
function, as these variables will be removed in a future release.
+The SIP channel:
+
+* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
Modified: team/crichter/frame-data/acl.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/acl.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/acl.c (original)
+++ team/crichter/frame-data/acl.c Wed Jan 11 16:37:20 2006
@@ -19,7 +19,8 @@
/*! \file
*
* \brief Various sorts of access control
- *
+ *
+ * \author Mark Spencer <markster at digium.com>
*/
#include <stdio.h>
Modified: team/crichter/frame-data/alaw.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/alaw.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/alaw.c (original)
+++ team/crichter/frame-data/alaw.c Wed Jan 11 16:37:20 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/crichter/frame-data/app.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/app.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/app.c (original)
+++ team/crichter/frame-data/app.c Wed Jan 11 16:37:20 2006
@@ -19,7 +19,8 @@
/*! \file
*
* \brief Convenient Application Routines
- *
+ *
+ * \author Mark Spencer <markster at digium.com>
*/
#include <stdio.h>
@@ -278,47 +279,57 @@
return 0;
}
-int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digits,int between)
-{
- char *ptr;
+int ast_dtmf_stream(struct ast_channel *chan, struct ast_channel *peer, const char *digits, int between)
+{
+ const char *ptr;
int res = 0;
- struct ast_frame f;
+ struct ast_frame f = {
+ .frametype = AST_FRAME_DTMF,
+ .src = "ast_dtmf_stream"
+ };
+
if (!between)
between = 100;
if (peer)
res = ast_autoservice_start(peer);
- if (!res) {
- res = ast_waitfor(chan,100);
- if (res > -1) {
- for (ptr=digits; *ptr; ptr++) {
- if (*ptr == 'w') {
- res = ast_safe_sleep(chan, 500);
- if (res)
- break;
- continue;
- }
- memset(&f, 0, sizeof(f));
- f.frametype = AST_FRAME_DTMF;
+ if (!res)
+ res = ast_waitfor(chan, 100);
+
+ /* ast_waitfor will return the number of remaining ms on success */
+ if (res < 0)
+ return res;
+
+ for (ptr = digits; *ptr; ptr++) {
+ if (*ptr == 'w') {
+ /* 'w' -- wait half a second */
+ if ((res = ast_safe_sleep(chan, 500)))
+ break;
+ } else if (strchr("0123456789*#abcdfABCDF", *ptr)) {
+ /* Character represents valid DTMF */
+ if (*ptr == 'f' || *ptr == 'F') {
+ /* ignore return values if not supported by channel */
+ ast_indicate(chan, AST_CONTROL_FLASH);
+ } else {
f.subclass = *ptr;
- f.src = "ast_dtmf_stream";
- if (strchr("0123456789*#abcdABCD",*ptr)==NULL) {
- ast_log(LOG_WARNING, "Illegal DTMF character '%c' in string. (0-9*#aAbBcCdD allowed)\n",*ptr);
- } else {
- res = ast_write(chan, &f);
- if (res)
- break;
- /* pause between digits */
- res = ast_safe_sleep(chan,between);
- if (res)
- break;
- }
- }
- }
- if (peer)
- res = ast_autoservice_stop(peer);
- }
+ if ((res = ast_write(chan, &f)))
+ break;
+ }
+ /* pause between digits */
+ if ((res = ast_safe_sleep(chan, between)))
+ break;
+ } else
+ ast_log(LOG_WARNING, "Illegal DTMF character '%c' in string. (0-9*#aAbBcCdD allowed)\n",*ptr);
+ }
+
+ if (peer) {
+ /* Stop autoservice on the peer channel, but don't overwrite any error condition
+ that has occurred previously while acting on the primary channel */
+ if (ast_autoservice_stop(peer) && !res)
+ res = -1;
+ }
+
return res;
}
Propchange: team/crichter/frame-data/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan 11 16:37:20 2006
@@ -1,1 +1,3 @@
.depend
+*.a
+*.so
Modified: team/crichter/frame-data/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_adsiprog.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_adsiprog.c (original)
+++ team/crichter/frame-data/apps/app_adsiprog.c Wed Jan 11 16:37:20 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Program Asterisk ADSI Scripts into phone
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
Modified: team/crichter/frame-data/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_authenticate.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_authenticate.c (original)
+++ team/crichter/frame-data/apps/app_authenticate.c Wed Jan 11 16:37:20 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Execute arbitrary authenticate commands
+ *
+ * \author Mark Spencer <markster at digium.com>
*
* \ingroup applications
*/
@@ -41,6 +44,23 @@
#include "asterisk/app.h"
#include "asterisk/astdb.h"
#include "asterisk/utils.h"
+#include "asterisk/options.h"
+
+enum {
+ OPT_ACCOUNT = (1 << 0),
+ OPT_DATABASE = (1 << 1),
+ OPT_JUMP = (1 << 2),
+ OPT_MULTIPLE = (1 << 3),
+ OPT_REMOVE = (1 << 4),
+} auth_option_flags;
+
+AST_APP_OPTIONS(auth_app_options, {
+ AST_APP_OPTION('a', OPT_ACCOUNT),
+ AST_APP_OPTION('d', OPT_DATABASE),
+ AST_APP_OPTION('j', OPT_JUMP),
+ AST_APP_OPTION('m', OPT_MULTIPLE),
+ AST_APP_OPTION('r', OPT_REMOVE),
+});
static char *tdesc = "Authentication Application";
@@ -49,9 +69,9 @@
static char *synopsis = "Authenticate a user";
static char *descrip =
-" Authenticate(password[|options]): This application asks the caller to enter a\n"
-"given password in order to continue dialplan execution. If the password begins\n"
-"with the '/' character, it is interpreted as a file which contains a list of\n"
+" Authenticate(password[|options[|maxdigits]]): This application asks the caller\n"
+"to enter a given password in order to continue dialplan execution. If the password\n"
+"begins with the '/' character, it is interpreted as a file which contains a list of\n"
"valid passwords, listed 1 password per line in the file.\n"
" When using a database key, the value associated with the key can be anything.\n"
"Users have three attempts to authenticate before the channel is hung up. If the\n"
@@ -66,6 +86,10 @@
" the file. When one of the passwords is matched, the channel will have\n"
" its account code set to the corresponding account code in the file.\n"
" r - Remove the database key upon successful entry (valid with 'd' only)\n"
+" maxdigits - maximum acceptable number of digits. Stops reading after\n"
+" maxdigits have been entered (without requiring the user to\n"
+" press the '#' key).\n"
+" Defaults to 0 - no limit - wait for the user press the '#' key.\n"
;
STANDARD_LOCAL_USER;
@@ -75,13 +99,19 @@
static int auth_exec(struct ast_channel *chan, void *data)
{
int res=0;
- int jump = 0;
int retries;
struct localuser *u;
- char password[256]="";
char passwd[256];
- char *opts;
char *prompt;
+ int maxdigits;
+ char *argcopy =NULL;
+ struct ast_flags flags = {0};
+
+ AST_DECLARE_APP_ARGS(arglist,
+ AST_APP_ARG(password);
+ AST_APP_ARG(options);
+ AST_APP_ARG(maxdigits);
+ );
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Authenticate requires an argument(password)\n");
@@ -98,37 +128,49 @@
}
}
- strncpy(password, data, sizeof(password) - 1);
- opts=strchr(password, '|');
- if (opts) {
- *opts = 0;
- opts++;
- } else
- opts = "";
- if (strchr(opts, 'j'))
- jump = 1;
+ argcopy = ast_strdupa(data);
+ if (!argcopy) {
+ ast_log(LOG_ERROR, "Out of memory!\n");
+ LOCAL_USER_REMOVE(u);
+ return -1;
+ }
+
+ AST_STANDARD_APP_ARGS(arglist,argcopy);
+
+ if (!ast_strlen_zero(arglist.options)) {
+ ast_app_parse_options(auth_app_options, &flags, NULL, arglist.options);
+ }
+
+ if (!ast_strlen_zero(arglist.maxdigits)) {
+ maxdigits = atoi(arglist.maxdigits);
+ if ((maxdigits<1) || (maxdigits>sizeof(passwd)-2))
+ maxdigits = sizeof(passwd) - 2;
+ } else {
+ maxdigits = sizeof(passwd) - 2;
+ }
+
/* Start asking for password */
prompt = "agent-pass";
for (retries = 0; retries < 3; retries++) {
- res = ast_app_getdata(chan, prompt, passwd, sizeof(passwd) - 2, 0);
+ res = ast_app_getdata(chan, prompt, passwd, maxdigits, 0);
if (res < 0)
break;
res = 0;
- if (password[0] == '/') {
- if (strchr(opts, 'd')) {
+ if (arglist.password[0] == '/') {
+ if (ast_test_flag(&flags,OPT_DATABASE)) {
char tmp[256];
/* Compare against a database key */
- if (!ast_db_get(password + 1, passwd, tmp, sizeof(tmp))) {
+ if (!ast_db_get(arglist.password + 1, passwd, tmp, sizeof(tmp))) {
/* It's a good password */
- if (strchr(opts, 'r')) {
- ast_db_del(password + 1, passwd);
+ if (ast_test_flag(&flags,OPT_REMOVE)) {
+ ast_db_del(arglist.password + 1, passwd);
}
break;
}
} else {
/* Compare against a file */
FILE *f;
- f = fopen(password, "r");
+ f = fopen(arglist.password, "r");
if (f) {
char buf[256] = "";
char md5passwd[33] = "";
@@ -138,7 +180,7 @@
fgets(buf, sizeof(buf), f);
if (!feof(f) && !ast_strlen_zero(buf)) {
buf[strlen(buf) - 1] = '\0';
- if (strchr(opts, 'm')) {
+ if (ast_test_flag(&flags,OPT_MULTIPLE)) {
md5secret = strchr(buf, ':');
if (md5secret == NULL)
continue;
@@ -146,13 +188,13 @@
md5secret++;
ast_md5_hash(md5passwd, passwd);
if (!strcmp(md5passwd, md5secret)) {
- if (strchr(opts, 'a'))
+ if (ast_test_flag(&flags,OPT_ACCOUNT))
ast_cdr_setaccount(chan, buf);
break;
}
} else {
if (!strcmp(passwd, buf)) {
- if (strchr(opts, 'a'))
+ if (ast_test_flag(&flags,OPT_ACCOUNT))
ast_cdr_setaccount(chan, buf);
break;
}
@@ -161,7 +203,7 @@
}
fclose(f);
if (!ast_strlen_zero(buf)) {
- if (strchr(opts, 'm')) {
+ if (ast_test_flag(&flags,OPT_MULTIPLE)) {
if (md5secret && !strcmp(md5passwd, md5secret))
break;
} else {
@@ -170,23 +212,23 @@
}
}
} else
- ast_log(LOG_WARNING, "Unable to open file '%s' for authentication: %s\n", password, strerror(errno));
+ ast_log(LOG_WARNING, "Unable to open file '%s' for authentication: %s\n", arglist.password, strerror(errno));
}
} else {
/* Compare against a fixed password */
- if (!strcmp(passwd, password))
+ if (!strcmp(passwd, arglist.password))
break;
}
prompt="auth-incorrect";
}
if ((retries < 3) && !res) {
- if (strchr(opts, 'a') && !strchr(opts, 'm'))
+ if (ast_test_flag(&flags,OPT_ACCOUNT) && !ast_test_flag(&flags,OPT_MULTIPLE))
ast_cdr_setaccount(chan, passwd);
res = ast_streamfile(chan, "auth-thankyou", chan->language);
if (!res)
res = ast_waitstream(chan, "");
} else {
- if (jump && ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) {
+ if (ast_test_flag(&flags,OPT_JUMP) && ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) {
res = 0;
} else {
if (!ast_streamfile(chan, "vm-goodbye", chan->language))
Modified: team/crichter/frame-data/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_cdr.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_cdr.c (original)
+++ team/crichter/frame-data/apps/app_cdr.c Wed Jan 11 16:37:20 2006
@@ -17,7 +17,10 @@
*/
/*! \file
+ *
* \brief Applications connected with CDR engine
+ *
+ * Martin Pycko <martinp at digium.com>
*
* \ingroup applications
*/
Modified: team/crichter/frame-data/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_chanisavail.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_chanisavail.c (original)
+++ team/crichter/frame-data/apps/app_chanisavail.c Wed Jan 11 16:37:20 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/crichter/frame-data/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_chanspy.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_chanspy.c (original)
+++ team/crichter/frame-data/apps/app_chanspy.c Wed Jan 11 16:37:20 2006
@@ -2,6 +2,7 @@
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 2005 Anthony Minessale II (anthmct at yahoo.com)
+ * Copyright (C) 2005 - 2006, Digium, Inc.
*
* Disclaimed to Digium
*
@@ -17,8 +18,11 @@
*/
/*! \file
+ *
* \brief ChanSpy: Listen in on any channel.
- *
+ *
+ * \author Anthony Minessale II <anthmct at yahoo.com>
+ *
* \ingroup applications
*/
@@ -208,9 +212,9 @@
static void stop_spying(struct ast_channel *chan, struct ast_channel_spy *spy)
{
- /* If our status has changed, then the channel we're spying on is gone....
+ /* If our status has changed to DONE, then the channel we're spying on is gone....
DON'T TOUCH IT!!! RUN AWAY!!! */
- if (spy->status != CHANSPY_RUNNING)
+ if (spy->status == CHANSPY_DONE)
return;
if (!chan)
Modified: team/crichter/frame-data/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_controlplayback.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_controlplayback.c (original)
+++ team/crichter/frame-data/apps/app_controlplayback.c Wed Jan 11 16:37:20 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/crichter/frame-data/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_curl.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_curl.c (original)
+++ team/crichter/frame-data/apps/app_curl.c Wed Jan 11 16:37:20 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/crichter/frame-data/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_db.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_db.c (original)
+++ team/crichter/frame-data/apps/app_db.c Wed Jan 11 16:37:20 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/crichter/frame-data/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/apps/app_dial.c?rev=7990&r1=7989&r2=7990&view=diff
==============================================================================
--- team/crichter/frame-data/apps/app_dial.c (original)
+++ team/crichter/frame-data/apps/app_dial.c Wed Jan 11 16:37:20 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
*/
@@ -162,7 +164,7 @@
" S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
" answered the call.\n"
" t - Allow the called party to transfer the calling party by sending the\n"
-" DTMF sequence defiend in features.conf.\n"
+" DTMF sequence defined in features.conf.\n"
" T - Allow the calling party to transfer the called party by sending the\n"
" DTMF sequence defined in features.conf.\n"
[... 11247 lines stripped ...]
More information about the svn-commits
mailing list