[asterisk-commits] branch group/new_loader_completion r22317 - in /team/group/new_loader_complet...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Apr 24 13:32:30 MST 2006


Author: kpfleming
Date: Mon Apr 24 15:32:29 2006
New Revision: 22317

URL: http://svn.digium.com/view/asterisk?rev=22317&view=rev
Log:
Merged revisions 21038-21039,21043,21061,21097-21099,21126-21131,21157,21181,21207,21235-21236,21239,21262,21277,21311,21338,21365,21392-21393,21420-21421,21451,21468,21479-21481,21508,21535-21538,21566,21568,21572,21595-21596,21598-21600,21639,21681,21707,21743,21786,21792,21814,21816-21821,21835,21849-21851,21878-21879,21906,21933,21960,21986,21988,22015-22016,22043-22046,22075-22076,22078,22082,22128,22163,22201,22232,22267-22269,22272-22273,22302-22303,22306,22308 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r21038 | tilghman | 2006-04-18 01:29:30 -0500 (Tue, 18 Apr 2006) | 10 lines

Merged revisions 21037 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r21037 | tilghman | 2006-04-18 01:26:04 -0500 (Tue, 18 Apr 2006) | 2 lines

Bug 6984 - off by one error in Random()

........

................
r21039 | oej | 2006-04-18 01:40:01 -0500 (Tue, 18 Apr 2006) | 2 lines

- Move subscribeuri away from refer-to, since refer-to is moving away from sip_pvt

................
r21043 | oej | 2006-04-18 02:00:27 -0500 (Tue, 18 Apr 2006) | 2 lines

use XMIT_RELIABLE ...

................
r21061 | oej | 2006-04-18 02:03:36 -0500 (Tue, 18 Apr 2006) | 3 lines

It's critical that we get an ACK on a 200 OK to an INVITE. If we do not get the ACK,
tear down the call. (Discovered at SIPit18)

................
r21097 | rizzo | 2006-04-18 08:05:48 -0500 (Tue, 18 Apr 2006) | 7 lines

simplify the flow of builtin_atxfer().

There is still a lot of similarity with builtin_blindtransfer()
which should be removed by definining functions for the common
pieces of code (eg in the first part).


................
r21098 | rizzo | 2006-04-18 08:17:44 -0500 (Tue, 18 Apr 2006) | 3 lines

remove a line that was added by mistake


................
r21099 | rizzo | 2006-04-18 08:37:07 -0500 (Tue, 18 Apr 2006) | 3 lines

simplify logic in various functions, remove unnecessary variables


................
r21126 | rizzo | 2006-04-18 09:23:14 -0500 (Tue, 18 Apr 2006) | 3 lines

simplify logic in iax2_bridge()


................
r21127 | oej | 2006-04-18 09:35:15 -0500 (Tue, 18 Apr 2006) | 3 lines

- Deallocate refer structure at sip_destroy time
- Implement new sip_transfer() function

................
r21128 | oej | 2006-04-18 09:37:54 -0500 (Tue, 18 Apr 2006) | 2 lines

Change sip show channels to include refer status

................
r21129 | oej | 2006-04-18 09:41:57 -0500 (Tue, 18 Apr 2006) | 2 lines

Clean up handle_response_peerpoke

................
r21130 | file | 2006-04-18 09:43:32 -0500 (Tue, 18 Apr 2006) | 2 lines

