[asterisk-commits] branch oej/multiparking - r8111 in
/team/oej/multiparking: ./ apps/ channels/...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jan 16 15:12:34 MST 2006
Author: oej
Date: Mon Jan 16 16:10:44 2006
New Revision: 8111
URL: http://svn.digium.com/view/asterisk?rev=8111&view=rev
Log:
Merged revisions 7940,7945-7948,7952-7954,7956,7958,7961-7962,7964,7966-7969,7971,7973-7975,7977-7978,7985,7987-7989,7991,7995-7996,7998,8000-8001,8007-8017,8019-8024,8030,8034,8037-8038,8042,8044-8045,8048-8051,8056-8060,8063-8066,8068-8073,8075-8076,8078-8080,8087-8090,8099-8105 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r7940 | oej | 2006-01-10 09:52:55 +0100 (Tue, 10 Jan 2006) | 4 lines
Importing rev 7939 from 1.2
- Add reference to README.tds
- Reformat table
................
r7945 | mogorman | 2006-01-10 17:08:28 +0100 (Tue, 10 Jan 2006) | 3 lines
6186 amd 6187 with minor revisions. added arg
parsing from macro.
................
r7946 | mattf | 2006-01-10 22:13:18 +0100 (Tue, 10 Jan 2006) | 2 lines
Make sure to update the config file for chan_zap to include japanese caller id
................
r7947 | mattf | 2006-01-10 22:34:04 +0100 (Tue, 10 Jan 2006) | 2 lines
Update chan_phone to indicate FLASH properley (#4935)
................
r7948 | mattf | 2006-01-10 22:35:45 +0100 (Tue, 10 Jan 2006) | 2 lines
Allow a digitstream to contain a flash character ('f' or 'F') when sending dtmf string to a channel. (#4935)
................
r7952 | russell | 2006-01-11 00:51:42 +0100 (Wed, 11 Jan 2006) | 8 lines
Add wrappers for commonly used memory allocation functions. These wrappers
add an automatically generated Asterisk log message if the allocation fails
for some reason. Otherwise, they are functionally the same, with the
exception of ast_strdup and ast_strndup. These functions have the added
ability to accept a NULL argument without error, which will just be ignored
without generating an error. The coding guidelines have also been updated to
reflect all of this information. (issue #4996)
................
r7953 | russell | 2006-01-11 01:06:15 +0100 (Wed, 11 Jan 2006) | 2 lines
fix typo, thanks Qwell!
................
r7954 | russell | 2006-01-11 02:20:29 +0100 (Wed, 11 Jan 2006) | 3 lines
convert some channels to use the memory allocation wrappers.
(This is being added to the janitor projects list.)
................
r7956 | tilghman | 2006-01-11 02:31:28 +0100 (Wed, 11 Jan 2006) | 3 lines
Merged revisions 7955 via svnmerge from
/branches/1.2
................
r7958 | russell | 2006-01-11 04:13:45 +0100 (Wed, 11 Jan 2006) | 10 lines
Merged revisions 7957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7957 | russell | 2006-01-10 22:12:44 -0500 (Tue, 10 Jan 2006) | 2 lines
fix a little typo
........
................
r7961 | russell | 2006-01-11 05:19:48 +0100 (Wed, 11 Jan 2006) | 2 lines
block 7960
................
r7962 | russell | 2006-01-11 05:31:59 +0100 (Wed, 11 Jan 2006) | 3 lines
fix locking bug - lock instead of unlock (see commit to r7960 to branches/1.2)
store hint list using linked list macros
................
r7964 | russell | 2006-01-11 05:39:53 +0100 (Wed, 11 Jan 2006) | 2 lines
remove stray header
................
r7966 | russell | 2006-01-11 05:54:13 +0100 (Wed, 11 Jan 2006) | 2 lines
block 7965
................
r7967 | russell | 2006-01-11 06:00:45 +0100 (Wed, 11 Jan 2006) | 3 lines
lock list of translators *before* recalculating translation matrix.
Also, store translators using linked list macros.
................
r7968 | russell | 2006-01-11 06:05:13 +0100 (Wed, 11 Jan 2006) | 3 lines
- add AST_LIST_HEAD_NOLOCK_STATIC, similar to AST_LIST_HEAD_STATIC, but without the lock!
- store registered channel backends using linked list macros
................
r7969 | russell | 2006-01-11 06:23:19 +0100 (Wed, 11 Jan 2006) | 3 lines
add doxygen documentation and fix various issues with ast_dtmf_stream
(discussed in issue #6087)
................
r7971 | russell | 2006-01-11 06:26:51 +0100 (Wed, 11 Jan 2006) | 2 lines
block 7970
................
r7973 | russell | 2006-01-11 06:47:21 +0100 (Wed, 11 Jan 2006) | 10 lines
Merged revisions 7972 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7972 | russell | 2006-01-11 00:46:39 -0500 (Wed, 11 Jan 2006) | 2 lines
fix mem leak on module unload (issue #6190)
........
................
r7974 | russell | 2006-01-11 07:35:34 +0100 (Wed, 11 Jan 2006) | 2 lines
oops. :)
................
r7975 | mogorman | 2006-01-11 07:56:28 +0100 (Wed, 11 Jan 2006) | 5 lines
added feature from 5750 with whitespace fixing.
allows for meetme show list to tell how long user
has been in confrence and reports it to manager
when user leaves confrence.
................
r7977 | russell | 2006-01-11 08:19:52 +0100 (Wed, 11 Jan 2006) | 2 lines
block 7976
................
r7978 | russell | 2006-01-11 08:21:16 +0100 (Wed, 11 Jan 2006) | 2 lines
fix temp greetings with odbc storage (issue #6078)
................
r7985 | russell | 2006-01-11 19:40:42 +0100 (Wed, 11 Jan 2006) | 3 lines
replace malloc+memset with a call to ast_calloc, also removing the error
message that is no longer necessary (issue #6205)
................
r7987 | russell | 2006-01-11 20:13:33 +0100 (Wed, 11 Jan 2006) | 10 lines
Merged revisions 7986 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7986 | russell | 2006-01-11 14:08:53 -0500 (Wed, 11 Jan 2006) | 2 lines
move variable to correct scope (issue #6197)
........
................
r7988 | russell | 2006-01-11 20:23:16 +0100 (Wed, 11 Jan 2006) | 2 lines
fix incorrect return value (issue #6202)
................
r7989 | mogorman | 2006-01-11 20:52:29 +0100 (Wed, 11 Jan 2006) | 3 lines
Added macros from 6198 and 6203. also added better
error reporting in func_cut
................
r7991 | russell | 2006-01-11 23:41:34 +0100 (Wed, 11 Jan 2006) | 2 lines
conversions to memory allocation wrappers (issue #6210)
................
r7995 | mogorman | 2006-01-12 03:20:19 +0100 (Thu, 12 Jan 2006) | 3 lines
Added automatic folder feature described in 6090
with bounds checking.
................
r7996 | russell | 2006-01-12 03:35:45 +0100 (Thu, 12 Jan 2006) | 2 lines
typo
................
r7998 | tilghman | 2006-01-12 06:47:30 +0100 (Thu, 12 Jan 2006) | 2 lines
Bug 6213 - Morse code app
................
r8000 | tilghman | 2006-01-12 07:15:56 +0100 (Thu, 12 Jan 2006) | 3 lines
Merged revisions 7999 via svnmerge from
/branches/1.2
................
r8001 | mogorman | 2006-01-12 07:43:24 +0100 (Thu, 12 Jan 2006) | 3 lines
added page macro examples from 6077 with minor typo
fixes.
................
r8007 | bweschke | 2006-01-12 16:11:49 +0100 (Thu, 12 Jan 2006) | 3 lines
Use argument macro in app_dictate #6222
................
r8008 | bweschke | 2006-01-12 16:28:01 +0100 (Thu, 12 Jan 2006) | 3 lines
Use argument macro in app_voicemail #6221
................
r8009 | bweschke | 2006-01-12 16:51:13 +0100 (Thu, 12 Jan 2006) | 3 lines
New memory wrapper changes.
................
r8010 | mogorman | 2006-01-12 17:00:04 +0100 (Thu, 12 Jan 2006) | 3 lines
removed unused variable and config parsing for it
as to bug 6219
................
r8011 | bweschke | 2006-01-12 17:00:13 +0100 (Thu, 12 Jan 2006) | 3 lines
More new memory wrapper work and initializing some memory allocations to zero where they weren't before.
................
r8012 | bweschke | 2006-01-12 17:08:06 +0100 (Thu, 12 Jan 2006) | 3 lines
More new memory wrapper work.
................
r8013 | mogorman | 2006-01-12 17:15:01 +0100 (Thu, 12 Jan 2006) | 3 lines
As we no longer have chan_modem this file is not used
either thanks rizzo in refrence to 6217
................
r8014 | mattf | 2006-01-12 18:12:12 +0100 (Thu, 12 Jan 2006) | 2 lines
Changes to add udptl to asterisk (preliminary merging of the t.38 patch)
................
r8015 | mattf | 2006-01-12 18:14:58 +0100 (Thu, 12 Jan 2006) | 2 lines
More changes to make t.38 support work
................
r8016 | markster | 2006-01-12 18:27:38 +0100 (Thu, 12 Jan 2006) | 2 lines
Merge rizzo's range optimizations (bug #6101)
................
r8017 | markster | 2006-01-12 18:34:10 +0100 (Thu, 12 Jan 2006) | 2 lines
Remove unnecessary (but unexecutable) unlocks, cleanup code (bug #6220)
................
r8019 | russell | 2006-01-12 19:35:03 +0100 (Thu, 12 Jan 2006) | 2 lines
fix breakage from new feature committed in r7995
................
r8020 | bweschke | 2006-01-12 20:01:35 +0100 (Thu, 12 Jan 2006) | 3 lines
Remove an unneccessary unlock and do away with the error msg about not being able to unlock the lock. #6201
................
r8021 | mogorman | 2006-01-12 20:07:18 +0100 (Thu, 12 Jan 2006) | 4 lines
Added option for limiting a user from logging in
as multiple agents at same time. bug 6046 thanks
ppyy
................
r8022 | mogorman | 2006-01-12 20:09:36 +0100 (Thu, 12 Jan 2006) | 2 lines
Minor revisions from bug 6090
................
r8023 | mogorman | 2006-01-12 20:15:20 +0100 (Thu, 12 Jan 2006) | 2 lines
Oops... need to keep my trunk folder clean...
................
r8024 | mogorman | 2006-01-12 20:28:47 +0100 (Thu, 12 Jan 2006) | 3 lines
More cosmetic changes. thanks qwell and everyone
else.
................
r8030 | mogorman | 2006-01-12 20:45:38 +0100 (Thu, 12 Jan 2006) | 3 lines
some error checking added into g and a option
if there is no parens.
................
r8034 | mogorman | 2006-01-12 21:04:52 +0100 (Thu, 12 Jan 2006) | 3 lines
I will never touch VM again...
thanks qwell for spotting mistakes.
................
r8037 | tilghman | 2006-01-12 22:12:25 +0100 (Thu, 12 Jan 2006) | 2 lines
Fix typos that caused voicemail not to compile.
................
r8038 | tilghman | 2006-01-12 22:18:46 +0100 (Thu, 12 Jan 2006) | 2 lines
Bug 6223 - Remove unnecessary header that caused FreeBSD not to compile
................
r8042 | mogorman | 2006-01-13 03:34:10 +0100 (Fri, 13 Jan 2006) | 3 lines
forgot to take out createlink sample along with
other part.
................
r8044 | bweschke | 2006-01-13 04:25:23 +0100 (Fri, 13 Jan 2006) | 3 lines
More memory wrapper and cleanup work. #6226 w/one very minor compile fix mod in app_rpt.c
................
r8045 | bweschke | 2006-01-13 04:34:31 +0100 (Fri, 13 Jan 2006) | 3 lines
More memory wrapper cleanup. #6224
................
r8048 | russell | 2006-01-13 07:11:41 +0100 (Fri, 13 Jan 2006) | 2 lines
fix spelling errors (issue #6227)
................
r8049 | mogorman | 2006-01-13 07:43:27 +0100 (Fri, 13 Jan 2006) | 2 lines
added some minor changes from bug 6046 thanks ppyy
................
r8050 | mogorman | 2006-01-13 07:49:23 +0100 (Fri, 13 Jan 2006) | 2 lines
adding more output for shutdown. as per 6102
................
r8051 | tilghman | 2006-01-13 08:14:42 +0100 (Fri, 13 Jan 2006) | 2 lines
Somebody complained the that length of the dah wasn't quite up to spec...
................
r8056 | bweschke | 2006-01-13 17:01:40 +0100 (Fri, 13 Jan 2006) | 3 lines
Range should be inclusive, not exclusive, of the end of the range.
................
r8057 | mogorman | 2006-01-13 18:02:15 +0100 (Fri, 13 Jan 2006) | 5 lines
allow app_directed_pickup to try to pickup
multiple channels at the same time. however it
does not work in cases where dial was called
with multiple devices. bug 5694.
................
r8058 | bweschke | 2006-01-13 18:28:22 +0100 (Fri, 13 Jan 2006) | 3 lines
Address the condition where X-ClientCode could be NULL or an empty string - from a -dev posting.
................
r8059 | bweschke | 2006-01-13 18:35:12 +0100 (Fri, 13 Jan 2006) | 3 lines
Another patch against this code (the right one now) to deal with cyclic ranges. #6230
................
r8060 | mogorman | 2006-01-13 18:39:56 +0100 (Fri, 13 Jan 2006) | 3 lines
added two new features to meetme, autofill and
autopause. thanks twisted from 5577
................
r8063 | bweschke | 2006-01-13 19:23:30 +0100 (Fri, 13 Jan 2006) | 3 lines
Implement the autologoffunavail option in chan_agent (#6038 with some minor mods)
................
r8064 | mogorman | 2006-01-13 19:30:49 +0100 (Fri, 13 Jan 2006) | 3 lines
Made chan_agent code parsing more robust and
implemented new macro code. from 6228.
................
r8065 | russell | 2006-01-13 19:38:55 +0100 (Fri, 13 Jan 2006) | 9 lines
Various cleanups from comments in an email from Luigi Rizzo. Thank you!
- Use a cleaner syntax for declaring the allocation macros
- Fix return value for ast_strdup/ast_strndup
- remove safe_strdup from app_macro, since ast_strup does the same thing
- fix a place in app_queue where ast_calloc+strncpy was used instead of
ast_strdup. If you are helping out with these conversions, please watch out
for other places where this is done.
- add a note to the coding guidelines about the fix to app_queue
................
r8066 | mogorman | 2006-01-13 20:09:05 +0100 (Fri, 13 Jan 2006) | 2 lines
Added forward context option from 5497
................
r8068 | mogorman | 2006-01-13 23:05:46 +0100 (Fri, 13 Jan 2006) | 4 lines
make voicemail files group writable and uses a
nicer function for creating dirs as described in
5929
................
r8069 | mogorman | 2006-01-13 23:59:19 +0100 (Fri, 13 Jan 2006) | 3 lines
Added QUEUE_MEMBER_COUNT and QUEUE_MEMBER_LIST
from bug 5451
................
r8070 | mogorman | 2006-01-14 01:32:30 +0100 (Sat, 14 Jan 2006) | 4 lines
added feature for pausing and unpausing the
monitor app from manager and in the call through
features.conf bug 5395 for the patch
................
r8071 | bweschke | 2006-01-14 04:25:38 +0100 (Sat, 14 Jan 2006) | 3 lines
Code cleanup spawned from an earlier commit today r8063. Standardize manager event responses and queue_log behavior on callbacklogoff.
................
r8072 | mattf | 2006-01-14 17:18:03 +0100 (Sat, 14 Jan 2006) | 2 lines
Add mission options to agents.conf sample file (#6234)
................
r8073 | mattf | 2006-01-14 19:53:10 +0100 (Sat, 14 Jan 2006) | 2 lines
Small documentation update for new AST_FRAME_MODEM type
................
r8075 | tilghman | 2006-01-14 20:08:03 +0100 (Sat, 14 Jan 2006) | 3 lines
Merged revisions 8074 via svnmerge from
/branches/1.2
................
r8076 | tilghman | 2006-01-14 20:30:37 +0100 (Sat, 14 Jan 2006) | 2 lines
Bug 6238 - Janitor - update to app_args macros
................
r8078 | tilghman | 2006-01-15 06:50:19 +0100 (Sun, 15 Jan 2006) | 2 lines
Prepare for removal of DBGet/DBPut manager commands, by allowing Getvar to get functions (Setvar can already set functions)
................
r8079 | tilghman | 2006-01-15 19:02:46 +0100 (Sun, 15 Jan 2006) | 2 lines
Allow application arguments to be quoted, allowing '|' characters inside arguments
................
r8080 | tilghman | 2006-01-15 19:08:04 +0100 (Sun, 15 Jan 2006) | 2 lines
Clarify description of ARRAY function
................
r8087 | russell | 2006-01-16 02:32:46 +0100 (Mon, 16 Jan 2006) | 2 lines
block appropriate revisions from being merged from 1.2 ...
................
r8088 | russell | 2006-01-16 02:36:10 +0100 (Mon, 16 Jan 2006) | 1 line
................
r8089 | russell | 2006-01-16 02:46:15 +0100 (Mon, 16 Jan 2006) | 8 lines
block more revisions ...
TO ALL DEVELOPERS WITH COMMIT ACCESS:
Please remember to *always* do an 'svnmerge block -r <rev#>' on the trunk
every single time you make a commit to the 1.2 branch which will not be pulled
into the trunk using svnmerge. This is important for us to be able to take
full advatage of this tool.
................
r8090 | russell | 2006-01-16 02:47:02 +0100 (Mon, 16 Jan 2006) | 10 lines
Merged revisions 7963 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7963 | mogorman | 2006-01-10 23:38:07 -0500 (Tue, 10 Jan 2006) | 2 lines
Minor typo refrenced in 6191
........
................
r8099 | bweschke | 2006-01-16 18:31:30 +0100 (Mon, 16 Jan 2006) | 3 lines
More code optimization with the new argument macros #6253
................
r8100 | bweschke | 2006-01-16 18:37:44 +0100 (Mon, 16 Jan 2006) | 3 lines
Spelling corrections (mostly in comments and doxygen areas) #6249
................
r8101 | russell | 2006-01-16 18:51:35 +0100 (Mon, 16 Jan 2006) | 2 lines
remove redundant CFLAGS for BSD which are already set in the main Makefile (issue #6250)
................
r8102 | tilghman | 2006-01-16 19:05:19 +0100 (Mon, 16 Jan 2006) | 2 lines
Bug 5090 - sample configuration for udptl packets
................
r8103 | tilghman | 2006-01-16 19:39:01 +0100 (Mon, 16 Jan 2006) | 2 lines
Change a debugging message committed with the wrong level
................
r8104 | tilghman | 2006-01-16 19:41:18 +0100 (Mon, 16 Jan 2006) | 2 lines
Argh, another ERROR that should have been DEBUG
................
r8105 | jdixon | 2006-01-16 19:52:13 +0100 (Mon, 16 Jan 2006) | 3 lines
Added NOANSWER support, so that optional the DISA application starts without
answering (used in new version of app_rpt, and potentially other applicaitons).
................
Added:
team/oej/multiparking/apps/app_morsecode.c
- copied unchanged from r8105, trunk/apps/app_morsecode.c
team/oej/multiparking/configs/udptl.conf.sample
- copied unchanged from r8105, trunk/configs/udptl.conf.sample
team/oej/multiparking/include/asterisk/udptl.h
- copied unchanged from r8105, trunk/include/asterisk/udptl.h
team/oej/multiparking/udptl.c
- copied unchanged from r8105, trunk/udptl.c
Removed:
team/oej/multiparking/include/asterisk/vmodem.h
Modified:
team/oej/multiparking/ (props changed)
team/oej/multiparking/Makefile
team/oej/multiparking/app.c
team/oej/multiparking/apps/Makefile
team/oej/multiparking/apps/app_adsiprog.c
team/oej/multiparking/apps/app_alarmreceiver.c
team/oej/multiparking/apps/app_curl.c
team/oej/multiparking/apps/app_dial.c
team/oej/multiparking/apps/app_dictate.c
team/oej/multiparking/apps/app_directed_pickup.c
team/oej/multiparking/apps/app_directory.c
team/oej/multiparking/apps/app_disa.c
team/oej/multiparking/apps/app_externalivr.c
team/oej/multiparking/apps/app_festival.c
team/oej/multiparking/apps/app_macro.c
team/oej/multiparking/apps/app_meetme.c
team/oej/multiparking/apps/app_milliwatt.c
team/oej/multiparking/apps/app_mixmonitor.c
team/oej/multiparking/apps/app_page.c
team/oej/multiparking/apps/app_parkandannounce.c
team/oej/multiparking/apps/app_queue.c
team/oej/multiparking/apps/app_rpt.c
team/oej/multiparking/apps/app_voicemail.c
team/oej/multiparking/asterisk.8
team/oej/multiparking/asterisk.c
team/oej/multiparking/channel.c
team/oej/multiparking/channels/Makefile
team/oej/multiparking/channels/chan_agent.c
team/oej/multiparking/channels/chan_alsa.c
team/oej/multiparking/channels/chan_iax2.c
team/oej/multiparking/channels/chan_local.c
team/oej/multiparking/channels/chan_oss.c
team/oej/multiparking/channels/chan_phone.c
team/oej/multiparking/channels/chan_sip.c
team/oej/multiparking/channels/chan_zap.c
team/oej/multiparking/codecs/Makefile
team/oej/multiparking/configs/agents.conf.sample
team/oej/multiparking/configs/extensions.conf.sample
team/oej/multiparking/configs/features.conf.sample
team/oej/multiparking/configs/queues.conf.sample
team/oej/multiparking/configs/voicemail.conf.sample
team/oej/multiparking/configs/zapata.conf.sample
team/oej/multiparking/doc/CODING-GUIDELINES
team/oej/multiparking/doc/README.cdr
team/oej/multiparking/doc/README.variables
team/oej/multiparking/doc/manager.txt
team/oej/multiparking/doc/queuelog.txt
team/oej/multiparking/formats/Makefile
team/oej/multiparking/funcs/Makefile
team/oej/multiparking/funcs/func_cdr.c
team/oej/multiparking/funcs/func_cut.c
team/oej/multiparking/funcs/func_math.c
team/oej/multiparking/funcs/func_md5.c
team/oej/multiparking/funcs/func_strings.c
team/oej/multiparking/include/asterisk/app.h
team/oej/multiparking/include/asterisk/channel.h
team/oej/multiparking/include/asterisk/frame.h
team/oej/multiparking/include/asterisk/linkedlists.h
team/oej/multiparking/include/asterisk/monitor.h
team/oej/multiparking/include/asterisk/translate.h
team/oej/multiparking/include/asterisk/utils.h
team/oej/multiparking/manager.c
team/oej/multiparking/pbx.c
team/oej/multiparking/pbx/Makefile
team/oej/multiparking/res/res_monitor.c
team/oej/multiparking/translate.c
team/oej/multiparking/utils/Makefile
Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Mon Jan 16 16:10:44 2006
@@ -1,1 +1,1 @@
-/branches/1.2:7497,7915
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047
Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 16 16:10:44 2006
@@ -1,1 +1,1 @@
-/trunk:1-7936
+/trunk:1-8110
Modified: team/oej/multiparking/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/Makefile?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/Makefile (original)
+++ team/oej/multiparking/Makefile Mon Jan 16 16:10:44 2006
@@ -346,7 +346,7 @@
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o say.o pbx.o cli.o md5.o term.o \
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
- cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
+ cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
@@ -416,6 +416,8 @@
LIBS+=-lssl
INSTALL=install
+
+CFLAGS+=-DT38_SUPPORT
_all: all
@echo " +--------- Asterisk Build Complete ---------+"
Modified: team/oej/multiparking/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/app.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/app.c (original)
+++ team/oej/multiparking/app.c Mon Jan 16 16:10:44 2006
@@ -55,7 +55,7 @@
/* !
This function presents a dialtone and reads an extension into 'collect'
-which must be a pointer to a **pre-initilized** array of char having a
+which must be a pointer to a **pre-initialized** array of char having a
size of 'size' suitable for writing to. It will collect no more than the smaller
of 'maxlen' or 'size' minus the original strlen() of collect digits.
\return 0 if extension does not exist, 1 if extension exists
@@ -279,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;
}
@@ -1099,7 +1109,7 @@
{
int argc;
char *scan;
- int paren = 0;
+ int paren = 0, quote = 0;
if (!buf || !array || !arraylen)
return 0;
@@ -1116,7 +1126,15 @@
else if (*scan == ')') {
if (paren)
paren--;
- } else if ((*scan == delim) && !paren) {
+ } else if (*scan == '"') {
+ quote = quote ? 0 : 1;
+ /* Remove quote character from argument */
+ memmove(scan, scan + 1, strlen(scan));
+ scan--;
+ } else if (*scan == '\\') {
+ /* Literal character, don't parse */
+ memmove(scan, scan + 1, strlen(scan));
+ } else if ((*scan == delim) && !paren && !quote) {
*scan++ = '\0';
break;
}
Modified: team/oej/multiparking/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/Makefile?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/Makefile (original)
+++ team/oej/multiparking/apps/Makefile Mon Jan 16 16:10:44 2006
@@ -24,7 +24,8 @@
app_setcdruserfield.so app_settransfercapability.so app_softhangup.so \
app_stack.so app_system.so app_talkdetect.so app_test.so app_transfer.so \
app_userevent.so app_url.so app_verbose.so app_voicemail.so \
- app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so
+ app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so \
+ app_morsecode.so
#
# Obsolete things...
@@ -47,10 +48,6 @@
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
APPS+=app_osplookup.so
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
Modified: team/oej/multiparking/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_adsiprog.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_adsiprog.c (original)
+++ team/oej/multiparking/apps/app_adsiprog.c Mon Jan 16 16:10:44 2006
@@ -1359,13 +1359,10 @@
ast_log(LOG_WARNING, "Can't open file '%s'\n", fn);
return NULL;
}
- scr = malloc(sizeof(struct adsi_script));
- if (!scr) {
+ if (!(scr = ast_calloc(1, sizeof(*scr)))) {
fclose(f);
- ast_log(LOG_WARNING, "Out of memory loading script '%s'\n", fn);
return NULL;
}
- memset(scr, 0, sizeof(struct adsi_script));
/* Create "main" as first subroutine */
getsubbyname(scr, "main", NULL, 0);
while(!feof(f)) {
Modified: team/oej/multiparking/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_alarmreceiver.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_alarmreceiver.c (original)
+++ team/oej/multiparking/apps/app_alarmreceiver.c Mon Jan 16 16:10:44 2006
@@ -56,6 +56,7 @@
#include "asterisk/localtime.h"
#include "asterisk/callerid.h"
#include "asterisk/astdb.h"
+#include "asterisk/utils.h"
#define ALMRCV_CONFIG "alarmreceiver.conf"
#define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"
@@ -579,17 +580,11 @@
events_received++;
- /* Queue the Event */
-
- if((enew = malloc(sizeof(event_node_t))) == NULL){
- if(option_verbose >= 1)
- ast_verbose(VERBOSE_PREFIX_1 "AlarmReceiver: Failed to allocate memory\n");
- ast_log(LOG_WARNING, "AlarmReceiver Failed to allocate memory\n");
+ /* Queue the Event */
+ if (!(enew = ast_calloc(1, sizeof(*enew)))) {
res = -1;
- break;
- }
-
- memset(enew, 0, sizeof(event_node_t));
+ break;
+ }
enew->next = NULL;
ast_copy_string(enew->data, event, sizeof(enew->data));
Modified: team/oej/multiparking/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_curl.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_curl.c (original)
+++ team/oej/multiparking/apps/app_curl.c Mon Jan 16 16:10:44 2006
@@ -46,6 +46,7 @@
#include "asterisk/options.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
+#include "asterisk/utils.h"
static char *tdesc = "Load external URL";
@@ -63,9 +64,9 @@
/* There might be a realloc() out there that doesn't like reallocing
NULL pointers, so we take care of it here */
if (ptr)
- return realloc(ptr, size);
+ return ast_realloc(ptr, size);
else
- return malloc(size);
+ return ast_malloc(size);
}
static size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
Modified: team/oej/multiparking/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_dial.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_dial.c (original)
+++ team/oej/multiparking/apps/app_dial.c Mon Jan 16 16:10:44 2006
@@ -164,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"
" w - Allow the called party to enable recording of the call by sending\n"
@@ -449,13 +449,15 @@
char tmpchan[256];
char *stuff;
char *tech;
+ char *forward_context;
ast_copy_string(tmpchan, o->chan->call_forward, sizeof(tmpchan));
if ((stuff = strchr(tmpchan, '/'))) {
*stuff = '\0';
stuff++;
tech = tmpchan;
} else {
- snprintf(tmpchan, sizeof(tmpchan), "%s@%s", o->chan->call_forward, o->chan->context);
+ forward_context = pbx_builtin_getvar_helper(o->chan, "FORWARD_CONTEXT");
+ snprintf(tmpchan, sizeof(tmpchan), "%s@%s", o->chan->call_forward, forward_context ? forward_context : o->chan->context);
stuff = tmpchan;
tech = "Local";
}
@@ -984,13 +986,10 @@
goto out;
}
*number = '\0';
- number++;
- tmp = malloc(sizeof(struct localuser));
- if (!tmp) {
- ast_log(LOG_WARNING, "Out of memory\n");
+ number++;
+ if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
goto out;
}
- memset(tmp, 0, sizeof(struct localuser));
if (opts.flags) {
ast_copy_flags(tmp, &opts,
OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
Modified: team/oej/multiparking/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_dictate.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_dictate.c (original)
+++ team/oej/multiparking/apps/app_dictate.c Mon Jan 16 16:10:44 2006
@@ -82,7 +82,12 @@
static int dictate_exec(struct ast_channel *chan, void *data)
{
- char *mydata, *argv[3], *path = NULL, filein[256], *filename = "";
+ char *path = NULL, filein[256], *filename = "";
+ char *parse;
+ AST_DECLARE_APP_ARGS(args,
+ AST_APP_ARG(base);
+ AST_APP_ARG(filename);
+ );
char dftbase[256];
char *base;
struct ast_flags flags = {0};
@@ -91,7 +96,6 @@
struct localuser *u;
int ffactor = 320 * 80,
res = 0,
- argc = 0,
done = 0,
oldr = 0,
lastop = 0,
@@ -105,17 +109,23 @@
LOCAL_USER_ADD(u);
snprintf(dftbase, sizeof(dftbase), "%s/dictate", ast_config_AST_SPOOL_DIR);
- if (!ast_strlen_zero(data) && (mydata = ast_strdupa(data))) {
- argc = ast_app_separate_args(mydata, '|', argv, sizeof(argv) / sizeof(argv[0]));
- }
+ if (!ast_strlen_zero(data)) {
+ parse = ast_strdupa(data);
+ if (!parse) {
+ ast_log(LOG_ERROR, "Out of memory!\n");
+ return -1;
+ }
+ AST_STANDARD_APP_ARGS(args, parse);
+ } else
+ args.argc = 0;
- if (argc) {
- base = argv[0];
+ if (args.argc && !ast_strlen_zero(args.base)) {
+ base = args.base;
} else {
base = dftbase;
}
- if (argc && argv[1]) {
- filename = argv[1];
+ if (args.argc > 1 && args.filename) {
+ filename = args.filename;
}
oldr = chan->readformat;
if ((res = ast_set_read_format(chan, AST_FORMAT_SLINEAR)) < 0) {
Modified: team/oej/multiparking/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_directed_pickup.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_directed_pickup.c (original)
+++ team/oej/multiparking/apps/app_directed_pickup.c Mon Jan 16 16:10:44 2006
@@ -46,7 +46,7 @@
static const char *app = "Pickup";
static const char *synopsis = "Directed Call Pickup";
static const char *descrip =
-" Pickup(extension[@context]): This application can pickup any ringing channel\n"
+" Pickup(extension[@context][&extension2 at context...]): This application can pickup any ringing channel\n"
"that is calling the specified extension. If no context is specified, the current\n"
"context will be used.\n";
@@ -59,7 +59,7 @@
int res = 0;
struct localuser *u = NULL;
struct ast_channel *origin = NULL, *target = NULL;
- char *tmp = NULL, *exten = NULL, *context = NULL;
+ char *tmp = NULL, *exten = NULL, *context = NULL, *rest=data;
char workspace[256] = "";
if (ast_strlen_zero(data)) {
@@ -69,64 +69,65 @@
LOCAL_USER_ADD(u);
- /* Get the extension and context if present */
- exten = data;
- context = strchr(data, '@');
- if (context) {
- *context = '\0';
- context++;
- }
+ while (!target && (exten = rest) ) {
+ res = 0;
+ rest = strchr(exten, '&');
+ if (rest)
+ *rest++ = 0;
- /* Find a channel to pickup */
- origin = ast_get_channel_by_exten_locked(exten, context);
- if (origin && origin->cdr) {
- ast_cdr_getvar(origin->cdr, "dstchannel", &tmp, workspace,
- sizeof(workspace), 0);
- if (tmp) {
- /* We have a possible channel... now we need to find it! */
- target = ast_get_channel_by_name_locked(tmp);
+ /* Get the extension and context if present */
+ context = strchr(exten, '@');
+ if (context)
+ *context++ = '\0';
+
+ /* Find a channel to pickup */
+ origin = ast_get_channel_by_exten_locked(exten, context);
+ if (origin) {
+ ast_cdr_getvar(origin->cdr, "dstchannel", &tmp, workspace,
+ sizeof(workspace), 0);
+ if (tmp) {
+ /* We have a possible channel... now we need to find it! */
+ target = ast_get_channel_by_name_locked(tmp);
+ } else {
+ ast_log(LOG_NOTICE, "No target channel found for %s.\n", exten);
+ res = -1;
+ }
+ ast_mutex_unlock(&origin->lock);
+
} else {
- ast_log(LOG_DEBUG, "No target channel found.\n");
+ ast_log(LOG_DEBUG, "No originating channel found.\n");
+ }
+
+ if (res)
+ continue;
+
+ if (target && (!target->pbx) && ((target->_state == AST_STATE_RINGING) || (target->_state == AST_STATE_RING) ) ) {
+ ast_log(LOG_DEBUG, "Call pickup on chan '%s' by '%s'\n", target->name,
+ chan->name);
+ res = ast_answer(chan);
+ if (res) {
+ ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name);
+ res = -1;
+ break;
+ }
+ res = ast_queue_control(chan, AST_CONTROL_ANSWER);
+ if (res) {
+ ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n",
+ chan->name);
+ res = -1;
+ break;
+ }
+ res = ast_channel_masquerade(target, chan);
+ if (res) {
+ ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan->name, target->name);
+ res = -1;
+ break;
+ }
+ } else {
+ ast_log(LOG_NOTICE, "No call pickup possible for %s...\n", exten);
res = -1;
}
- ast_mutex_unlock(&origin->lock);
- } else {
- if (origin)
- ast_mutex_unlock(&origin->lock);
- ast_log(LOG_DEBUG, "No originating channel found.\n");
}
-
- if (res)
- goto out;
-
- if (target && (!target->pbx) && ((target->_state == AST_STATE_RINGING) || (target->_state == AST_STATE_RING))) {
- ast_log(LOG_DEBUG, "Call pickup on chan '%s' by '%s'\n", target->name,
- chan->name);
- res = ast_answer(chan);
- if (res) {
- ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name);
- res = -1;
- goto out;
- }
- res = ast_queue_control(chan, AST_CONTROL_ANSWER);
- if (res) {
- ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n",
- chan->name);
- res = -1;
- goto out;
- }
- res = ast_channel_masquerade(target, chan);
- if (res) {
- ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan->name, target->name);
- res = -1;
- goto out;
- }
- } else {
- ast_log(LOG_DEBUG, "No call pickup possible...\n");
- res = -1;
- }
- /* Done */
- out:
if (target)
ast_mutex_unlock(&target->lock);
Modified: team/oej/multiparking/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_directory.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_directory.c (original)
+++ team/oej/multiparking/apps/app_directory.c Mon Jan 16 16:10:44 2006
@@ -84,7 +84,7 @@
{
char *tmp;
int lcount = 0;
- tmp = malloc(NUMDIGITS + 1);
+ tmp = ast_malloc(NUMDIGITS + 1);
if (tmp) {
while((*lastname > 32) && lcount < NUMDIGITS) {
switch(toupper(*lastname)) {
Modified: team/oej/multiparking/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_disa.c?rev=8111&r1=8110&r2=8111&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_disa.c (original)
+++ team/oej/multiparking/apps/app_disa.c Mon Jan 16 16:10:44 2006
@@ -93,7 +93,8 @@
"If login is successful, the application looks up the dialed number in\n"
"the specified (or default) context, and executes it if found.\n"
"If the user enters an invalid extension and extension \"i\" (invalid) \n"
- "exists in the context, it will be used.\n";
+ "exists in the context, it will be used. Also, if you set the 5th argument\n"
+ "to 'NOANSWER', the DISA application will not answer initially.\n";
STANDARD_LOCAL_USER;
@@ -114,7 +115,7 @@
static int disa_exec(struct ast_channel *chan, void *data)
{
- int i,j,k,x,did_ignore;
+ int i,j,k,x,did_ignore,special_noanswer;
int firstdigittimeout = 20000;
int digittimeout = 10000;
struct localuser *u;
@@ -131,6 +132,7 @@
AST_APP_ARG(context);
AST_APP_ARG(cid);
AST_APP_ARG(mailbox);
+ AST_APP_ARG(noanswer);
);
[... 6118 lines stripped ...]
More information about the asterisk-commits
mailing list