[asterisk-commits] file: branch file/bridging r97011 - in /team/file/bridging: ./ apps/ bridges/...

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jan  7 18:25:11 2008
New Revision: 97011

URL: http://svn.digium.com/view/asterisk?view=rev&rev=97011
Log:
Merged revisions 95864,95888,95891,95893-95894,95937,95939,95944-95945,95947,95994,96018-96019,96021,96023,96025,96028,96071,96073,96076-96077,96079,96103,96147,96174,96221,96245,96270,96272,96301,96332,96368,96395,96397-96398,96450,96499-96500,96547,96574,96576,96621,96645,96692,96715-96717,96743,96776,96836,96858,96862,96885-96888,96933-96936,96987-96988 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r95864 | russell | 2008-01-02 12:20:26 -0400 (Wed, 02 Jan 2008) | 6 lines

For some odd reason, the last set of libresample build changes from Kevin did
not work for everyone, but it did for some.  This set of changes makes trunk
start again for those having problems.  Instead of building libresample as a
static library, it just links the object files in directly with the asterisk
binary.

................
r95888 | qwell | 2008-01-02 13:38:02 -0400 (Wed, 02 Jan 2008) | 4 lines

Update osplookup documentation to use commas instead of pipes.

Closes issue #11666, patch by Laureano.

................
r95891 | mmichelson | 2008-01-02 14:05:57 -0400 (Wed, 02 Jan 2008) | 17 lines

Merged revisions 95890 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r95890 | mmichelson | 2008-01-02 11:51:22 -0600 (Wed, 02 Jan 2008) | 9 lines

A change to improve the accuracy of queue logging in the case where a member does not
answer during the specified timeout period. Prior to this change, there was a small chance
that the member name recorded in this case would be blank. Also prior to this change, if using
the ringall strategy, if no one answered the call during the specified timeout, the member name
listed in the queue log would randomly be one of the members that was rung.