Do not depend on having an end sound for stopping the bridge when time runs out. (issue #6979 reported by ppyy)

................
r21131 | oej | 2006-04-18 09:50:30 -0500 (Tue, 18 Apr 2006) | 3 lines

Implement somewhat improved support for 481 Call leg does not exist responses...
- There are some questions on what to do here, but it is a first step.

................
r21157 | oej | 2006-04-18 10:09:01 -0500 (Tue, 18 Apr 2006) | 2 lines

- call parking improvements (part of the siptransfer branch)

................
r21181 | russell | 2006-04-18 13:16:32 -0500 (Tue, 18 Apr 2006) | 3 lines

update res_odbc to support pooled connections
(from tilghman's developer branch, res_odbc_rewrite)

................
r21207 | kpfleming | 2006-04-18 16:39:20 -0500 (Tue, 18 Apr 2006) | 3 lines

correct array index calculation (thanks mtaht3!)
update header file comments to reflect new usage of structure field

................
r21235 | kpfleming | 2006-04-18 18:24:02 -0500 (Tue, 18 Apr 2006) | 2 lines

don't ignore left-curly-braces when searching for the end of a variable/function reference; match them up with right-curly-braces so we choose the proper brace to end the reference (will still fail to parse properly if the reference contains unbalanced braces)

................
r21236 | kpfleming | 2006-04-18 18:25:22 -0500 (Tue, 18 Apr 2006) | 2 lines

doh! don't double-increment the bracket count for embedded references

................
r21239 | kpfleming | 2006-04-18 18:50:59 -0500 (Tue, 18 Apr 2006) | 2 lines

fix obvious breakage

................
r21262 | oej | 2006-04-18 19:04:03 -0500 (Tue, 18 Apr 2006) | 2 lines

Cosmetic fixes to code...

................
r21277 | oej | 2006-04-18 19:45:37 -0500 (Tue, 18 Apr 2006) | 2 lines

Add reference to RFC for mailbox notification

................
r21311 | rizzo | 2006-04-19 01:58:20 -0500 (Wed, 19 Apr 2006) | 6 lines

- use ast_calloc instead of ast_malloc
- use ast_channel_lock/unlock in a few places
- comment some dubious pieces of code
- use memset to zero a buffer


................
r21338 | rizzo | 2006-04-19 02:23:22 -0500 (Wed, 19 Apr 2006) | 9 lines

move to a different file (channel.c for the time being) the
wrappers around the basic 'say' functions, and redeclare these
wrappers as ordinary functions rather than function pointers.

This way, alternative implementations of the 'say' functions
will only have to implement the basic functions and not the
wrappers.


................
r21365 | rizzo | 2006-04-19 03:52:15 -0500 (Wed, 19 Apr 2006) | 4 lines

replace repeated code to walk contexts with a function,
find_context_locked()


................
r21392 | rizzo | 2006-04-19 04:18:30 -0500 (Wed, 19 Apr 2006) | 5 lines

use a function, set_ext_pri(), to assign extension and priority.
On passing, fix a bug in __ast_pbx_run() where the wrong priority
was used in a call to ast_exists_extension() (see comment in the code).


................
r21393 | rizzo | 2006-04-19 04:31:41 -0500 (Wed, 19 Apr 2006) | 4 lines

one more client for find_context_locked(),
plus a few minor fixes.


................
r21420 | rizzo | 2006-04-19 05:21:58 -0500 (Wed, 19 Apr 2006) | 3 lines

add example syntax for new-style number and date spelling


................
r21421 | rizzo | 2006-04-19 05:27:31 -0500 (Wed, 19 Apr 2006) | 15 lines

add experimental code for new-style "say" application.
The rules for spelling out numbers and dates are in the config
file "say.conf", which can be edited to implement national
or even local language rules.

The new code can be enabled through the cli command
'say load new'
while the old code can be restored with
'say load old'

Eventually, this code should go to a better place,
but for the time being we keep here as it provides
very similar functions.


................
r21451 | rizzo | 2006-04-19 08:59:34 -0500 (Wed, 19 Apr 2006) | 9 lines

support 'languageprefix' in asterisk.conf to modify the algorithm
to build pathnames for language-specific files (see file.c for
a description)

Default, of course, to the standard behaviour.

We don't have an asterisk.conf.sample to put an example of use!


................
r21468 | rizzo | 2006-04-19 09:02:49 -0500 (Wed, 19 Apr 2006) | 4 lines

start cleaning up this code so we can split the 900 lines function
into manageable chunks.


................
r21479 | rizzo | 2006-04-19 09:14:40 -0500 (Wed, 19 Apr 2006) | 3 lines

more simplifications


................
r21480 | rizzo | 2006-04-19 09:50:17 -0500 (Wed, 19 Apr 2006) | 6 lines

more simplifications - use a local variable c instead of o->chan,
use S_OR as appropriate.

Still need to fix the indentation of some blocks.


................
r21481 | rizzo | 2006-04-19 09:53:18 -0500 (Wed, 19 Apr 2006) | 3 lines

fix indentation of some large blocks after previous changes


................
r21508 | rizzo | 2006-04-19 10:15:03 -0500 (Wed, 19 Apr 2006) | 3 lines

extract a common condition.


................
r21535 | rizzo | 2006-04-19 11:10:11 -0500 (Wed, 19 Apr 2006) | 3 lines

localize some variables


................
r21536 | rizzo | 2006-04-19 11:19:52 -0500 (Wed, 19 Apr 2006) | 5 lines

localize one more variable;
use ast_strdup as it can handle the NULL argument well.
mark a dubious piece of code with XXX


................
r21537 | rizzo | 2006-04-19 11:36:15 -0500 (Wed, 19 Apr 2006) | 3 lines

more localization of variables


................
r21538 | rizzo | 2006-04-19 11:54:04 -0500 (Wed, 19 Apr 2006) | 3 lines

more localization and variable removal


................
r21566 | rizzo | 2006-04-19 12:29:15 -0500 (Wed, 19 Apr 2006) | 4 lines

merge two nested 'if' which are really a single block.
(indentation still to be fixed)


................
r21568 | rizzo | 2006-04-19 12:58:07 -0500 (Wed, 19 Apr 2006) | 4 lines

start sorting out the duplicated code in the privacy handler
for future removal


................
r21572 | rizzo | 2006-04-19 13:00:32 -0500 (Wed, 19 Apr 2006) | 3 lines

fix indentation of a large block


................
r21595 | rizzo | 2006-04-19 13:07:19 -0500 (Wed, 19 Apr 2006) | 3 lines

merge two nested 'if' which are really a single block.


................
r21596 | rizzo | 2006-04-19 13:15:20 -0500 (Wed, 19 Apr 2006) | 3 lines

move a replicated block of code in the one place where it belongs.


................
r21598 | tilghman | 2006-04-19 13:44:58 -0500 (Wed, 19 Apr 2006) | 9 lines

Blocked revisions 21597 via svnmerge

........
r21597 | tilghman | 2006-04-19 13:43:17 -0500 (Wed, 19 Apr 2006) | 2 lines

Bug 6553 - plug memory leaks when ODBC connection is down

........

................
r21599 | tilghman | 2006-04-19 13:50:51 -0500 (Wed, 19 Apr 2006) | 2 lines

Oops, wasn't revised the way I thought it was

................
r21600 | tilghman | 2006-04-19 13:56:38 -0500 (Wed, 19 Apr 2006) | 10 lines

Merged revisions 21597 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r21597 | tilghman | 2006-04-19 13:43:17 -0500 (Wed, 19 Apr 2006) | 2 lines

Bug 6553 - plug memory leaks when ODBC connection is down

........

................
r21639 | kpfleming | 2006-04-19 16:11:31 -0500 (Wed, 19 Apr 2006) | 10 lines

Merged revisions 21638 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r21638 | kpfleming | 2006-04-19 16:10:41 -0500 (Wed, 19 Apr 2006) | 2 lines

support system-specific scripts in safe_asterisk, before starting Asterisk proper

........

................
r21681 | russell | 2006-04-19 17:32:07 -0500 (Wed, 19 Apr 2006) | 2 lines

add the malloc attribute to the memory allocation wrappers

................
r21707 | oej | 2006-04-19 18:49:36 -0500 (Wed, 19 Apr 2006) | 2 lines

Clarify result of sipsock_read

................
r21743 | rizzo | 2006-04-20 12:39:44 -0500 (Thu, 20 Apr 2006) | 8 lines

comment that for callerid field, NULL and "" should be considered
equivalent (the reason is, when passing these strings through a
statically allocated buffer, we have no way to tell between NULL and ""
so we would be unable to preserve the difference, if any).

No code changes yet.


................
r21786 | rizzo | 2006-04-21 04:54:23 -0500 (Fri, 21 Apr 2006) | 6 lines

Replace three replicas of the same code with a function.
Consider NULL and "" as equivalent in cid strings.

On passing, also remove an extra data copy.


................
r21792 | rizzo | 2006-04-21 05:00:58 -0500 (Fri, 21 Apr 2006) | 3 lines

make NULL and "" equivalent for some cid fields.


................
r21814 | rizzo | 2006-04-21 05:05:45 -0500 (Fri, 21 Apr 2006) | 3 lines

make NULL and "" equivalent in cid fields, mark some missing NULL checks.


................
r21816 | rizzo | 2006-04-21 05:31:23 -0500 (Fri, 21 Apr 2006) | 3 lines

more NULL and "" equivalence in cid fields


................
r21817 | rizzo | 2006-04-21 05:37:59 -0500 (Fri, 21 Apr 2006) | 3 lines

ast_strdup can handle NULL args well, so use it.


................
r21818 | rizzo | 2006-04-21 05:41:13 -0500 (Fri, 21 Apr 2006) | 4 lines

more NULL "" equivalence in CID fields.
Mark a potentially missing item in managerevent


................
r21819 | rizzo | 2006-04-21 05:47:07 -0500 (Fri, 21 Apr 2006) | 5 lines

more NULL / "" equivalence for CID fields.

Mark an inconsistency in empty string handling.


................
r21820 | rizzo | 2006-04-21 05:51:31 -0500 (Fri, 21 Apr 2006) | 5 lines

more NULL "" equivalence in CLI fields.

Mark a place where we don't clear a buffer while we probably should.


................
r21821 | rizzo | 2006-04-21 05:57:03 -0500 (Fri, 21 Apr 2006) | 5 lines

more NULL "" equivalence,
mark a couple of inconsistencies (missing CallerIDnum,
"unknown" instead of "<unknown>") - there are more of the same.


................
r21835 | rizzo | 2006-04-21 06:02:28 -0500 (Fri, 21 Apr 2006) | 3 lines

more NULL "" equivalence in cid fields.


................
r21849 | rizzo | 2006-04-21 06:05:54 -0500 (Fri, 21 Apr 2006) | 3 lines

more NULL "" equivalence in cid fields.


................
r21850 | rizzo | 2006-04-21 06:19:48 -0500 (Fri, 21 Apr 2006) | 3 lines

localize a variable, and make a minor code rearrangement.


................
r21851 | rizzo | 2006-04-21 06:30:02 -0500 (Fri, 21 Apr 2006) | 3 lines

one more client for find_context_locked()


................
r21878 | rizzo | 2006-04-21 07:12:42 -0500 (Fri, 21 Apr 2006) | 3 lines

minor cleanup


................
r21879 | rizzo | 2006-04-21 07:58:39 -0500 (Fri, 21 Apr 2006) | 3 lines

simplify a function


................
r21906 | rizzo | 2006-04-21 08:44:15 -0500 (Fri, 21 Apr 2006) | 3 lines

simplify pbx_builtin_execiftime


................
r21933 | rizzo | 2006-04-21 09:49:21 -0500 (Fri, 21 Apr 2006) | 6 lines

- use symbolic constants and macros to play with the debug flag
  on the frame counters. Document it in the header file.
- provide a single exit point for a function;
- mark XXX some unclear parts of the code.


................
r21960 | rizzo | 2006-04-21 10:49:14 -0500 (Fri, 21 Apr 2006) | 4 lines

update configuration, generalize date format and
start mapping digit strings


................
r21986 | rizzo | 2006-04-21 11:04:25 -0500 (Fri, 21 Apr 2006) | 3 lines

merge some common code into a function


................
r21988 | rizzo | 2006-04-21 11:18:12 -0500 (Fri, 21 Apr 2006) | 3 lines

comment a possible memory leak


................
r22015 | rizzo | 2006-04-21 12:47:44 -0500 (Fri, 21 Apr 2006) | 4 lines

replace strncpy with ast_copy_string and fix the -1 offset which
is not needed now.


................
r22016 | rizzo | 2006-04-21 12:53:39 -0500 (Fri, 21 Apr 2006) | 3 lines

replace strncpy with ast_copy_string.


................
r22043 | rizzo | 2006-04-21 13:08:57 -0500 (Fri, 21 Apr 2006) | 5 lines

replace some strncpy with ast_copy string,
on passing fix some potential null pointer dereference,
and normalize some loops


................
r22044 | rizzo | 2006-04-21 13:13:21 -0500 (Fri, 21 Apr 2006) | 3 lines

more strncpy/ast_copy_string replacement


................
r22045 | rizzo | 2006-04-21 13:26:54 -0500 (Fri, 21 Apr 2006) | 4 lines

more strncpy/ast_copy_string replacement.
On passing, simplify code by using strsep() as appropriate


................
r22046 | rizzo | 2006-04-21 13:34:38 -0500 (Fri, 21 Apr 2006) | 4 lines

more stncpy/ast_copy_string replacement.



................
r22075 | rizzo | 2006-04-21 15:28:32 -0500 (Fri, 21 Apr 2006) | 5 lines

move wait_and_stream to ast_wait_and_stream() because equivalent
code is replicated in way too many places not to have a global
function for that.


................
r22076 | rizzo | 2006-04-21 15:39:50 -0500 (Fri, 21 Apr 2006) | 3 lines

convert to use ast_stream_and_wait


................
r22078 | rizzo | 2006-04-21 15:51:55 -0500 (Fri, 21 Apr 2006) | 3 lines

convert to use ast_strem_and_wait


................
r22082 | rizzo | 2006-04-21 15:57:29 -0500 (Fri, 21 Apr 2006) | 3 lines

convert to use ast_stream_and_wait


................
r22128 | jdixon | 2006-04-22 06:30:06 -0500 (Sat, 22 Apr 2006) | 3 lines

Added "Operator Services" connection mode for Zap channels, and the 'O' option
in app_dial to support the use of this mode.

................
r22163 | oej | 2006-04-23 01:22:29 -0500 (Sun, 23 Apr 2006) | 6 lines

- Add doxygen documentation for sipsock_read locking
- Improve documentation of pedantic
  (related to issue #7016)

  From the air above Russia...

................
r22201 | tilghman | 2006-04-23 10:26:55 -0500 (Sun, 23 Apr 2006) | 2 lines

Bug 6710 - Move default datetime string to each language function, so each language can have its own default

................
r22232 | markster | 2006-04-23 22:40:12 -0500 (Sun, 23 Apr 2006) | 2 lines

Fix CDR builds when includes are in freetds directory off include

................
r22267 | kpfleming | 2006-04-24 12:11:45 -0500 (Mon, 24 Apr 2006) | 3 lines

Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!


................
r22268 | tilghman | 2006-04-24 12:20:41 -0500 (Mon, 24 Apr 2006) | 2 lines

Deprecate prefixed options in voicemail

................
r22269 | russell | 2006-04-24 12:24:03 -0500 (Mon, 24 Apr 2006) | 2 lines

fix kevin's silly typos

................
r22272 | russell | 2006-04-24 12:34:35 -0500 (Mon, 24 Apr 2006) | 2 lines

print a message before running the autotools

................
r22273 | kpfleming | 2006-04-24 12:41:27 -0500 (Mon, 24 Apr 2006) | 2 lines

Merge Steve Murphy's (murf) complete re-implementation of AEL, which is now no longer considered experimental :-)

................
r22302 | russell | 2006-04-24 13:41:44 -0500 (Mon, 24 Apr 2006) | 2 lines

remove some files we don't need

................
r22303 | russell | 2006-04-24 13:47:05 -0500 (Mon, 24 Apr 2006) | 2 lines

remove properties added as a part of the AEL merge

................
r22306 | russell | 2006-04-24 14:15:43 -0500 (Mon, 24 Apr 2006) | 2 lines

add a note indicating that you can press 'h' for help

................
r22308 | tilghman | 2006-04-24 15:01:14 -0500 (Mon, 24 Apr 2006) | 2 lines

Move clueful 'h' more central; alias ESC to left arrow and make ESC quit on main menu

................

Added:
    team/group/new_loader_completion/acinclude.m4
      - copied unchanged from r22308, trunk/acinclude.m4
    team/group/new_loader_completion/bootstrap.sh
      - copied unchanged from r22308, trunk/bootstrap.sh
    team/group/new_loader_completion/build_tools/Makefile
      - copied unchanged from r22308, trunk/build_tools/Makefile
    team/group/new_loader_completion/build_tools/cflags.xml
      - copied unchanged from r22308, trunk/build_tools/cflags.xml
    team/group/new_loader_completion/build_tools/get_moduledeps
      - copied unchanged from r22308, trunk/build_tools/get_moduledeps
    team/group/new_loader_completion/build_tools/make_version
      - copied unchanged from r22308, trunk/build_tools/make_version
    team/group/new_loader_completion/build_tools/menuselect-deps.in
      - copied unchanged from r22308, trunk/build_tools/menuselect-deps.in
    team/group/new_loader_completion/build_tools/menuselect.c
      - copied unchanged from r22308, trunk/build_tools/menuselect.c
    team/group/new_loader_completion/build_tools/menuselect.h
      - copied unchanged from r22308, trunk/build_tools/menuselect.h
    team/group/new_loader_completion/build_tools/menuselect_curses.c
      - copied unchanged from r22308, trunk/build_tools/menuselect_curses.c
    team/group/new_loader_completion/build_tools/prep_moduledeps
      - copied unchanged from r22308, trunk/build_tools/prep_moduledeps
    team/group/new_loader_completion/config.guess
      - copied unchanged from r22308, trunk/config.guess
    team/group/new_loader_completion/config.sub
      - copied unchanged from r22308, trunk/config.sub
    team/group/new_loader_completion/configs/say.conf.sample
      - copied unchanged from r22308, trunk/configs/say.conf.sample
    team/group/new_loader_completion/configure.ac
      - copied unchanged from r22308, trunk/configure.ac
    team/group/new_loader_completion/include/asterisk/ael_structs.h
      - copied unchanged from r22308, trunk/include/asterisk/ael_structs.h
    team/group/new_loader_completion/makeopts.in
      - copied unchanged from r22308, trunk/makeopts.in
    team/group/new_loader_completion/mxml/   (props changed)
      - copied from r22308, trunk/mxml/
    team/group/new_loader_completion/mxml/.cvsignore
      - copied unchanged from r22308, trunk/mxml/.cvsignore
    team/group/new_loader_completion/mxml/ANNOUNCEMENT
      - copied unchanged from r22308, trunk/mxml/ANNOUNCEMENT
    team/group/new_loader_completion/mxml/CHANGES
      - copied unchanged from r22308, trunk/mxml/CHANGES
    team/group/new_loader_completion/mxml/COPYING
      - copied unchanged from r22308, trunk/mxml/COPYING
    team/group/new_loader_completion/mxml/Makefile.in
      - copied unchanged from r22308, trunk/mxml/Makefile.in
    team/group/new_loader_completion/mxml/README
      - copied unchanged from r22308, trunk/mxml/README
    team/group/new_loader_completion/mxml/config.h.in
      - copied unchanged from r22308, trunk/mxml/config.h.in
    team/group/new_loader_completion/mxml/configure
      - copied unchanged from r22308, trunk/mxml/configure
    team/group/new_loader_completion/mxml/configure.in
      - copied unchanged from r22308, trunk/mxml/configure.in
    team/group/new_loader_completion/mxml/install-sh
      - copied unchanged from r22308, trunk/mxml/install-sh
    team/group/new_loader_completion/mxml/mxml-attr.c
      - copied unchanged from r22308, trunk/mxml/mxml-attr.c
    team/group/new_loader_completion/mxml/mxml-entity.c
      - copied unchanged from r22308, trunk/mxml/mxml-entity.c
    team/group/new_loader_completion/mxml/mxml-file.c
      - copied unchanged from r22308, trunk/mxml/mxml-file.c
    team/group/new_loader_completion/mxml/mxml-index.c
      - copied unchanged from r22308, trunk/mxml/mxml-index.c
    team/group/new_loader_completion/mxml/mxml-node.c
      - copied unchanged from r22308, trunk/mxml/mxml-node.c
    team/group/new_loader_completion/mxml/mxml-private.c
      - copied unchanged from r22308, trunk/mxml/mxml-private.c
    team/group/new_loader_completion/mxml/mxml-search.c
      - copied unchanged from r22308, trunk/mxml/mxml-search.c
    team/group/new_loader_completion/mxml/mxml-set.c
      - copied unchanged from r22308, trunk/mxml/mxml-set.c
    team/group/new_loader_completion/mxml/mxml-string.c
      - copied unchanged from r22308, trunk/mxml/mxml-string.c
    team/group/new_loader_completion/mxml/mxml.h
      - copied unchanged from r22308, trunk/mxml/mxml.h
    team/group/new_loader_completion/mxml/mxml.list.in
      - copied unchanged from r22308, trunk/mxml/mxml.list.in
    team/group/new_loader_completion/mxml/mxml.pc
      - copied unchanged from r22308, trunk/mxml/mxml.pc
    team/group/new_loader_completion/mxml/mxml.pc.in
      - copied unchanged from r22308, trunk/mxml/mxml.pc.in
    team/group/new_loader_completion/pbx/ael/
      - copied from r22308, trunk/pbx/ael/
    team/group/new_loader_completion/pbx/ael/ael-test/
      - copied from r22308, trunk/pbx/ael/ael-test/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test1/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test1/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test1/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test1/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test2/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test2/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test2/apptest.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test2/apptest.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test2/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test2/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test3/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test3/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/include1.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test3/include1.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/include2.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test3/include2.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/include3.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test3/include3.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/include4.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test3/include4.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test3/include5.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test3/include5.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test4/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test4/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test4/apptest.ael2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test4/apptest.ael2
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test4/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test4/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test5/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test5/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test5/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test5/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test6/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test6/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test6/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test6/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test7/
      - copied from r22308, trunk/pbx/ael/ael-test/ael-test7/
    team/group/new_loader_completion/pbx/ael/ael-test/ael-test7/extensions.ael
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ael-test7/extensions.ael
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test1
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test1
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test2
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test2
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test3
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test3
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test4
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test4
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test5
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test5
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test6
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test6
    team/group/new_loader_completion/pbx/ael/ael-test/ref.ael-test7
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/ref.ael-test7
    team/group/new_loader_completion/pbx/ael/ael-test/runtests
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/runtests
    team/group/new_loader_completion/pbx/ael/ael-test/setref
      - copied unchanged from r22308, trunk/pbx/ael/ael-test/setref
    team/group/new_loader_completion/pbx/ael/ael.flex
      - copied unchanged from r22308, trunk/pbx/ael/ael.flex
    team/group/new_loader_completion/pbx/ael/ael.tab.c
      - copied unchanged from r22308, trunk/pbx/ael/ael.tab.c
    team/group/new_loader_completion/pbx/ael/ael.tab.h
      - copied unchanged from r22308, trunk/pbx/ael/ael.tab.h
    team/group/new_loader_completion/pbx/ael/ael.y
      - copied unchanged from r22308, trunk/pbx/ael/ael.y
    team/group/new_loader_completion/pbx/ael/ael_lex.c
      - copied unchanged from r22308, trunk/pbx/ael/ael_lex.c
    team/group/new_loader_completion/utils/ael_main.c
      - copied unchanged from r22308, trunk/utils/ael_main.c
    team/group/new_loader_completion/utils/expr2.testinput
      - copied unchanged from r22308, trunk/utils/expr2.testinput
Removed:
    team/group/new_loader_completion/build_tools/make_svn_branch_name
Modified:
    team/group/new_loader_completion/   (props changed)
    team/group/new_loader_completion/CREDITS
    team/group/new_loader_completion/Makefile
    team/group/new_loader_completion/UPGRADE.txt
    team/group/new_loader_completion/agi/Makefile
    team/group/new_loader_completion/agi/eagi-sphinx-test.c
    team/group/new_loader_completion/agi/eagi-test.c
    team/group/new_loader_completion/app.c
    team/group/new_loader_completion/apps/Makefile
    team/group/new_loader_completion/apps/app_dial.c
    team/group/new_loader_completion/apps/app_directory.c
    team/group/new_loader_completion/apps/app_dumpchan.c
    team/group/new_loader_completion/apps/app_flash.c
    team/group/new_loader_completion/apps/app_ivrdemo.c
    team/group/new_loader_completion/apps/app_meetme.c
    team/group/new_loader_completion/apps/app_osplookup.c
    team/group/new_loader_completion/apps/app_page.c
    team/group/new_loader_completion/apps/app_playback.c
    team/group/new_loader_completion/apps/app_queue.c
    team/group/new_loader_completion/apps/app_random.c
    team/group/new_loader_completion/apps/app_rpt.c
    team/group/new_loader_completion/apps/app_sayunixtime.c
    team/group/new_loader_completion/apps/app_skel.c
    team/group/new_loader_completion/apps/app_voicemail.c
    team/group/new_loader_completion/apps/app_zapbarge.c
    team/group/new_loader_completion/apps/app_zapras.c
    team/group/new_loader_completion/apps/app_zapscan.c
    team/group/new_loader_completion/ast_expr2.c
    team/group/new_loader_completion/ast_expr2.fl
    team/group/new_loader_completion/ast_expr2.h
    team/group/new_loader_completion/ast_expr2.y
    team/group/new_loader_completion/ast_expr2f.c
    team/group/new_loader_completion/asterisk.c
    team/group/new_loader_completion/build_tools/   (props changed)
    team/group/new_loader_completion/cdr.c
    team/group/new_loader_completion/cdr/Makefile
    team/group/new_loader_completion/cdr/cdr_odbc.c
    team/group/new_loader_completion/cdr/cdr_pgsql.c
    team/group/new_loader_completion/cdr/cdr_sqlite.c
    team/group/new_loader_completion/cdr/cdr_tds.c
    team/group/new_loader_completion/channel.c
    team/group/new_loader_completion/channels/Makefile
    team/group/new_loader_completion/channels/chan_agent.c
    team/group/new_loader_completion/channels/chan_alsa.c
    team/group/new_loader_completion/channels/chan_features.c
    team/group/new_loader_completion/channels/chan_h323.c
    team/group/new_loader_completion/channels/chan_iax2.c
    team/group/new_loader_completion/channels/chan_local.c
    team/group/new_loader_completion/channels/chan_mgcp.c
    team/group/new_loader_completion/channels/chan_misdn.c
    team/group/new_loader_completion/channels/chan_nbs.c
    team/group/new_loader_completion/channels/chan_oss.c
    team/group/new_loader_completion/channels/chan_phone.c
    team/group/new_loader_completion/channels/chan_sip.c
    team/group/new_loader_completion/channels/chan_skinny.c
    team/group/new_loader_completion/channels/chan_vpb.c
    team/group/new_loader_completion/channels/chan_zap.c
    team/group/new_loader_completion/channels/h323/Makefile
    team/group/new_loader_completion/cli.c
    team/group/new_loader_completion/codecs/Makefile
    team/group/new_loader_completion/codecs/codec_gsm.c
    team/group/new_loader_completion/codecs/codec_speex.c
    team/group/new_loader_completion/codecs/gsm/Makefile
    team/group/new_loader_completion/codecs/ilbc/Makefile
    team/group/new_loader_completion/codecs/lpc10/Makefile
    team/group/new_loader_completion/configs/extensions.ael.sample
    team/group/new_loader_completion/configs/extensions.conf.sample
    team/group/new_loader_completion/configs/sip.conf.sample
    team/group/new_loader_completion/contrib/scripts/safe_asterisk
    team/group/new_loader_completion/contrib/scripts/safe_asterisk.8
    team/group/new_loader_completion/cryptostub.c
    team/group/new_loader_completion/db1-ast/Makefile
    team/group/new_loader_completion/db1-ast/hash/hash.c
    team/group/new_loader_completion/doc/ael.txt
    team/group/new_loader_completion/enum.c
    team/group/new_loader_completion/file.c
    team/group/new_loader_completion/formats/Makefile
    team/group/new_loader_completion/formats/format_h263.c
    team/group/new_loader_completion/formats/format_ogg_vorbis.c
    team/group/new_loader_completion/funcs/Makefile
    team/group/new_loader_completion/funcs/func_callerid.c
    team/group/new_loader_completion/funcs/func_curl.c
    team/group/new_loader_completion/funcs/func_odbc.c
    team/group/new_loader_completion/include/   (props changed)
    team/group/new_loader_completion/include/asterisk.h
    team/group/new_loader_completion/include/asterisk/astmm.h
    team/group/new_loader_completion/include/asterisk/channel.h
    team/group/new_loader_completion/include/asterisk/compat.h
    team/group/new_loader_completion/include/asterisk/file.h
    team/group/new_loader_completion/include/asterisk/frame.h
    team/group/new_loader_completion/include/asterisk/res_odbc.h
    team/group/new_loader_completion/include/asterisk/say.h
    team/group/new_loader_completion/include/asterisk/translate.h
    team/group/new_loader_completion/include/asterisk/utils.h
    team/group/new_loader_completion/manager.c
    team/group/new_loader_completion/pbx.c
    team/group/new_loader_completion/pbx/Makefile
    team/group/new_loader_completion/pbx/pbx_ael.c
    team/group/new_loader_completion/pbx/pbx_dundi.c
    team/group/new_loader_completion/pbx/pbx_gtkconsole.c
    team/group/new_loader_completion/pbx/pbx_kdeconsole.cc
    team/group/new_loader_completion/res/Makefile
    team/group/new_loader_completion/res/res_adsi.c
    team/group/new_loader_completion/res/res_agi.c
    team/group/new_loader_completion/res/res_config_odbc.c
    team/group/new_loader_completion/res/res_config_pgsql.c
    team/group/new_loader_completion/res/res_crypto.c
    team/group/new_loader_completion/res/res_features.c
    team/group/new_loader_completion/res/res_musiconhold.c
    team/group/new_loader_completion/res/res_odbc.c
    team/group/new_loader_completion/res/res_osp.c
    team/group/new_loader_completion/res/res_snmp.c
    team/group/new_loader_completion/say.c
    team/group/new_loader_completion/strcompat.c
    team/group/new_loader_completion/translate.c
    team/group/new_loader_completion/utils/Makefile

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
    automerge = you bet

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
    automerge-email = kpfleming at digium.com

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 24 15:32:29 2006
@@ -14,3 +14,14 @@
 tags
 TAGS
 testexpr2
+makeopts
+menuselect.makeopts
+config.status
+config.log
+makeopts.xml
+install-sh
+configure
+mkinstalldirs
+autom4te.cache
+missing
+aclocal.m4

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 24 15:32:29 2006
@@ -1,1 +1,1 @@
-/trunk:1-21034
+/trunk:1-22316

Modified: team/group/new_loader_completion/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/CREDITS?rev=22317&r1=22316&r2=22317&view=diff
==============================================================================
--- team/group/new_loader_completion/CREDITS (original)
+++ team/group/new_loader_completion/CREDITS Mon Apr 24 15:32:29 2006
@@ -76,7 +76,7 @@
 Steve Kann - new jitter buffer for IAX2
 	stevek at stevek.com
 Constantine Filin - major contributions to the Asterisk Realtime Architecture
-Steve Murphy - privacy support
+Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
 Claude Patry - bug fixes, feature enhancements, and bug marshalling
 	cpatry at gmail.com
 

Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=22317&r1=22316&r2=22317&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Mon Apr 24 15:32:29 2006
@@ -49,7 +49,7 @@
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
 
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
 # More GSM codec optimization
 # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
 # which support MMX instructions.  This should be newer pentiums,
@@ -96,13 +96,6 @@
 
 # Uncomment next one to enable ast_frame tracing (for debugging)
 TRACE_FRAMES = #-DTRACE_FRAMES
-
-# Uncomment next one to enable malloc debugging
-# You can view malloc debugging with:
-#   *CLI> show memory allocations [filename]
-#   *CLI> show memory summary [filename]
-#
-MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h
 
 # Where to install asterisk after compiling
 # Default -> leave empty
@@ -182,25 +175,38 @@
 
 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
-
 # Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
 # 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
-# a new version of Asterisk, you don't have to edit the makefile to set them. 
-# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# include all of your favorite menuselect options so that every time you download
+# a new version of Asterisk, you don't have to run menuselect to set them. 
+# The file /etc/asterisk.makeopts will also be included but can be overridden
 # by the file in your home directory.
 
-ifneq ($(wildcard /etc/asterisk.makeopts),)
-  include /etc/asterisk.makeopts
-endif
-
-ifneq ($(wildcard ~/.asterisk.makeopts),)
-  include ~/.asterisk.makeopts
-endif
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+
+ifneq ($(wildcard menuselect.makeopts),)
+  include menuselect.makeopts
+endif
+
+ifneq ($(wildcard makeopts),)
+  include makeopts
+endif
+
+ASTCFLAGS+=$(MENUSELECT_CFLAGS)
+TOPDIR_CFLAGS=-include include/autoconfig.h
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h
+
+#   *CLI> show memory allocations [filename]
+#   *CLI> show memory summary [filename]
+ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
+  TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
+  MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
+endif
+
+MOD_SUBDIR_CFLAGS+=-fPIC
 
 ifeq ($(OSARCH),Linux)
   ifeq ($(PROC),x86_64)
@@ -247,9 +253,13 @@
 endif
 
 INCLUDE+=-Iinclude -I../include
-ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
 ASTCFLAGS+=$(OPTIMIZE)
-ASTCFLAGS+= -Werror -Wunused
+
+ifeq ($(AST_DEVMODE),yes)
+  ASTCFLAGS+=-Werror -Wunused
+endif
+

[... 23318 lines stripped ...]


More information about the asterisk-commits mailing list