[asterisk-commits] branch group/autoconf_and_menuselect r18298 - in
/team/group/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Apr 7 08:19:39 MST 2006
Author: russell
Date: Fri Apr 7 10:19:28 2006
New Revision: 18298
URL: http://svn.digium.com/view/asterisk?rev=18298&view=rev
Log:
Merged revisions 17128,17130,17149,17151-17152,17183,17199,17209,17226,17243,17265,17284-17285,17311-17312,17329-17331,17350,17365-17366,17368-17369,17389,17404,17415,17454,17488,17490,17530,17562,17594,17626-17628,17661,17694,17726,17735,17740,17753,17790-17791,17824-17825,17827-17828,17859-17867,17878,17898-17899,17902-17903,17914,17943-17944,17946,17988,17991,17993,18022-18025,18033,18056-18060,18090,18130,18161,18190,18192,18221,18261-18262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r17128 | crichter | 2006-04-03 15:17:59 -0400 (Mon, 03 Apr 2006) | 6 lines
* removed unneeded bc->state field
* added statefullness for bchannel activation/deactivation
* fixed a lot PCM bridging issues
* some debugging logs are now on a higher loglevel
................
r17130 | mogorman | 2006-04-03 15:42:26 -0400 (Mon, 03 Apr 2006) | 3 lines
list word cant be used with g++ and causes problems
with h323. patch from bug 6446, renames list to chan_list
................
r17149 | mogorman | 2006-04-03 16:23:46 -0400 (Mon, 03 Apr 2006) | 3 lines
updating cleancount to coincide with 17130
didnt know you are supposed to update that. now i do
................
r17151 | oej | 2006-04-03 16:40:08 -0400 (Mon, 03 Apr 2006) | 2 lines
Add tag to NOTIFY headers (imported from 1.2)
................
r17152 | oej | 2006-04-03 16:45:45 -0400 (Mon, 03 Apr 2006) | 2 lines
Clarify the need for numeric parking positions (imported from 1.2)
................
r17183 | markster | 2006-04-04 01:53:48 -0400 (Tue, 04 Apr 2006) | 2 lines
Does nobody know how to write a linked list properly? I mean seriously!
................
r17199 | oej | 2006-04-04 03:59:02 -0400 (Tue, 04 Apr 2006) | 8 lines
Clarify syntax of new manager events that reports a status.
We do not longer approve "ThisEventOn" and "ThisEventOff" named events,
they need to be named "ThisEvent" with a status header showing the
current status.
(Approved by Mark)
Old events won't be changed to keep backwards compatibility,
until we have a revision plan for the AMI.
................
r17209 | oej | 2006-04-04 04:01:46 -0400 (Tue, 04 Apr 2006) | 2 lines
Added information on call-limit and realtime
................
r17226 | rizzo | 2006-04-04 06:57:31 -0400 (Tue, 04 Apr 2006) | 3 lines
some fields are const
................
r17243 | rizzo | 2006-04-04 08:59:25 -0400 (Tue, 04 Apr 2006) | 13 lines
Largely simplify format handlers (for file copy etc.)
collecting common functions in a single place and removing
them from the individual handlers.
The full description is on mantis,
http://bugs.digium.com/view.php?id=6375
and only the ogg_vorbis handler needs to be converted to
the new structure.
As a result of this change, format_au.c and format_pcm_alaw.c
should go away (in a separate commit) as their functionality
(trivial) has been merged in another file.
................
r17265 | rizzo | 2006-04-04 10:39:22 -0400 (Tue, 04 Apr 2006) | 4 lines
temporarily disconnect ogg_vorbis from the build while i update it
(should be a matter of a couple of hours).
................
r17284 | mogorman | 2006-04-04 11:27:47 -0400 (Tue, 04 Apr 2006) | 11 lines
Merged revisions 17283 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r17283 | mogorman | 2006-04-04 10:24:50 -0500 (Tue, 04 Apr 2006) | 3 lines
Adds documentation to show what the w flag.
Patch from Ian Kinner at Digium.
........
................
r17285 | rizzo | 2006-04-04 11:40:47 -0400 (Tue, 04 Apr 2006) | 5 lines
ogg_vorbis now compiles so put it back in.
On passing, remove an unnecessary initializazion in format_sln.c
................
r17311 | mogorman | 2006-04-04 12:15:40 -0400 (Tue, 04 Apr 2006) | 4 lines
adds manager event when an iax2 peer loses registration.
also some minor code clean up. patch from 6868 with minor
changes.
................
r17312 | mogorman | 2006-04-04 12:59:27 -0400 (Tue, 04 Apr 2006) | 2 lines
minor code clean up from 6880
................
r17329 | mattf | 2006-04-04 13:05:01 -0400 (Tue, 04 Apr 2006) | 2 lines
chan_iax2 cleanups and optimizations (#6858)
................
r17330 | rizzo | 2006-04-04 13:12:35 -0400 (Tue, 04 Apr 2006) | 5 lines
remove an unused function.
Funny enough, compiling with -O6 gives no warning, whereas -O2 gives
a warning for an unused function declared static.
................
r17331 | rizzo | 2006-04-04 13:13:37 -0400 (Tue, 04 Apr 2006) | 4 lines
these files are now unused, corresponding functions are merged
into format_pcm.c
................
r17350 | oej | 2006-04-04 14:02:40 -0400 (Tue, 04 Apr 2006) | 5 lines
Issue #6882
- move "res=-1" out of verbose block.
- minor code cleanup
Imported from 1.2 branch
................
r17365 | oej | 2006-04-04 14:24:41 -0400 (Tue, 04 Apr 2006) | 4 lines
- Don't return AST_DEVICE_UNKNOWN to devicestate engine, since this will
cause a channel walk...
- Doxygen fixed for devicestate.c
................
r17366 | oej | 2006-04-04 14:26:24 -0400 (Tue, 04 Apr 2006) | 2 lines
Issue #6878 - Manager event DNDstate hidden under verbose option (casper)
................
r17368 | oej | 2006-04-04 14:30:31 -0400 (Tue, 04 Apr 2006) | 2 lines
Block 17367 from trunk, since it's already fixed (me bad)
................
r17369 | oej | 2006-04-04 14:34:21 -0400 (Tue, 04 Apr 2006) | 2 lines
Formatting cleanup
................
r17389 | oej | 2006-04-04 15:03:12 -0400 (Tue, 04 Apr 2006) | 2 lines
Issue #6884 - manager.c formatting (casper)
................
r17404 | crichter | 2006-04-04 15:09:26 -0400 (Tue, 04 Apr 2006) | 1 line
fixed some essential segfaults happening under heavy load. Added a bit more error handling if we receive wrong data form mISDN (e.g. if we crashed before => handle_err() ). Added first steps to implement the parseing of the connected party number.
................
r17415 | oej | 2006-04-04 15:48:42 -0400 (Tue, 04 Apr 2006) | 2 lines
Fix formatting
................
r17454 | tilghman | 2006-04-04 23:53:41 -0400 (Tue, 04 Apr 2006) | 2 lines
Bug 6886 - Add application TryExec, which does mostly the same thing, but returns differently
................
r17488 | oej | 2006-04-05 02:43:14 -0400 (Wed, 05 Apr 2006) | 2 lines
Add reference pointers to RFCs
................
r17490 | oej | 2006-04-05 02:52:41 -0400 (Wed, 05 Apr 2006) | 2 lines
Issue #6654: Enum crash on ADDRESS record, possibly bad record, but still a crash (imported from 1.2)
................
r17530 | oej | 2006-04-05 09:53:06 -0400 (Wed, 05 Apr 2006) | 2 lines
Add some documentation and a todo for enum.c
................
r17562 | crichter | 2006-04-05 10:51:48 -0400 (Wed, 05 Apr 2006) | 5 lines
* advanced the error Handling routine for wrong frames from mISDN
* added more code for connected party number handling
* fixed the portinfo program, it can now be used to test mISDN again
................
r17594 | crichter | 2006-04-05 11:54:15 -0400 (Wed, 05 Apr 2006) | 1 line
some final fixes for cpn
................
r17626 | tilghman | 2006-04-05 13:03:30 -0400 (Wed, 05 Apr 2006) | 2 lines
Bug 6508 - if priority was a number, then findlabel fails
................
r17627 | tilghman | 2006-04-05 13:44:44 -0400 (Wed, 05 Apr 2006) | 2 lines
Bug 6873 - Finish moving from the non-threadsafe (and poor randomness) rand() to threadsafe ast_random()
................
r17628 | oej | 2006-04-05 13:46:09 -0400 (Wed, 05 Apr 2006) | 2 lines
Issue #5637 - Realtime driver for PostgreSQL (mguesdon)
................
r17661 | file | 2006-04-05 14:37:29 -0400 (Wed, 05 Apr 2006) | 2 lines
Unbreak res/Makefile (issue #6891 as reported by casper)
................
r17694 | oej | 2006-04-05 15:32:40 -0400 (Wed, 05 Apr 2006) | 3 lines
- Doxygen fixes
- Typos corrected
................
r17726 | file | 2006-04-05 16:05:09 -0400 (Wed, 05 Apr 2006) | 10 lines
Merged revisions 17702 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r17702 | file | 2006-04-05 17:01:19 -0300 (Wed, 05 Apr 2006) | 2 lines
Unlock channel on failure so that ast_mutex_destroy doesn't throw a fit (issue #6647 reported by casper)
........
................
r17735 | oej | 2006-04-05 16:14:51 -0400 (Wed, 05 Apr 2006) | 3 lines
Issue #6610 - build on Intel Mac
(Wish I could try this at home :-)
................
r17740 | oej | 2006-04-06 02:55:38 -0400 (Thu, 06 Apr 2006) | 2 lines
Issue #6893 - Compiler warnings for PostgreSQL ARA driver
................
r17753 | rizzo | 2006-04-06 04:02:35 -0400 (Thu, 06 Apr 2006) | 3 lines
the fix for bug #6399 makes sense. thanks wrmem for the report.
................
r17790 | rizzo | 2006-04-06 05:10:31 -0400 (Thu, 06 Apr 2006) | 23 lines
small cleanups to module.h and loader.c to start playing with
new-style modules using static symbols.
Everything will still work as before, but new-style modules
can now be defined by putting a '#define STATIC_MODULE' somewhere
before including module.h, then declaring STATIC_MODULE the
various methods (load, unload, key...) that the module is
supposed to supply, and adding a 'STD_MOD(MOD_1, reload_fn, NULL, NULL)'
macro call at the end.
A module compiled in this way will be loaded RTLD_NOW|RTLD_LOCAL
so symbol pollution is reduced, and symbols are resolved immediately.
Removing just the '#define STATIC_MODULE' will restore the old
behaviour.
In order for a module to be loaded RTLD_NOW|RTLD_LOCAL, it must not
export any symbol[1], and all the modules it depends on (e.g. res_*)
must be loaded already.
[1] Mechanisms are in place, and will be enabled later, to still
allow such modules to 'export' symbols and resolving the dependencies
irrespective of the load order.
................
r17791 | rizzo | 2006-04-06 05:24:02 -0400 (Thu, 06 Apr 2006) | 4 lines
convert a couple of applications to the new module style
(STATIC_MODULE) to show what needs to be changed.
................
r17824 | rizzo | 2006-04-06 10:02:19 -0400 (Thu, 06 Apr 2006) | 6 lines
use FREE instead of free as pointer to the destructor function.
This way the MALLOC_DEBUG code will always get the correct argument.
(bug introduced in SVN15818)
................
r17825 | rizzo | 2006-04-06 10:23:37 -0400 (Thu, 06 Apr 2006) | 4 lines
split pbx_load_module so we can reduce the indentation depth.
Also convert to MOD_1 style.
................
r17827 | rizzo | 2006-04-06 10:40:47 -0400 (Thu, 06 Apr 2006) | 5 lines
whitespace and formatting fix postponed from last commit:
fix indentation of a large function, localize some variables
and add/remove whitespace where needed.
................
r17828 | oej | 2006-04-06 10:43:06 -0400 (Thu, 06 Apr 2006) | 2 lines
Make "show http" CLI command follow new guidelines - now "http show status"
................
r17859 | rizzo | 2006-04-06 11:08:31 -0400 (Thu, 06 Apr 2006) | 5 lines
make sure that file calls other than OPEN work on all formats
if called with a NULL 'fmt' argument.
(SVN 6898)
................
r17860 | rizzo | 2006-04-06 11:10:29 -0400 (Thu, 06 Apr 2006) | 4 lines
use the new module interface for this module, but make it
of type MOD_0 as it exports symbols so it should be loaded as RTLD_GLOBAL.
................
r17861 | oej | 2006-04-06 11:23:14 -0400 (Thu, 06 Apr 2006) | 2 lines
Formatting fixes
................
r17862 | oej | 2006-04-06 11:25:56 -0400 (Thu, 06 Apr 2006) | 2 lines
Formatting fixes
................
r17863 | rizzo | 2006-04-06 11:40:12 -0400 (Thu, 06 Apr 2006) | 3 lines
minor formatting cleanup and removal of trailing whitespace.
................
r17864 | oej | 2006-04-06 11:41:37 -0400 (Thu, 06 Apr 2006) | 2 lines
Formatting fixes
................
r17865 | rizzo | 2006-04-06 11:43:06 -0400 (Thu, 06 Apr 2006) | 3 lines
remove traces of previously merged files
................
r17866 | rizzo | 2006-04-06 11:48:06 -0400 (Thu, 06 Apr 2006) | 3 lines
convert one more file...
................
r17867 | rizzo | 2006-04-06 11:55:15 -0400 (Thu, 06 Apr 2006) | 3 lines
minor code cleanup
................
r17878 | rizzo | 2006-04-06 12:01:56 -0400 (Thu, 06 Apr 2006) | 16 lines
+ create function cdr_get_tv to replace several duplicated
instances of the same code to generate a time entry in
raw or localtime format;
+ create functions check_post() and check_start() to check whether
a record has been already posted or started, replacing
several duplicated instances of the same code;
+ localize some variables;
+ normalize some for() loops
Especially the former two changes should make the code a lot
more consistent and easier to read.
................
r17898 | rizzo | 2006-04-06 12:06:57 -0400 (Thu, 06 Apr 2006) | 6 lines
optimize move_variables() so that two lists can be created
in constant time instead of scanning the entire list.
On passing, minor formatting fixes.
................
r17899 | rizzo | 2006-04-06 12:17:04 -0400 (Thu, 06 Apr 2006) | 14 lines
normalize repeated instances of code as follows:
- if (res >= 0)
- return RESULT_SUCCESS;
- else
- return RESULT_FAILURE;
+ return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
(we should probably create a macro for this,
#define RET(r) ((r) >= 0) ? RESULT_SUCCESS : RESULT_FAILURE)
................
r17902 | rizzo | 2006-04-06 12:44:31 -0400 (Thu, 06 Apr 2006) | 3 lines
minor formatting changes again
................
r17903 | north | 2006-04-06 12:50:33 -0400 (Thu, 06 Apr 2006) | 4 lines
skinny debug/verbose cleanup.
Thanks casper!
................
r17914 | file | 2006-04-06 13:01:47 -0400 (Thu, 06 Apr 2006) | 10 lines
Merged revisions 17905 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r17905 | file | 2006-04-06 14:00:10 -0300 (Thu, 06 Apr 2006) | 2 lines
Update email address to my Digium one
........
................
r17943 | rizzo | 2006-04-06 13:09:00 -0400 (Thu, 06 Apr 2006) | 3 lines
normalize some for() loops.
................
r17944 | russell | 2006-04-06 13:13:00 -0400 (Thu, 06 Apr 2006) | 7 lines
various cleanups to the Makefile
- remove unused OSREV varibale
- move various CROSS_COMPILE variables to the top and group them together
- move various PROC definitions to the top as a group
- remove usused MARCH variable
(issue #6892)
................
r17946 | russell | 2006-04-06 13:25:34 -0400 (Thu, 06 Apr 2006) | 1 line
................
r17988 | rizzo | 2006-04-06 15:31:59 -0400 (Thu, 06 Apr 2006) | 4 lines
structures can be copied with the '=' operators, no need to
use memcpy.
................
r17991 | oej | 2006-04-06 15:39:27 -0400 (Thu, 06 Apr 2006) | 3 lines
- doxygen
- debug message control
................
r17993 | oej | 2006-04-06 15:59:21 -0400 (Thu, 06 Apr 2006) | 3 lines
Change transmit_notify_sipfrag to handle other messages than 200 OK, needed for
SIPtransfer improvement
................
r18022 | oej | 2006-04-06 16:16:08 -0400 (Thu, 06 Apr 2006) | 3 lines
Implement a handle_response_refer function to take care of responses
to outbound REFERS. Not that common, but still needed.
................
r18023 | bweschke | 2006-04-06 16:23:18 -0400 (Thu, 06 Apr 2006) | 3 lines
Fix a problem where if the channel was hungup during detection, the application wouldn't block indefinitely looking for another frame from that channel. Don't try to do frame size analysis on a frame that isn't voice, only report DEBUG and VERBOSE msgs to the logger channels when the DEBUG and VERBOSE settings are high enough to require it, and some other minor cleanups.
................
r18024 | oej | 2006-04-06 16:36:25 -0400 (Thu, 06 Apr 2006) | 3 lines
- Implement handle_request_notify to handle incoming NOTIFY requests
and respond properly to them.
................
r18025 | bweschke | 2006-04-06 16:37:29 -0400 (Thu, 06 Apr 2006) | 3 lines
More code optimizations. Thanks kpfleming!
................
r18033 | oej | 2006-04-06 17:01:06 -0400 (Thu, 06 Apr 2006) | 3 lines
- Don't change channel direction on re-invites
- Don't re-initialize initreq on re-invites
................
r18056 | oej | 2006-04-06 17:13:32 -0400 (Thu, 06 Apr 2006) | 2 lines
Small fixes to handle_request_invite
................
r18057 | oej | 2006-04-06 17:18:12 -0400 (Thu, 06 Apr 2006) | 2 lines
Small changes to parse_sip_options
................
r18058 | oej | 2006-04-06 17:29:54 -0400 (Thu, 06 Apr 2006) | 2 lines
Improved handling of 491 responses
................
r18059 | oej | 2006-04-06 17:33:39 -0400 (Thu, 06 Apr 2006) | 3 lines
Add "NewChan" event to history to track the birth of a new ast_chan from a
SIP invite
................
r18060 | oej | 2006-04-06 17:49:24 -0400 (Thu, 06 Apr 2006) | 2 lines
Cosmetic update for outbound REFERs
................
r18090 | kpfleming | 2006-04-06 18:16:23 -0400 (Thu, 06 Apr 2006) | 11 lines
Merged revisions 18087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r18087 | kpfleming | 2006-04-06 17:04:58 -0500 (Thu, 06 Apr 2006) | 3 lines
don't try to support 'i' or 'r' options if chan_zap is not loaded, and warn the user when they attempt to use them (issue #6675)
update application help text to more clearly define when Zaptel and chan_zap are required
........
................
r18130 | oej | 2006-04-07 03:04:05 -0400 (Fri, 07 Apr 2006) | 4 lines
Issue #6580 - Unify directory definitions to one section of Makefile (casper)
- Maybe we should define proper directories for OS/X too?
- Should OpenBSD and NetBSD follow the FreeBSD rules?
................
r18161 | oej | 2006-04-07 04:19:52 -0400 (Fri, 07 Apr 2006) | 3 lines
Issue #6674: Set the URI correctly on BYEs when we have an incoming call
Reported by aubergine, fix by oej
................
r18190 | crichter | 2006-04-07 05:31:27 -0400 (Fri, 07 Apr 2006) | 1 line
fixed a bridging-endless-loop also fixed the rdnis is not exported issue
................
r18192 | crichter | 2006-04-07 05:46:38 -0400 (Fri, 07 Apr 2006) | 1 line
................
r18221 | crichter | 2006-04-07 08:03:51 -0400 (Fri, 07 Apr 2006) | 1 line
sorry litle mistake
................
r18261 | oej | 2006-04-07 10:30:14 -0400 (Fri, 07 Apr 2006) | 4 lines
Import of revistion 18250 from 1.2
- Fix minor memory leak
- Add proper cause codes on memory allocation failures
................
r18262 | oej | 2006-04-07 10:42:25 -0400 (Fri, 07 Apr 2006) | 4 lines
- Add cause code for format error
- Change to SWITCH_CONGESTION instead of CONGESTION
(imported from 1.2)
................
Added:
team/group/autoconf_and_menuselect/res/res_config_pgsql.c
- copied unchanged from r18262, trunk/res/res_config_pgsql.c
Removed:
team/group/autoconf_and_menuselect/formats/format_au.c
team/group/autoconf_and_menuselect/formats/format_pcm_alaw.c
Modified:
team/group/autoconf_and_menuselect/ (props changed)
team/group/autoconf_and_menuselect/.cleancount
team/group/autoconf_and_menuselect/CREDITS
team/group/autoconf_and_menuselect/Makefile
team/group/autoconf_and_menuselect/app.c
team/group/autoconf_and_menuselect/apps/app_alarmreceiver.c
team/group/autoconf_and_menuselect/apps/app_cdr.c
team/group/autoconf_and_menuselect/apps/app_channelredirect.c
team/group/autoconf_and_menuselect/apps/app_dial.c
team/group/autoconf_and_menuselect/apps/app_directed_pickup.c
team/group/autoconf_and_menuselect/apps/app_exec.c
team/group/autoconf_and_menuselect/apps/app_meetme.c
team/group/autoconf_and_menuselect/apps/app_page.c
team/group/autoconf_and_menuselect/apps/app_queue.c
team/group/autoconf_and_menuselect/apps/app_record.c
team/group/autoconf_and_menuselect/apps/app_senddtmf.c
team/group/autoconf_and_menuselect/apps/app_voicemail.c
team/group/autoconf_and_menuselect/cdr.c
team/group/autoconf_and_menuselect/channel.c
team/group/autoconf_and_menuselect/channels/chan_agent.c
team/group/autoconf_and_menuselect/channels/chan_iax2.c
team/group/autoconf_and_menuselect/channels/chan_local.c
team/group/autoconf_and_menuselect/channels/chan_mgcp.c
team/group/autoconf_and_menuselect/channels/chan_misdn.c
team/group/autoconf_and_menuselect/channels/chan_sip.c
team/group/autoconf_and_menuselect/channels/chan_skinny.c
team/group/autoconf_and_menuselect/channels/chan_zap.c
team/group/autoconf_and_menuselect/channels/misdn/Makefile
team/group/autoconf_and_menuselect/channels/misdn/isdn_lib.c
team/group/autoconf_and_menuselect/channels/misdn/isdn_lib.h
team/group/autoconf_and_menuselect/channels/misdn/isdn_msg_parser.c
team/group/autoconf_and_menuselect/channels/misdn/portinfo.c
team/group/autoconf_and_menuselect/config.c
team/group/autoconf_and_menuselect/configs/extensions.conf.sample
team/group/autoconf_and_menuselect/configs/features.conf.sample
team/group/autoconf_and_menuselect/configs/iax.conf.sample
team/group/autoconf_and_menuselect/configs/meetme.conf.sample
team/group/autoconf_and_menuselect/configs/mgcp.conf.sample
team/group/autoconf_and_menuselect/configs/queues.conf.sample
team/group/autoconf_and_menuselect/configs/sip.conf.sample
team/group/autoconf_and_menuselect/configs/skinny.conf.sample
team/group/autoconf_and_menuselect/configs/voicemail.conf.sample
team/group/autoconf_and_menuselect/devicestate.c
team/group/autoconf_and_menuselect/dns.c
team/group/autoconf_and_menuselect/doc/CODING-GUIDELINES
team/group/autoconf_and_menuselect/doc/manager.txt
team/group/autoconf_and_menuselect/enum.c
team/group/autoconf_and_menuselect/file.c
team/group/autoconf_and_menuselect/formats/format_g723.c
team/group/autoconf_and_menuselect/formats/format_g726.c
team/group/autoconf_and_menuselect/formats/format_g729.c
team/group/autoconf_and_menuselect/formats/format_gsm.c
team/group/autoconf_and_menuselect/formats/format_h263.c
team/group/autoconf_and_menuselect/formats/format_h264.c
team/group/autoconf_and_menuselect/formats/format_ilbc.c
team/group/autoconf_and_menuselect/formats/format_ogg_vorbis.c
team/group/autoconf_and_menuselect/formats/format_pcm.c
team/group/autoconf_and_menuselect/formats/format_sln.c
team/group/autoconf_and_menuselect/formats/format_vox.c
team/group/autoconf_and_menuselect/formats/format_wav.c
team/group/autoconf_and_menuselect/formats/format_wav_gsm.c
team/group/autoconf_and_menuselect/http.c
team/group/autoconf_and_menuselect/include/asterisk/channel.h
team/group/autoconf_and_menuselect/include/asterisk/file.h
team/group/autoconf_and_menuselect/include/asterisk/linkedlists.h
team/group/autoconf_and_menuselect/include/asterisk/module.h
team/group/autoconf_and_menuselect/include/asterisk/pbx.h
team/group/autoconf_and_menuselect/loader.c
team/group/autoconf_and_menuselect/manager.c
team/group/autoconf_and_menuselect/pbx.c
team/group/autoconf_and_menuselect/pbx/pbx_config.c
team/group/autoconf_and_menuselect/pbx/pbx_dundi.c
team/group/autoconf_and_menuselect/res/Makefile
team/group/autoconf_and_menuselect/res/res_agi.c
team/group/autoconf_and_menuselect/res/res_monitor.c
team/group/autoconf_and_menuselect/res/res_musiconhold.c
team/group/autoconf_and_menuselect/rtp.c
team/group/autoconf_and_menuselect/sched.c
team/group/autoconf_and_menuselect/udptl.c
Propchange: team/group/autoconf_and_menuselect/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/group/autoconf_and_menuselect/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/group/autoconf_and_menuselect/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 7 10:19:28 2006
@@ -1,1 +1,1 @@
-/trunk:1-17126
+/trunk:1-18297
Modified: team/group/autoconf_and_menuselect/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/.cleancount?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/.cleancount (original)
+++ team/group/autoconf_and_menuselect/.cleancount Fri Apr 7 10:19:28 2006
@@ -1,1 +1,1 @@
-12
+13
Modified: team/group/autoconf_and_menuselect/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/CREDITS?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/CREDITS (original)
+++ team/group/autoconf_and_menuselect/CREDITS Fri Apr 7 10:19:28 2006
@@ -12,6 +12,8 @@
Telesthetic - for supporting SIP development
Christos Ricudis - for substantial code contributions
+
+nic.at - ENUM support in Asterisk
Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Fri Apr 7 10:19:28 2006
@@ -15,22 +15,33 @@
# Create OPTIONS variable
OPTIONS=
+
# If cross compiling, define these to suit
-# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_ARCH=Linux
+#CROSS_PROC=arm
+#SUB_PROC=xscale # or maverick
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
CC=$(CROSS_COMPILE)gcc
HOST_CC=gcc
-# CROSS_ARCH=Linux
-# CROSS_PROC=arm
-# SUB_PROC=xscale # or maverick
ifeq ($(CROSS_COMPILE),)
OSARCH=$(shell uname -s)
- OSREV=$(shell uname -r)
+ PROC?=$(shell uname -m)
else
OSARCH=$(CROSS_ARCH)
- OSREV=$(CROSS_REV)
+ PROC=$(CROSS_PROC)
endif
PWD=$(shell pwd)
@@ -39,13 +50,13 @@
MAKETOPLEVEL?=$(MAKELEVEL)
ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
-######### More GSM codec optimization
-######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-######### which support MMX instructions. This should be newer pentiums,
-######### ppro's, etc, as well as the AMD K6 and K7.
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions. This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.
#K6OPT = -DK6OPT
-#Tell gcc to optimize the code
+# Tell gcc to optimize the code
OPTIMIZE+=-O6
else
# Stack backtraces, while useful for debugging, are incompatible with optimizations
@@ -54,14 +65,13 @@
endif
endif
-#Overwite config files on "make samples"
+# Overwite config files on "make samples"
OVERWRITE=y
-#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
DEBUG=-g3 #-pg
-#Set NOCRYPTO to yes if you do not want to have crypto support or
-#dependencies
+# Set NOCRYPTO to yes if you do not want to have crypto support or dependencies
#NOCRYPTO=yes
# If you are running a radio application, define RADIO_RELAX so that the DTMF
@@ -70,14 +80,11 @@
# If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
# to reduce the size of certain static buffers
-
#ifneq ($(CROSS_COMPILE),)
#OPTIONS += -DLOW_MEMORY
#endif
-#
# Asterisk SMDI integration
-#
WITH_SMDI = 1
# Optional debugging parameters
@@ -94,7 +101,7 @@
# Files are copied here temporarily during the install process
# For example, make DESTDIR=/tmp/asterisk woud put things in
# /tmp/asterisk/etc/asterisk
-# XXX watch out, put no spaces or comments after the value
+# !!! Watch out, put no spaces or comments after the value !!!
DESTDIR?=
#DESTDIR?=/tmp/asterisk
@@ -110,57 +117,64 @@
# Don't use together with -DBUSYDETECT_TONEONLY
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
-ifneq ($(OSARCH),SunOS)
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf
+ifeq ($(OSARCH),SunOS)
+ ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
+ ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
+ ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
+ ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
+ ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
+ ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
+ ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
+ ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
+ ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
+ ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+else
+ifeq ($(OSARCH),FreeBSD)
+ PREFIX?=/usr/local
+ ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+ ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+ ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+ ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+ ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+ ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+ ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+ ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+ ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+ ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+else
+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-else
- ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
- ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
- ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
- ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
- ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
- ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
- ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-endif
+endif
+endif
+
+# Asterisk.conf is located in ASTETCDIR or by using the -C flag
+# when starting Asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+
+# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
+HTTP_DOCSDIR=/var/www/html
+# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
+HTTP_CGIDIR=/var/www/cgi-bin
ASTCFLAGS=
# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-#Uncomment this to use the older DSP routines
+# Uncomment this to use the older DSP routines
#ASTCFLAGS+=-DOLD_DSP_ROUTINES
-
-# Determine by a grep 'DocumentRoot' of your httpd.conf file
-HTTP_DOCSDIR=/var/www/html
-# Determine by a grep 'ScriptAlias' of your httpd.conf file
-HTTP_CGIDIR=/var/www/cgi-bin
# If the file .asterisk.makeopts is present in your home directory, you can
# include all of your favorite Makefile options so that every time you download
@@ -193,12 +207,6 @@
endif
ifeq ($(OSARCH),Linux)
- ifeq ($(CROSS_COMPILE),)
- PROC?=$(shell uname -m)
- else
- PROC=$(CROSS_PROC)
- endif
-
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
@@ -252,7 +260,6 @@
ASTOBJ=-o asterisk
ifeq ($(findstring BSD,$(OSARCH)),BSD)
- PROC=$(shell uname -m)
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
@@ -280,22 +287,6 @@
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
endif
MPG123TARG=freebsd
-
- # XXX FreeBSD paths
- PREFIX?=/usr/local
- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
- # XXX end FreeBSD paths
-
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
@@ -320,7 +311,6 @@
ASTLINK=
LIBS+=-lpthread -lncurses -lm -lresolv
ASTSBINDIR=$(MODULES_DIR)
- PROC=$(shell uname -m)
endif
ifndef WITHOUT_ZAPTEL
@@ -405,10 +395,13 @@
AUDIO_LIBS=-framework CoreAudio
ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
- OBJS+=poll.o
- ASTCFLAGS+=-DPOLLCOMPAT
+ # Mac on Intel CoreDuo does not need poll compatibility layer
+ ifneq ($(PROC),i386)
+ OBJS+=poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
+ endif
else
-#These are used for all but Darwin
+# These are used for all but Darwin
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -975,7 +968,6 @@
@echo " + $(MAKE) uninstall-all +"
@echo " +-------------------------------------------+"
-
uninstall-all: _uninstall
rm -rf $(DESTDIR)$(ASTLIBDIR)
rm -rf $(DESTDIR)$(ASTVARLIBDIR)
Modified: team/group/autoconf_and_menuselect/app.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/app.c?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/app.c (original)
+++ team/group/autoconf_and_menuselect/app.c Fri Apr 7 10:19:28 2006
@@ -1157,7 +1157,7 @@
return AST_LOCK_FAILURE;
}
- snprintf(fs, strlen(path) + 19, "%s/.lock-%08x", path, rand());
+ snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0) {
fprintf(stderr, "Unable to create lock file '%s': %s\n", path, strerror(errno));
Modified: team/group/autoconf_and_menuselect/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_alarmreceiver.c?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_alarmreceiver.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_alarmreceiver.c Fri Apr 7 10:19:28 2006
@@ -551,13 +551,12 @@
checksum = checksum % 15;
- if(checksum){
+ if (checksum) {
database_increment("checksum-errors");
- if(option_verbose >= 2){
+ if (option_verbose >= 2)
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Nonzero checksum\n");
ast_log(LOG_DEBUG, "AlarmReceiver: Nonzero checksum\n");
continue;
- }
}
/* Check the message type for correctness */
Modified: team/group/autoconf_and_menuselect/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_cdr.c?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_cdr.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_cdr.c Fri Apr 7 10:19:28 2006
@@ -28,6 +28,8 @@
#include <sys/types.h>
#include <stdlib.h>
+#define STATIC_MODULE
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -35,9 +37,6 @@
#include "asterisk/channel.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-
-
-static char *tdesc = "Tell Asterisk to not maintain a CDR for the current call";
static char *nocdr_descrip =
" NoCDR(): This application will tell Asterisk not to maintain a CDR for the\n"
@@ -64,7 +63,7 @@
return 0;
}
-int unload_module(void)
+STATIC_MODULE int unload_module(void)
{
int res;
@@ -75,24 +74,26 @@
return res;
}
-int load_module(void)
+STATIC_MODULE int load_module(void)
{
return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip);
}
-char *description(void)
+STATIC_MODULE char *description(void)
{
- return tdesc;
+ return "Tell Asterisk to not maintain a CDR for the current call";
}
-int usecount(void)
+STATIC_MODULE int usecount(void)
{
int res;
STANDARD_USECOUNT(res);
return res;
}
-char *key()
+STATIC_MODULE char *key(void)
{
return ASTERISK_GPL_KEY;
}
+
+STD_MOD(MOD_1, NULL, NULL, NULL);
Modified: team/group/autoconf_and_menuselect/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_channelredirect.c?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_channelredirect.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_channelredirect.c Fri Apr 7 10:19:28 2006
@@ -99,15 +99,16 @@
context = NULL;
}
- if (!(prio = ast_findlabel_extension(chan2, S_OR(context, chan2->context), S_OR(exten, chan2->exten),
- priority, chan2->cid.cid_num))) {
+ /* ast_findlabel_extension does not convert numeric priorities; it only does a lookup */
+ if (!(prio = atoi(priority)) && !(prio = ast_findlabel_extension(chan2, S_OR(context, chan2->context),
+ S_OR(exten, chan2->exten), priority, chan2->cid.cid_num))) {
ast_log(LOG_WARNING, "'%s' is not a known priority or label\n", priority);
goto chanquit;
}
- ast_log(LOG_DEBUG, "Attempting async goto (%s) to %s\n", args.channel, args.label);
+ ast_log(LOG_DEBUG, "Attempting async goto (%s) to %s|%s|%d\n", args.channel, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio);
- if (ast_async_goto_if_exists(chan2, context ? context : chan2->context, exten ? exten : chan2->exten, prio))
+ if (ast_async_goto_if_exists(chan2, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio))
ast_log(LOG_WARNING, "%s failed for %s\n", app, args.channel);
else
res = 0;
Modified: team/group/autoconf_and_menuselect/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_dial.c?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_dial.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_dial.c Fri Apr 7 10:19:28 2006
@@ -35,6 +35,7 @@
#include <sys/signal.h>
#include <netinet/in.h>
+#define STATIC_MODULE
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -1719,7 +1720,7 @@
}
-int unload_module(void)
+STATIC_MODULE int unload_module(void)
{
int res;
@@ -1731,7 +1732,7 @@
return res;
}
[... 14982 lines stripped ...]
More information about the asterisk-commits
mailing list