(closes issue #11498, reported and tested by hloubser, patched by me)


........

................
r95893 | kpfleming | 2008-01-02 14:17:15 -0400 (Wed, 02 Jan 2008) | 2 lines

umm... this did not compile on x86-64, and could not possibly have worked on any platform as it was passing string pointers to a function expecting ints

................
r95894 | kpfleming | 2008-01-02 14:21:04 -0400 (Wed, 02 Jan 2008) | 2 lines

and now just to keep the libresample party going... if the functions from libresample are going to be in the main Asterisk binary, it makes sense for the header that defines them to be available without any special CFLAGS and to out-of-tree modules building against /usr/include/asterisk

................
r95937 | kpfleming | 2008-01-02 15:34:33 -0400 (Wed, 02 Jan 2008) | 4 lines

improve AC_C_DEFINE_CHECK to not try to evaluate the macro being checked for, but just check for its existence
finish implementation of check for Zaptel HWGAIN support
add check for Zaptel ECHOCANCEL_PARAMS support

................
r95939 | kpfleming | 2008-01-02 15:47:25 -0400 (Wed, 02 Jan 2008) | 2 lines

clean up hwgain CLI command and improve docs for swgain CLI command

................
r95944 | mmichelson | 2008-01-02 16:19:40 -0400 (Wed, 02 Jan 2008) | 4 lines

Fix a typo in a comment. AST_STANDARD_APP_ARGS uses ',' as the separator,
not '|'.


................
r95945 | mmichelson | 2008-01-02 16:23:23 -0400 (Wed, 02 Jan 2008) | 5 lines

Since ',' is the standard argument separator in trunk, change app_queue
to use AST_STANDARD_APP_ARGS instead of AST_NONSTANDARD_APP_ARGS for determining
member data.


................
r95947 | file | 2008-01-02 16:26:25 -0400 (Wed, 02 Jan 2008) | 12 lines

Merged revisions 95946 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r95946 | file | 2008-01-02 16:24:09 -0400 (Wed, 02 Jan 2008) | 4 lines

Allocate a SIP refer structure when performing a transfer using BYE with Also so that the transfer information is properly stored. (AST-2008-001)
(closes issue #11637)
Reported by: greyvoip

........

................
r95994 | mmichelson | 2008-01-02 17:08:33 -0400 (Wed, 02 Jan 2008) | 5 lines

Change instances of AST_NONSTANDARD_APP_ARGS(foo, bar, ',') to AST_STANDARD_APP_ARGS(foo, bar)

(closes issue #11668, reported and patched by mvanbaak)


................
r96018 | russell | 2008-01-02 17:49:44 -0400 (Wed, 02 Jan 2008) | 2 lines

Add doxygen documentation to libresample.h while it's still fresh on my mind

................
r96019 | kpfleming | 2008-01-02 17:51:37 -0400 (Wed, 02 Jan 2008) | 4 lines

another checkpoint... chan_zap can now use the new ZT_ECHOCAN_PARAMS ioctl if it is present, but doesn't parse any supplied parameters yet

(this implementation is not very memory efficient as the parameters and their values will be duplicated for each channel that has the same settings, but we can worry about that later once it is working)

................
r96021 | russell | 2008-01-02 18:00:50 -0400 (Wed, 02 Jan 2008) | 9 lines

Blocked revisions 96020 via svnmerge

........
r96020 | russell | 2008-01-02 16:00:21 -0600 (Wed, 02 Jan 2008) | 2 lines

app_macro only needs a rdlock on the contexts list.

........

................
r96023 | russell | 2008-01-02 18:05:31 -0400 (Wed, 02 Jan 2008) | 9 lines

Blocked revisions 96022 via svnmerge

........
r96022 | russell | 2008-01-02 16:04:47 -0600 (Wed, 02 Jan 2008) | 2 lines

pbx_dundi only needs a rdlock on the contexts list.

........

................
r96025 | russell | 2008-01-02 18:15:58 -0400 (Wed, 02 Jan 2008) | 9 lines

Blocked revisions 96024 via svnmerge

........
r96024 | russell | 2008-01-02 16:14:28 -0600 (Wed, 02 Jan 2008) | 2 lines

Convert locks of the contexts list in pbx_config to the appropriate rdlock or wrlock

........

................
r96028 | mmichelson | 2008-01-02 18:29:15 -0400 (Wed, 02 Jan 2008) | 3 lines

Add curly braces around a compound if statement so that trunk will build properly


................
r96071 | file | 2008-01-02 18:40:55 -0400 (Wed, 02 Jan 2008) | 2 lines

Don't use AST_C_DEFINE_CHECK for the two pthread things that may not actually be definitions, they could be enums for example.

................
r96073 | kpfleming | 2008-01-02 18:41:23 -0400 (Wed, 02 Jan 2008) | 2 lines

actually parse and store echocan parameters from zapata.conf... this *should* work <G>

................
r96076 | russell | 2008-01-02 18:50:09 -0400 (Wed, 02 Jan 2008) | 2 lines

Show the correct CLI command to answer the call

................
r96077 | russell | 2008-01-02 18:52:13 -0400 (Wed, 02 Jan 2008) | 3 lines

Note that this module doesn't actually play a ringing sound for an incoming call
... oops

................
r96079 | russell | 2008-01-02 19:22:25 -0400 (Wed, 02 Jan 2008) | 5 lines

Add support for generating a ringing sound on an incoming call.  This is a bit
of a hack.  It just asks the core to generate the same tone that it would when
you hear ringback when making an outbound call.  But hey, it works, and you get
the localized ring tone for the appropriate language set on the channel.

................
r96103 | mmichelson | 2008-01-02 19:48:43 -0400 (Wed, 02 Jan 2008) | 12 lines

Merged revisions 96102 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96102 | mmichelson | 2008-01-02 17:46:02 -0600 (Wed, 02 Jan 2008) | 4 lines

We need to reset the membername to NULL on each iteration of this loop, otherwise the result is that
multiple members can have the same name, since the variable was not reset on each iteration of the loop.


........

................
r96147 | tilghman | 2008-01-02 21:59:27 -0400 (Wed, 02 Jan 2008) | 4 lines

Compatibility fix for OpenBSD
Report and fix by: mvanbaak
(Closes issue #11669)

................
r96174 | tilghman | 2008-01-03 02:16:48 -0400 (Thu, 03 Jan 2008) | 4 lines

Add coordination between AMI and AGI applications, with an asyncagi method
Feature proposed and patched by: moy
(Closes issue #11282)

................
r96221 | crichter | 2008-01-03 10:47:30 -0400 (Thu, 03 Jan 2008) | 9 lines

Merged revisions 96198 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96198 | crichter | 2008-01-03 13:08:40 +0100 (Do, 03 Jan 2008) | 1 line

when overlapdial was used and no number was dialed, the call was dropped, now we just jump into the s extension, which makes a lot more sense.
........

................
r96245 | kpfleming | 2008-01-03 14:10:13 -0400 (Thu, 03 Jan 2008) | 3 lines

coding guidelines cleanup
remove background thread and all sound generation mechanisms, as the built-in indications can handle everything that is needed

................
r96270 | kpfleming | 2008-01-03 15:56:29 -0400 (Thu, 03 Jan 2008) | 3 lines

eliminiate sound_thread() and other stuff from chan_oss since Asterisk indications can handle it
remove gentone and all the headers containing tones that are no longer needed

................
r96272 | kpfleming | 2008-01-03 16:04:30 -0400 (Thu, 03 Jan 2008) | 2 lines

add some simple infrastructure for modules to be used for testing parts of Asterisk

................
r96301 | tilghman | 2008-01-03 17:27:57 -0400 (Thu, 03 Jan 2008) | 4 lines

Allow the uniqueid to be used for searching for a channel in the list.
Reported and initially patched by: michael-fig
(Closes issue #11340)

................
r96332 | tilghman | 2008-01-03 17:43:58 -0400 (Thu, 03 Jan 2008) | 12 lines

Merged revisions 96318 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96318 | tilghman | 2008-01-03 15:37:02 -0600 (Thu, 03 Jan 2008) | 4 lines

Missed initialization caused crash.
Reported and fixed by: tiziano
(Closes issue #11671)

........

................
r96368 | tilghman | 2008-01-03 17:58:52 -0400 (Thu, 03 Jan 2008) | 2 lines

Document recent API addition

................
r96395 | russell | 2008-01-03 18:46:37 -0400 (Thu, 03 Jan 2008) | 11 lines

Merged revisions 96394 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96394 | russell | 2008-01-03 16:44:22 -0600 (Thu, 03 Jan 2008) | 3 lines

Don't crash if the iax2 pvt structure has been destroyed before we get to this point
(closes issue #11672, reported by snuffy, patched by me)

........

................
r96397 | kpfleming | 2008-01-03 19:01:53 -0400 (Thu, 03 Jan 2008) | 2 lines

there was no reason to add this define for non-Solaris platforms

................
r96398 | kpfleming | 2008-01-03 19:14:15 -0400 (Thu, 03 Jan 2008) | 2 lines

we have to *always* use a completely silent 'make' invocation for generating the module embedding rules

................
r96450 | russell | 2008-01-04 12:21:08 -0400 (Fri, 04 Jan 2008) | 15 lines

Merged revisions 96449 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96449 | russell | 2008-01-04 10:19:22 -0600 (Fri, 04 Jan 2008) | 7 lines

Make use of the temporary channel pointer while the pvt is unlocked.

(closes issue #11675)
Reported by: flefoll
Patches:
      chan_zap.c.patch-store-owner-before-unlock uploaded by flefoll (license 244)

........

................
r96499 | phsultan | 2008-01-04 13:19:25 -0400 (Fri, 04 Jan 2008) | 7 lines

Use SASL DIGEST-MD5 authentication over unsecured network connections only.

This authentication mechanism is implemented under the iksemel API, which
makes use of GnuTLS, whereas we use OpenSSL. Note : there's ongoing
dicsussion at the SASL IETF WG in order to deprecate SASL DIGEST-MD5, see
http://ietfreport.isoc.org/ids-wg-sasl.html.

................
r96500 | kpfleming | 2008-01-04 13:21:25 -0400 (Fri, 04 Jan 2008) | 8 lines

[commit message]

(closes issue #10393)
Reported by: tzafrir
Patches:
      chan_alarm_asterisk.diff uploaded by tzafrir (license 46) (modified by me and added configure script support)


................
r96547 | tilghman | 2008-01-04 15:35:00 -0400 (Fri, 04 Jan 2008) | 12 lines

Merged revisions 96525 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96525 | tilghman | 2008-01-04 13:27:25 -0600 (Fri, 04 Jan 2008) | 4 lines

If you change the bindaddr in sip.conf to a non-bound address and reload, sip goes kablooie.
Reported and patched by: one47
(Closes issue #11535)

........

................
r96574 | qwell | 2008-01-04 18:57:56 -0400 (Fri, 04 Jan 2008) | 13 lines

Merged revisions 96573 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11237)
........
r96573 | qwell | 2008-01-04 16:55:56 -0600 (Fri, 04 Jan 2008) | 4 lines

Properly continue in the dialplan if using PARKINGEXTEN and the slot is full.

Issue 11237, patch by me.

........

................
r96576 | tilghman | 2008-01-04 19:12:43 -0400 (Fri, 04 Jan 2008) | 15 lines

Merged revisions 96575 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96575 | tilghman | 2008-01-04 17:03:40 -0600 (Fri, 04 Jan 2008) | 7 lines

Fix the problem of notification of a device state change to a device with a '-'
in the name.  Could probably do with a better fix in trunk, but this bug has
been open way too long without a better solution.
Reported by: stevedavies
Patch by: tilghman
(Closes issue #9668)

........

................
r96621 | kpfleming | 2008-01-04 21:05:50 -0400 (Fri, 04 Jan 2008) | 2 lines

improve chan_usbradio to use indications just like chan_alsa/chan_oss do now

................
r96645 | russell | 2008-01-04 22:12:10 -0400 (Fri, 04 Jan 2008) | 10 lines

Merged revisions 96644 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96644 | russell | 2008-01-04 20:09:19 -0600 (Fri, 04 Jan 2008) | 2 lines

Don't pass an empty string as the device name.

........

................
r96692 | russell | 2008-01-05 17:25:45 -0400 (Sat, 05 Jan 2008) | 3 lines

Add the URL to the home page for portaudio.  Also add the location of the
svn repository to check out portaudio v19.

................
r96715 | russell | 2008-01-05 17:35:54 -0400 (Sat, 05 Jan 2008) | 3 lines

Add a note about changing modules.conf since another console channel driver is
now present that can not be used at the same time as chan_alsa or chan_oss.

................
r96716 | russell | 2008-01-05 18:04:08 -0400 (Sat, 05 Jan 2008) | 3 lines

Print out the name of a function being registered in color, just like the name
of applications when they get registered.

................
r96717 | russell | 2008-01-05 18:09:06 -0400 (Sat, 05 Jan 2008) | 15 lines

Now that the version.h file was getting properly regenerated every time the svn
revision changed, every module that used the version was getting rebuilt after
every svn update.  This severly annoyed me pretty quickly, so I have improved
the situation.

Now, instead of generating version.h, main/version.c is generated.  version.c
includes the version information, as well as a couple of API calls for modules
to retrieve the version.  So now, only version.c will get rebuilt, and the main
asterisk binary relinked, which is must faster than rebuilding http.c, manager.c,
asterisk.c, relinking the asterisk binary, chan_sip.c, func_version.c, res_agi ...

The only minor change in behavior here is that the version information reported by
chan_sip, for example, is the version of the Asterisk core, and not necessarily the
Asterisk version that the chan_sip module came from.

................
r96743 | russell | 2008-01-05 19:05:35 -0400 (Sat, 05 Jan 2008) | 4 lines

Convert this file over the new method of getting the Asterisk version.
(I don't have this building on this machine, so caio1982 on IRC is going to
 test it for me.  :) )

................
r96776 | rizzo | 2008-01-07 07:22:01 -0400 (Mon, 07 Jan 2008) | 4 lines

resolve a load-time problem avoiding a call to console_do_answer.
On passing, fix dialling from the keypad.


................
r96836 | rizzo | 2008-01-07 11:06:54 -0400 (Mon, 07 Jan 2008) | 4 lines

update comments to reflect reality (or at least planned behaviour).
minor code cleanups


................
r96858 | file | 2008-01-07 11:52:55 -0400 (Mon, 07 Jan 2008) | 6 lines

Move ModuleLoad and ModuleCheck manager commands from loader.c to manager.c. Previously they would get registered twice because of the way manager.c operates.
(closes issue #11699)
Reported by: caio1982
Patches:
      manager_module_commands1.diff uploaded by caio1982 (license 22)

................
r96862 | kpfleming | 2008-01-07 12:17:31 -0400 (Mon, 07 Jan 2008) | 2 lines

add a file-format driver for 16KHz signed linear... which may or may not work

................
r96885 | russell | 2008-01-07 12:42:42 -0400 (Mon, 07 Jan 2008) | 11 lines

Merged revisions 96884 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96884 | russell | 2008-01-07 10:39:23 -0600 (Mon, 07 Jan 2008) | 3 lines

Don't crash if something happens when setting up an SMDI interface and it gets
destroyed before the SMDI port handling thread gets created.

........

................
r96886 | russell | 2008-01-07 12:59:04 -0400 (Mon, 07 Jan 2008) | 2 lines

Build the HTML version of the doc files for tarballs, as well

................
r96887 | russell | 2008-01-07 13:09:23 -0400 (Mon, 07 Jan 2008) | 3 lines

If the HTML documentation exists, install it in the static-http/docs directory
so that it can be viewed through the Asterisk http server if it is turned on.

................
r96888 | russell | 2008-01-07 13:15:11 -0400 (Mon, 07 Jan 2008) | 2 lines

Add a note about viewing the default set of documentation using the built-in http server

................
r96933 | russell | 2008-01-07 16:48:23 -0400 (Mon, 07 Jan 2008) | 18 lines

Merged revisions 96932 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r96932 | russell | 2008-01-07 14:47:52 -0600 (Mon, 07 Jan 2008) | 10 lines

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

........
r96931 | russell | 2008-01-07 14:46:22 -0600 (Mon, 07 Jan 2008) | 2 lines

Change misery.digium.com to pbx.digium.com

........

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

................
r96934 | mmichelson | 2008-01-07 17:04:09 -0400 (Mon, 07 Jan 2008) | 7 lines

Adding user-configurable TCP timeout settings to IMAP voicemail. This could
go a long way towards preventing unexplainable hangs experienced by people. In the
case of MWI hangs, this also will mean that the SIP port isn't blocked anymore.

(closes issue #11665, reported by yehavi)


................
r96935 | mmichelson | 2008-01-07 17:10:59 -0400 (Mon, 07 Jan 2008) | 4 lines

Document some weird casting magic that's necessary to interface
with the c-client


................
r96936 | qwell | 2008-01-07 17:12:33 -0400 (Mon, 07 Jan 2008) | 4 lines

Display a message if no config mappings are found with "core show config mappings".

Closes issue #11704, patch by kshumard.

................
r96987 | mmichelson | 2008-01-07 18:31:03 -0400 (Mon, 07 Jan 2008) | 3 lines

Explicitly make literal constants long where they are expected to be.


................
r96988 | rizzo | 2008-01-07 19:03:11 -0400 (Mon, 07 Jan 2008) | 5 lines

add support for cropping the keypad image while displaying it.
This way it can contain additional elements (e.g. fonts, buttons,
widgets) without having to use a zillion files to store them.


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

Added:
    team/file/bridging/build_tools/make_version_c
      - copied unchanged from r96988, trunk/build_tools/make_version_c
    team/file/bridging/formats/format_sln16.c
      - copied unchanged from r96988, trunk/formats/format_sln16.c
    team/file/bridging/include/asterisk/libresample.h
      - copied unchanged from r96988, trunk/include/asterisk/libresample.h
    team/file/bridging/tests/   (props changed)
      - copied from r96988, trunk/tests/
    team/file/bridging/tests/Makefile
      - copied unchanged from r96988, trunk/tests/Makefile
    team/file/bridging/tests/test_skel.c
      - copied unchanged from r96988, trunk/tests/test_skel.c
Removed:
    team/file/bridging/build_tools/make_version_h
    team/file/bridging/channels/answer.h
    team/file/bridging/channels/busy.h
    team/file/bridging/channels/gentone.c
    team/file/bridging/channels/ring10.h
    team/file/bridging/channels/ringtone.h
Modified:
    team/file/bridging/   (props changed)
    team/file/bridging/Makefile
    team/file/bridging/UPGRADE.txt
    team/file/bridging/acinclude.m4
    team/file/bridging/apps/app_ices.c
    team/file/bridging/apps/app_mp3.c
    team/file/bridging/apps/app_osplookup.c
    team/file/bridging/apps/app_queue.c
    team/file/bridging/apps/app_rpt.c
    team/file/bridging/apps/app_voicemail.c
    team/file/bridging/bridges/Makefile
    team/file/bridging/build_tools/prep_tarball
    team/file/bridging/channels/   (props changed)
    team/file/bridging/channels/Makefile
    team/file/bridging/channels/chan_agent.c
    team/file/bridging/channels/chan_alsa.c
    team/file/bridging/channels/chan_console.c
    team/file/bridging/channels/chan_iax2.c
    team/file/bridging/channels/chan_misdn.c
    team/file/bridging/channels/chan_oss.c
    team/file/bridging/channels/chan_sip.c
    team/file/bridging/channels/chan_usbradio.c
    team/file/bridging/channels/chan_zap.c
    team/file/bridging/channels/console_gui.c
    team/file/bridging/codecs/Makefile
    team/file/bridging/codecs/codec_resample.c
    team/file/bridging/configs/extensions.conf.sample
    team/file/bridging/configs/http.conf.sample
    team/file/bridging/configs/zapata.conf.sample
    team/file/bridging/configure
    team/file/bridging/configure.ac
    team/file/bridging/doc/tex/imapstorage.tex
    team/file/bridging/funcs/func_odbc.c
    team/file/bridging/funcs/func_strings.c
    team/file/bridging/funcs/func_version.c
    team/file/bridging/include/asterisk/   (props changed)
    team/file/bridging/include/asterisk/app.h
    team/file/bridging/include/asterisk/autoconfig.h.in
    team/file/bridging/include/asterisk/channel.h
    team/file/bridging/main/   (props changed)
    team/file/bridging/main/Makefile
    team/file/bridging/main/asterisk.c
    team/file/bridging/main/channel.c
    team/file/bridging/main/config.c
    team/file/bridging/main/devicestate.c
    team/file/bridging/main/http.c
    team/file/bridging/main/libresample/include/libresample.h
    team/file/bridging/main/loader.c
    team/file/bridging/main/manager.c
    team/file/bridging/main/pbx.c
    team/file/bridging/main/translate.c
    team/file/bridging/res/res_agi.c
    team/file/bridging/res/res_config_pgsql.c
    team/file/bridging/res/res_features.c
    team/file/bridging/res/res_jabber.c
    team/file/bridging/res/res_smdi.c
    team/file/bridging/res/snmp/agent.c

Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/file/bridging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan  7 18:25:11 2008
@@ -1,1 +1,1 @@
-/trunk:1-95841
+/trunk:1-97010

Modified: team/file/bridging/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/bridging/Makefile?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/Makefile (original)
+++ team/file/bridging/Makefile Mon Jan  7 18:25:11 2008
@@ -101,7 +101,7 @@
 
 # Some build systems, such as the one in openwrt, like to pass custom target
 # CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
-ASTCFLAGS+=$(COPTS) -D_XPG4_2
+ASTCFLAGS+=$(COPTS)
 ASTLDFLAGS+=$(LDOPTS)
 
 #Uncomment this to see all build commands instead of 'quiet' output
@@ -257,7 +257,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
 endif
 
 ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
@@ -279,7 +279,7 @@
 #	#ifdef BUSYDETECT in main/dsp.c
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -309,10 +309,11 @@
 # comment to print directories during submakes
 #PRINT_DIR=yes
 
+SILENTMAKE:=$(MAKE) --quiet --no-print-directory
 ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
-SUBMAKE=$(MAKE) --quiet
+SUBMAKE:=$(MAKE) --quiet
 else
-SUBMAKE=$(MAKE) --quiet --no-print-directory
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
 endif
 
 # This is used when generating the doxygen documentation
@@ -352,13 +353,13 @@
 	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
-	@echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+	@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LDFLAGS):
-	@echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+	@echo "EMBED_LDFLAGS+="`$(SILENTMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LIBS):
-	@echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+	@echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_MENUSELECT_TREE):
 	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
@@ -371,7 +372,7 @@
 	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
 	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
 
-$(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
     # Non-windows:
@@ -402,8 +403,8 @@
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-include/asterisk/version.h:
-	@build_tools/make_version_h > $@.tmp
+main/version.c:
+	@build_tools/make_version_c > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
@@ -426,7 +427,7 @@
 clean: $(SUBDIRS_CLEAN)
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
-	rm -f include/asterisk/version.h
+	rm -f main/version.c
 	@$(MAKE) -C menuselect clean
 	cp -f .cleancount .lastclean
 
@@ -453,6 +454,12 @@
 	for x in static-http/*; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
+	if [ -d doc/tex/asterisk ] ; then \
+			mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+			for n in doc/tex/asterisk/* ; do \
+				$(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+			done \
+	fi
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
@@ -694,7 +701,7 @@
 
 rpm: __rpm
 
-__rpm: include/asterisk/version.h include/asterisk/buildopts.h spec
+__rpm: main/version.c include/asterisk/buildopts.h spec
 	rm -rf /tmp/asterisk ; \
 	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
@@ -819,4 +826,4 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) include/asterisk/version.h
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) main/version.c

Modified: team/file/bridging/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/file/bridging/UPGRADE.txt?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/UPGRADE.txt (original)
+++ team/file/bridging/UPGRADE.txt Mon Jan  7 18:25:11 2008
@@ -136,6 +136,13 @@
   to be compatible with settings in sip.conf. The "tos" and "cos" configuration
   is deprecated and will stop working in the next release of Asterisk.
 
+* Console: A new console channel driver, chan_console, has been added to Asterisk.
+  This new module can not be loaded at the same time as chan_alsa or chan_oss.  The
+  default modules.conf only loads one of them (chan_oss by default).  So, unless you
+  have modified your modules.conf to not use the autoload option, then you will need
+  to modify modules.conf to add another "noload" line to ensure that only one of
+  these three modules gets loaded.
+
 Configuration:
 
 * pbx_dundi.c: tos parameter changed to use new values. Old values like lowdelay,

Modified: team/file/bridging/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/file/bridging/acinclude.m4?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/acinclude.m4 (original)
+++ team/file/bridging/acinclude.m4 Mon Jan  7 18:25:11 2008
@@ -75,6 +75,7 @@
 
 # The next three functions check for the availability of a given package.
 # AST_C_DEFINE_CHECK looks for the presence of a #define in a header file,
+# AST_C_COMPILE_CHECK can be used for testing for various items in header files,
 # AST_EXT_LIB_CHECK looks for a symbol in a given library, or at least
 #	for the presence of a header file.
 # AST_EXT_TOOL_CHECK looks for a symbol in using $1-config to determine CFLAGS and LIBS
@@ -100,7 +101,43 @@
 	CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
 
 	AC_COMPILE_IFELSE(
-	    [ AC_LANG_PROGRAM( [#include <$3>], [int foo = $2;]) ],
+	    [ AC_LANG_PROGRAM( [#include <$3>],
+			       [#if defined($2)
+				int foo = 0;
+			        #else
+			        int foo = bar;
+			        #endif
+				0
+			       ])],
+	    [   AC_MSG_RESULT(yes)
+		PBX_$1=1
+		AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.])
+		AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])
+	    ],
+	    [       AC_MSG_RESULT(no) ] 
+	)
+	CPPFLAGS="${saved_cppflags}"
+    fi
+])
+
+
+# Check if a given expression will compile using a certain header.
+
+# AST_C_COMPILE_CHECK([package], [expression], [header file], [version])
+AC_DEFUN([AST_C_COMPILE_CHECK],
+[
+    if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
+	AC_MSG_CHECKING([if "$2" compiles using $3])
+	saved_cppflags="${CPPFLAGS}"
+	if test "x${$1_DIR}" != "x"; then
+	    $1_INCLUDE="-I${$1_DIR}/include"
+	fi
+	CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
+
+	AC_COMPILE_IFELSE(
+	    [ AC_LANG_PROGRAM( [#include <$3>],
+			       [ $2; ]
+			       )],
 	    [   AC_MSG_RESULT(yes)
 		PBX_$1=1
 		AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.])

Modified: team/file/bridging/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_ices.c?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/apps/app_ices.c (original)
+++ team/file/bridging/apps/app_ices.c Mon Jan  7 18:25:11 2008
@@ -86,11 +86,11 @@
 			close(x);
 	}
 	/* Most commonly installed in /usr/local/bin */
-	execl(ICES, "ices", filename, NULL);
+	execl(ICES, "ices", filename, (char *)NULL);
 	/* But many places has it in /usr/bin */
-	execl(LOCAL_ICES, "ices", filename, NULL);
+	execl(LOCAL_ICES, "ices", filename, (char *)NULL);
 	/* As a last-ditch effort, try to use PATH */
-	execlp("ices", "ices", filename, NULL);
+	execlp("ices", "ices", filename, (char *)NULL);
 	ast_log(LOG_WARNING, "Execute of ices failed\n");
 	_exit(0);
 }

Modified: team/file/bridging/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_mp3.c?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/apps/app_mp3.c (original)
+++ team/file/bridging/apps/app_mp3.c Mon Jan  7 18:25:11 2008
@@ -82,19 +82,19 @@
 	/* Execute mpg123, but buffer if it's a net connection */
 	if (!strncasecmp(filename, "http://", 7)) {
 		/* Most commonly installed in /usr/local/bin */
-	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* But many places has it in /usr/bin */
-	    execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* As a last-ditch effort, try to use PATH */
-	    execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024",  "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024",  "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 	}
 	else {
 		/* Most commonly installed in /usr/local/bin */
-	    execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* But many places has it in /usr/bin */
-	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* As a last-ditch effort, try to use PATH */
-	    execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 	}
 	ast_log(LOG_WARNING, "Execute of mpg123 failed\n");
 	_exit(0);

Modified: team/file/bridging/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_osplookup.c?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/apps/app_osplookup.c (original)
+++ team/file/bridging/apps/app_osplookup.c Mon Jan  7 18:25:11 2008
@@ -1938,7 +1938,7 @@
 static const char* app1= "OSPAuth";
 static const char* synopsis1 = "OSP authentication";
 static const char* descrip1 =
-"  OSPAuth([provider[|options]]):  Authenticate a SIP INVITE by OSP and sets\n"
+"  OSPAuth([provider[,options]]):  Authenticate a SIP INVITE by OSP and sets\n"
 "the variables:\n"
 " ${OSPINHANDLE}:  The inbound call transaction handle\n"
 " ${OSPINTIMELIMIT}:  The inbound call duration limit in seconds\n"
@@ -1950,7 +1950,7 @@
 static const char* app2= "OSPLookup";
 static const char* synopsis2 = "Lookup destination by OSP";
 static const char* descrip2 =
-"  OSPLookup(exten[|provider[|options]]):  Looks up an extension via OSP and sets\n"
+"  OSPLookup(exten[,provider[,options]]):  Looks up an extension via OSP and sets\n"
 "the variables, where 'n' is the number of the result beginning with 1:\n"
 " ${OSPOUTHANDLE}:  The OSP Handle for anything remaining\n"
 " ${OSPTECH}:  The technology to use for the call\n"
@@ -1975,7 +1975,7 @@
 static const char* app3 = "OSPNext";
 static const char* synopsis3 = "Lookup next destination by OSP";
 static const char* descrip3 =
-"  OSPNext(cause[|provider[|options]]):  Looks up the next OSP Destination for ${OSPOUTHANDLE}\n"
+"  OSPNext(cause[,provider[,options]]):  Looks up the next OSP Destination for ${OSPOUTHANDLE}\n"
 "See OSPLookup for more information\n"
 "\n"
 "This application sets the following channel variable upon completion:\n"
@@ -1985,7 +1985,7 @@
 static const char* app4 = "OSPFinish";
 static const char* synopsis4 = "Record OSP entry";
 static const char* descrip4 =
-"  OSPFinish([status[|options]]):  Records call state for ${OSPINHANDLE}, according to\n"
+"  OSPFinish([status[,options]]):  Records call state for ${OSPINHANDLE}, according to\n"
 "status, which should be one of BUSY, CONGESTION, ANSWER, NOANSWER, or CHANUNAVAIL\n"
 "or coincidentally, just what the Dial application stores in its ${DIALSTATUS}.\n"
 "\n"

Modified: team/file/bridging/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_queue.c?view=diff&rev=97011&r1=97010&r2=97011
==============================================================================
--- team/file/bridging/apps/app_queue.c (original)
+++ team/file/bridging/apps/app_queue.c Mon Jan  7 18:25:11 2008
@@ -300,10 +300,18 @@
 
 /*! \brief We define a custom "local user" structure because we
    use it not only for keeping track of what is in use but
-   also for keeping track of who we're dialing. */
+   also for keeping track of who we're dialing.
+
+   There are two "links" defined in this structure, q_next and call_next.
+   q_next links ALL defined callattempt structures into a linked list. call_next is
+   a link which allows for a subset of the callattempts to be traversed. This subset
+   is used in wait_for_answer so that irrelevant callattempts are not traversed. This
+   also is helpful so that queue logs are always accurate in the case where a call to 
+   a member times out, especially if using the ringall strategy. */
 
 struct callattempt {
 	struct callattempt *q_next;
+	struct callattempt *call_next;
 	struct ast_channel *chan;
 	char interface[256];
 	int stillgoing;
@@ -2303,7 +2311,7 @@
 static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed)
 {
 	const char *queue = qe->parent->name;
-	struct callattempt *o;
+	struct callattempt *o, *start = NULL, *prev = NULL;
 	int status;
 	int numbusies = prebusies;
 	int numnochan = 0;
@@ -2333,14 +2341,21 @@
 		int numlines, retry, pos = 1;
 		struct ast_channel *watchers[AST_MAX_WATCHERS];
 		watchers[0] = in;
+		start = NULL;
 
 		for (retry = 0; retry < 2; retry++) {
 			numlines = 0;
 			for (o = outgoing; o; o = o->q_next) { /* Keep track of important channels */
 				if (o->stillgoing) {	/* Keep track of important channels */
 					stillgoing = 1;
-					if (o->chan)
+					if (o->chan) {
 						watchers[pos++] = o->chan;
+						if (!start)
+							start = o;
+						else
+							prev->call_next = o;
+						prev = o;
+					}
 				}
 				numlines++;
 			}
@@ -2362,7 +2377,7 @@
 			return NULL;
 		}
 		winner = ast_waitfor_n(watchers, pos, to);
-		for (o = outgoing; o; o = o->q_next) {
+		for (o = start; o; o = o->call_next) {
 			if (o->stillgoing && (o->chan) &&  (o->chan->_state == AST_STATE_UP)) {
 				if (!peer) {
 					ast_verb(3, "%s answered %s\n", o->chan->name, in->name);
@@ -2524,8 +2539,10 @@
 			}
 			ast_frfree(f);
 		}
-		if (!*to)
-			rna(orig, qe, on, membername);
+		if (!*to) {
+			for (o = start; o; o = o->call_next)
+				rna(orig, qe, o->interface, o->member->membername);
+		}
 	}
 
 #ifdef HAVE_EPOLL
@@ -4883,11 +4900,12 @@
 				for (var = ast_variable_browse(cfg, cat); var; var = var->next) {
 					if (!strcasecmp(var->name, "member")) {
 						struct member tmpmem;

[... 5462 lines stripped ...]