Russell Bryant [Wed, 12 Dec 2007 19:50:32 +0000 (19:50 +0000)]
Merged revisions 92556 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92556 | russell | 2007-12-12 13:40:02 -0600 (Wed, 12 Dec 2007) | 1 line
resolve compiler warning
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92562
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 12 Dec 2007 17:51:50 +0000 (17:51 +0000)]
Same change to trunk as revision 92510. I'm not sure why I merged
this way, but I did.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92526
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 12 Dec 2007 17:48:34 +0000 (17:48 +0000)]
Blocked revisions 92510 via svnmerge
........
r92510 | mmichelson | 2007-12-12 11:46:14 -0600 (Wed, 12 Dec 2007) | 7 lines
Correctly detect where a dynamic feature was activated. Before this patch,
the channel which initiated the bridge was always assumed to have been the one
which activated the dynamic feature. This patch corrects this.
(closes issue #11529, reported and patched by nic_bellamy)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92511
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 12 Dec 2007 17:15:56 +0000 (17:15 +0000)]
Correctly handle possible memory allocation failure
Reported by: eliel
Patch by: eliel
(Closes issue #11512)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92507
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 12 Dec 2007 16:56:12 +0000 (16:56 +0000)]
Merged revisions 92463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92463 | tilghman | 2007-12-12 10:52:56 -0600 (Wed, 12 Dec 2007) | 4 lines
Test directly for the API that fixed AST-2007-026, to ensure that older
versions of PostgreSQL are no longer acceptable.
(Closes issue #11526)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92476
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 12 Dec 2007 16:11:13 +0000 (16:11 +0000)]
Merged revisions 92443 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92443 | mmichelson | 2007-12-12 10:08:55 -0600 (Wed, 12 Dec 2007) | 3 lines
Removing an unused variable.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92444
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 11 Dec 2007 22:20:22 +0000 (22:20 +0000)]
Doxygen updates, formatting.
misdn stuff needs a lot of doxygenification
(Hello, Qwell :-) )
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92423
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2007 22:10:43 +0000 (22:10 +0000)]
Trunk build would fail due to the nonexistence of zaptel hwgain
structures missing. Patched configure to check for this stuff and
put a #ifdef around the offending code in chan_zap. Thanks to file
for overseeing this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92422
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 11 Dec 2007 21:58:26 +0000 (21:58 +0000)]
We need to set the address we want to match against before we actually do the match..
Closes issue #11518.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92421
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2007 21:46:16 +0000 (21:46 +0000)]
Removing a pointless memset. The memory was just calloc'd, so the
memory is already zeroed out
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92402
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 11 Dec 2007 21:17:37 +0000 (21:17 +0000)]
Add variable to show which key was pressed to stop playback.
Issue #11377, initial patch by johan.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92401
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 11 Dec 2007 20:06:43 +0000 (20:06 +0000)]
Only look to see if options are set if some have been provided.
(closes issue #11505)
Reported by: Mike Anikienko
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92365
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 11 Dec 2007 19:52:37 +0000 (19:52 +0000)]
Merged revisions 92363 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92363 | file | 2007-12-11 15:51:40 -0400 (Tue, 11 Dec 2007) | 6 lines
Fix potential memory leak with the dialed interfaces list if another memory allocation fails.
(closes issue #11507)
Reported by: eliel
Patches:
global_datastores.c.patch uploaded by eliel (license 64)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92364
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2007 17:44:42 +0000 (17:44 +0000)]
Merged revisions 92323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92323 | mmichelson | 2007-12-11 11:42:25 -0600 (Tue, 11 Dec 2007) | 10 lines
Fixing autofill to be more accurate. Specifically, if calls ahead of the current
caller were ringing members (but not yet bridged) there could be available members
and waiting callers who would not get matched up. The member availability checker
was correctly determining the number of available members in this scenario, but
the queue itself did not parallelly reflect this status on the pending calls. This
commit corrects the issue.
(closes issue #11459, reported by equissoftware, patched by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92324
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 11 Dec 2007 16:29:29 +0000 (16:29 +0000)]
* In unaligned.h, remove some unnecessary casts and mark the arg of the
get_unaligned functions as const
* In event.c, use get_unaligned_uint32() in a couple of places to fix issues on
architectures that don't allow unaligned access
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92305
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 11 Dec 2007 14:17:29 +0000 (14:17 +0000)]
A lot of doxygen updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92285
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 11 Dec 2007 09:26:25 +0000 (09:26 +0000)]
Doxygen updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92267
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Doug Bailey [Mon, 10 Dec 2007 20:18:25 +0000 (20:18 +0000)]
Add CLI commands to dynamically set hw and sw gains
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92243
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 10 Dec 2007 16:48:18 +0000 (16:48 +0000)]
Add ast_atomic_fetchadd_int_slow to check_expr for platforms that need it.
(closes issue #11484)
Reported by: snuffy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92206
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 10 Dec 2007 16:37:35 +0000 (16:37 +0000)]
Merged revisions 92204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92204 | file | 2007-12-10 12:36:15 -0400 (Mon, 10 Dec 2007) | 6 lines
Add G729A as another possible payload name for G729. Some devices use this instead of G729, which is perfectly normal since the payload number itself is defined and can't be used by anything else so the name doesn't matter that much.
(closes issue #11483)
Reported by: revolution
Patches:
rtp.diff uploaded by revolution (license 346)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92205
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 10 Dec 2007 16:30:46 +0000 (16:30 +0000)]
Merged revisions 92202 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92202 | mmichelson | 2007-12-10 10:29:44 -0600 (Mon, 10 Dec 2007) | 7 lines
If there are no members in a queue, then the loop where the datastore for detecting
duplicate dialed numbers will be skipped, meaning the datastore isn't created. This means
that when we try to free it, there's a crash. This stops that crash from occurring.
(closes issue #11499, reported by slavon, patched by eliel)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92203
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 10 Dec 2007 16:15:06 +0000 (16:15 +0000)]
Blocked revisions 92200 via svnmerge
........
r92200 | file | 2007-12-10 12:13:43 -0400 (Mon, 10 Dec 2007) | 4 lines
It is possible for nativeformats to contain more then one codec, so print out multiple ones.
(closes issue #11366)
Reported by: ovi
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92201
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 10 Dec 2007 16:07:33 +0000 (16:07 +0000)]
Only send a SIGHUP if the pid is greater than -1, otherwise all PIDs greater than -1 will get the SIGHUP... and that is bad.
(closes issue #11453)
Reported by: alanmcmillan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92199
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 10 Dec 2007 14:18:21 +0000 (14:18 +0000)]
Removing some LOG_DEBUG items
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92160
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 10 Dec 2007 14:10:24 +0000 (14:10 +0000)]
Merged revisions 92158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r92158 | oej | 2007-12-10 15:04:44 +0100 (MÃ¥n, 10 Dec 2007) | 16 lines
Avoid reinvite race situations with two Asterisks trying
to reinvite each other in 1.4 and trunk.
This patch implements support for the 491 error code that
Asterisk 1.4 generates on situations where we get an
incoming INVITE and already has one in progress.
Thanks to mavetju for reporting and to Raj Jain for an
excellent explanation of the problem.
Patch by myself. Tested with 8 Asterisk servers connected
to each other in a training network.
Closes issue #10481
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92159
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 10 Dec 2007 13:29:57 +0000 (13:29 +0000)]
Add a few extra headers in the voicemail users listing in
manager 1.1. Update documentation too.
(closes issue #11495)
Reported by: caio1982
Patches:
extra_vm_manager_info1.diff uploaded by caio1982 (license 22)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92140
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 09:00:44 +0000 (09:00 +0000)]
simplify/cleanup the scripts
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92122
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 08:40:59 +0000 (08:40 +0000)]
remove relative paths and use ASTTOPDIR instead.
Give a default value to ASTTOPDIR if unset so we can at least
do a 'make clean' without too much trouble.
The proper fix, however, is to partition the top level
Makefile in a 'setup' and a 'main' part, in a way that the
'setup' part can be included from subdirs' Makefiles and
allow targets to be built without going through the
top level Makefile.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92104
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 08:35:35 +0000 (08:35 +0000)]
simplify this file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92103
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 04:38:49 +0000 (04:38 +0000)]
add a bit of info on the build infrastructure
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92084
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 04:18:07 +0000 (04:18 +0000)]
Fix the detection of modules installed from this build.
You can now add the path of local module subdirs from the command line with
make LOCAL_MOD_SUBDIRS= ....
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92083
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 03:50:38 +0000 (03:50 +0000)]
Put into Makefile.moddir_rules the common instructions used to
generate loadable and embedded module lists.
Individual Makefiles now are a lot simpler, possibly as simple as this:
-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
MODULE_PREFIX=cdr_
all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules
and also more flexible because in a single directory we can combine
various types of modules (app_, cdr_, func_, ... ) by simply
listing them in the MODULE_PREFIX variable.
The individual Makefiles can also create list of modules to be
excluded by listing them in the variablel MODULE_EXCLUDE (see an
example in channels/Makefile).
With this change it becomes trivial to integrate a directory with
locally created/modified sources into the main build.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92082
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 02:06:40 +0000 (02:06 +0000)]
make the install target a bit less noisy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92063
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 10 Dec 2007 01:54:40 +0000 (01:54 +0000)]
document usage of several exported variables
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92062
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 9 Dec 2007 22:55:58 +0000 (22:55 +0000)]
add hashtab.c to the list of files deleted
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92042
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 9 Dec 2007 21:32:30 +0000 (21:32 +0000)]
another place where ../ should have been ASTTOPDIR
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92023
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 9 Dec 2007 21:29:37 +0000 (21:29 +0000)]
normalize subdirs' Makefile by using ASTTOPDIR and not .. to reference
the top level directory.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92022
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 9 Dec 2007 16:47:25 +0000 (16:47 +0000)]
Implement the outcome of a discussion on the -dev list re. the use
of DESTDIR and INSTALL_PATH - many thanks to Tzafrir Cohen and
Simon Perreault for extremely useful feedback:
1. comment out the [directories] section the created asterisk.conf ;
you can set the correct defaults at build time using INSTALL_PATH,
so the repetition here is redundant and often wrong.
(The next step now is move asterisk.conf outside the Makefile to
asterisk.conf.sample, because there is little if anything here
that needs to be constructed at build/install time).
2. use DESTDIR?=$(INSTALL_PATH) so you only need to specify a path
once if the two coincide. This should have no ill side effects,
because if you don't specify DESTDIR, you really need
INSTALL_PATH="" to set the correct defaults, and if you specify
DESTDIR the value is not overridden.
The second part required moving the 'export DESTDIR' right after
the assignment to prevent DESTDIR getting set by the export
(this is documented in the Makefile).o hopefully avoid the mistake)$
With this change you can now do something like this from your source tree:
make INSTALL_PATH=/some/place install samples
and then
main/asterisk -vdc
which will pick up the correct config files and libraries from
/some/place - i.e. great for developers!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92002
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 19:06:01 +0000 (19:06 +0000)]
remove unused code, and simplify the logic for #include/#exec
(still a lot of cleanup needed here).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91983
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 18:50:32 +0000 (18:50 +0000)]
Implement comment_buffer and lline_buffer in terms of the ast_str_*() API.
I don't know if comment_buffers etc are actually used at all...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91962
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 18:18:28 +0000 (18:18 +0000)]
unify some common code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91953
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 18:05:42 +0000 (18:05 +0000)]
normalize formatting
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91952
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 17:58:08 +0000 (17:58 +0000)]
document a nice technique to exit from a block in case of errors.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91951
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 03:47:19 +0000 (03:47 +0000)]
a little bit of documentation on how lines are parsed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91931
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 03:27:16 +0000 (03:27 +0000)]
normalize header order, and add a comment on the need
to clean up this file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91930
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 8 Dec 2007 03:26:09 +0000 (03:26 +0000)]
some platforms (e.g. FreeBSD4) need netinet/in.h to be included
before arpa/inet.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91929
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 7 Dec 2007 23:32:09 +0000 (23:32 +0000)]
Merged revisions 91890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #11273)
........
r91890 | qwell | 2007-12-07 17:29:01 -0600 (Fri, 07 Dec 2007) | 4 lines
We need to make sure we free the input frame if we return a different frame in ast_dsp_process.
Issue 11273, pointed out by dimas, with a patch by eliel.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91891
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 7 Dec 2007 21:28:49 +0000 (21:28 +0000)]
Update documentation for pbx_lua.
Closes issue #11492, patch by mnicholson.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91832
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 21:25:03 +0000 (21:25 +0000)]
Merged revisions 91830 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91830 | russell | 2007-12-07 15:24:33 -0600 (Fri, 07 Dec 2007) | 5 lines
Make the lock protecting each thread's list of locks it currently holds
recursive. I think that this will fix the situation where some people have
said that "core show locks" locks up the CLI.
(related to issue #11080)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91831
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 21:17:52 +0000 (21:17 +0000)]
Merged revisions 91828 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91828 | russell | 2007-12-07 15:17:24 -0600 (Fri, 07 Dec 2007) | 6 lines
Fix another bug in the DEBUG_THREADS code. The ast_mutex_init() function had
the mutex attribute object marked as static. This means that multiple threads
initializing locks at the same time could step on each other and end up with
improperly initialized locks.
(found when tracking down locking issues related to issue #11080)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91829
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 21:11:44 +0000 (21:11 +0000)]
Merged revisions 91826 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91826 | russell | 2007-12-07 15:11:08 -0600 (Fri, 07 Dec 2007) | 6 lines
I love fixing lock related errors in the lock debugging code. That's about as
ironic as it gets in Asterisk programming land. Anyway, I spotted this bug while
trying to track down why systems are locking up and acting weird in issue #11080.
The mutex attribute object was marked as static in this function when it should
not have been.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91827
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 16:40:41 +0000 (16:40 +0000)]
Merged revisions 91783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91783 | russell | 2007-12-07 10:38:48 -0600 (Fri, 07 Dec 2007) | 6 lines
* Add channel locking around datastore operations that expect the channel
to be locked.
* Document why we don't record Local channels in the dialed interfaces list.
* Remove the dialed variable as it isn't needed.
* Restructure some code for clarity and coding guidelines stuff
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91784
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 7 Dec 2007 16:37:36 +0000 (16:37 +0000)]
Fix a small typo in a comment.
Closes issue #11490
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91782
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 16:28:36 +0000 (16:28 +0000)]
Merged revisions 91780 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91780 | russell | 2007-12-07 10:25:25 -0600 (Fri, 07 Dec 2007) | 7 lines
* Add channel locking around datastore operations that expect the channel
to be locked.
* Document why we don't record Local channels in the dialed interfaces list.
* Handle memory allocation failure.
* Remove the dialed variable, as it wasn't actually needed.
* Tweak some formatting to conform to coding guidelines.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91781
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 7 Dec 2007 16:11:05 +0000 (16:11 +0000)]
Add count of total number of calls processed by asterisk during it's lifetime.
Add number of total calls and current calls to SNMP.
Closes issue #10057, patch by jcmoore.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91779
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 16:11:00 +0000 (16:11 +0000)]
Merged revisions 91777 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91777 | russell | 2007-12-07 10:08:35 -0600 (Fri, 07 Dec 2007) | 6 lines
* Add a bit more of a verbose comment as to why a hangup frame needs to be
queued up if autoservice gets a NULL return from ast_read().
* Make the process of queueing the hangup frame more efficient by putting the
frame where it is going to end up and avoiding some locking and extra memory
allocations and freeing.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91778
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 7 Dec 2007 15:40:59 +0000 (15:40 +0000)]
Merged revisions 91737 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91737 | mmichelson | 2007-12-07 09:39:58 -0600 (Fri, 07 Dec 2007) | 7 lines
Hangups that happen during autoservice were not processed appropriately. This is
because a hangup actually causes a NULL frame to be received, not a hangup frame.
Queueing a hangup if we receive a NULL frame during autoservice corrects this problem
(closes issue #11467, reported by jmls, patched by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91738
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 02:52:38 +0000 (02:52 +0000)]
Merged revisions 91693 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91693 | russell | 2007-12-06 20:51:22 -0600 (Thu, 06 Dec 2007) | 2 lines
Don't unlock the dialed_interfaces list until we're done messing with the iterator.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91700
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 02:43:21 +0000 (02:43 +0000)]
Merged revisions 91677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91677 | russell | 2007-12-06 20:38:40 -0600 (Thu, 06 Dec 2007) | 4 lines
Allow dialing local channels from Queue() and Dial() again. There was a slight
flaw in the code to prevent call forwards from looping that caused this problem.
(related to issue #11486)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91678
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 7 Dec 2007 02:21:07 +0000 (02:21 +0000)]
Merged revisions 91675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91675 | russell | 2007-12-06 20:19:45 -0600 (Thu, 06 Dec 2007) | 7 lines
Fix in an issue in the call forwarding handling code that was causing crashes
on every call into a queue. I'm not entirely sure about the logic in this part
of the code, so I want to look at it some more tomorrow. However, this makes
it safe and keeps it from crashing.
(closes issue #11486, reported by adamg, patched by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91676
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 7 Dec 2007 00:58:52 +0000 (00:58 +0000)]
Merged revisions 91637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91637 | tilghman | 2007-12-06 18:52:17 -0600 (Thu, 06 Dec 2007) | 5 lines
At the end of a call, when we're reporting, RTCP may already be partially torn down, so check for NULL dereference
Reported by: blitzrage
Patch by: tilghman
(Closes issue #11450)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91638
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 6 Dec 2007 23:47:07 +0000 (23:47 +0000)]
Add a manager event for PRI events: this will help manager users detect when a D-channel goes down
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91618
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 6 Dec 2007 23:27:46 +0000 (23:27 +0000)]
If duration or billsec are not yet calculated, calculate them on demand.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91617
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 6 Dec 2007 21:57:28 +0000 (21:57 +0000)]
Fix a problem with quoting in sqlite3 cdr module..
Closes issue #11070, patch by seanbright.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91598
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 6 Dec 2007 21:03:15 +0000 (21:03 +0000)]
Handle allocation failure of the heard and deleted arrays of the vm_state.
(closes issue #11408, reported and patched by jaroth)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91579
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 6 Dec 2007 20:52:26 +0000 (20:52 +0000)]
Merged revisions 90166,90736,90753 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90166 | tilghman | 2007-11-29 13:48:10 -0600 (Thu, 29 Nov 2007) | 3 lines
Properly escape cdr->src and cdr->dst and ensure we use thread-safe escaping
(Fixes AST-2007-026)
........
r90736 | tilghman | 2007-12-03 17:23:55 -0600 (Mon, 03 Dec 2007) | 5 lines
If both dbhost and dbsock were not set, a NULL deref could result
Reported by: xrg
Patch by: tilghman
(Closes issue #11387)
........
r90753 | tilghman | 2007-12-03 17:50:51 -0600 (Mon, 03 Dec 2007) | 5 lines
Solaris requires the inclusion of sys/loadavg.h for getloadavg().
Reported by: snuffy
Patch by: snuffy,tilghman
(Closes issue #11430)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91561
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 6 Dec 2007 19:12:54 +0000 (19:12 +0000)]
Blocked revisions 91501 via svnmerge
........
r91501 | russell | 2007-12-06 13:11:35 -0600 (Thu, 06 Dec 2007) | 5 lines
Add a new module flag to indicate that a build sum is present. Modules built
against older Asterisk 1.4 headers will now load properly with just a warning
indicating that they are old and may cause problems.
(patch by paravoid)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91502
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Thu, 6 Dec 2007 16:54:08 +0000 (16:54 +0000)]
Make sure we clear these flags when libpri is not installed
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91472
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 6 Dec 2007 16:51:09 +0000 (16:51 +0000)]
Merged revisions 91450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91450 | file | 2007-12-06 12:49:42 -0400 (Thu, 06 Dec 2007) | 6 lines
Fix various in the udptl implementation. It could return empty modem frames, have an incorrect sequence number on packets, and display the wrong sequence number in the debug messages.
(closes issue #11228)
Reported by: Cache
Patches:
udptl-4.patch uploaded by dimas (license 88)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91458
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 6 Dec 2007 16:18:49 +0000 (16:18 +0000)]
Merged revisions 91439 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91439 | file | 2007-12-06 12:14:26 -0400 (Thu, 06 Dec 2007) | 4 lines
Add support for accepting and sending T.38 in the initial INVITE.
(closes issue #9402)
Reported by: thdei
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91440
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 15:56:58 +0000 (15:56 +0000)]
Adding documentation for the massive manager changes to manager
version 1.1 - hopefully a more consistent manager interface.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91438
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 15:50:43 +0000 (15:50 +0000)]
- The Ping Action
- Now use Response: success
- New header "Ping: pong" :-)
- The Events action
- Now use Response: Success
- The new status is reported as "Events: On" or "Events: Off"
- Report if manager is enabled in the reload event
Small cleanups...
From moremanager
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91420
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 15:29:05 +0000 (15:29 +0000)]
Changes to manager events in channel.c
- Newstate event
- Now has "CalleridNum" for numeric caller id, like Newchannel
- The event does not send "<unknown>" for unknown caller IDs just an empty field
- Newstate and Newchannel events
- these have changed headers
"State" -> ChannelStateDesc Text based channel state
-> ChannelState Numeric channel state
- The events does not send "<unknown>" for unknown caller IDs just an empty field
- Newstate event
- Now has "CalleridNum" for numeric caller id, like Newchannel
- The event does not send "<unknown>" for unknown caller IDs just an empty field
- Link and Unlink events
- The "Link" and "Unlink" bridge events in channel.c are now renamed to "Bridge"
- The link state is in the bridgestate: header as "Link" or "Unlink"
- For channel.c bridges, "Bridgetype: core" is added. This opens up for
bridge events in rtp.c and channel drivers
- The "Rename" manager event has a renamed header, to use the same
terminology for the current channel as other events
- Oldname -> Channel
(Moremanager)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91409
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 15:12:18 +0000 (15:12 +0000)]
New manager event when a channel changes account code.
Maybe belongs in the new cdr category?
---moremanager---
Event: NewAccountCode
Modules: cdr.c
Purpose: To report a change in account code for a live channel
Example:
Event: NewAccountCode
Privilege: call,all
Channel: SIP/olle-
01844600
Uniqueid:
1177530895.2
AccountCode: Stinas account
1234848484
OldAccountCode: Olles Account 12345
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91408
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 15:04:34 +0000 (15:04 +0000)]
- Dial event
- Event Dial has new headers, to comply with other events
- Source -> Channel Channel name (caller)
- SrcUniqueID -> UniqueID Uniqueid
(new) -> Dialstring Dialstring in app data
(moremanager)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91407
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 14:55:31 +0000 (14:55 +0000)]
Adding small missing but important comma...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91406
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 14:40:44 +0000 (14:40 +0000)]
A big oops...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91388
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 14:36:54 +0000 (14:36 +0000)]
The MeetmeJoin now has caller ID name and Caller ID number fields (like MeetMeLeave)
(Moremanager)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91387
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 14:33:14 +0000 (14:33 +0000)]
Update ZapShowChannels so that you can specify one channel.
Action ZapShowChannels
Header changes
- Channel: -> ZapChannel
For active channels, the Channel: and Uniqueid: headers are added
You can now add a "ZapChannel: " argument to zapshowchannels actions
to only get information about one channel.
From the moremanager branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91386
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 14:29:20 +0000 (14:29 +0000)]
Doxygen updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91385
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 14:23:12 +0000 (14:23 +0000)]
Merged revisions 91366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91366 | oej | 2007-12-06 13:54:11 +0100 (Tor, 06 Dec 2007) | 4 lines
Make sure logger is reloaded at general reload in the cli.
(Discovered during Asterisk training in Portugal)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91384
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 10:29:02 +0000 (10:29 +0000)]
Change description of new manager command
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91348
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 6 Dec 2007 10:27:54 +0000 (10:27 +0000)]
Add manager command for showing all current channels.
Thanks, eliel, for writing the original patch. Modified by me to follow
other manager events and the new "moremanager" style.
(closes issue #11478)
Reported by: eliel
Patches:
manager.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91347
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 6 Dec 2007 04:37:36 +0000 (04:37 +0000)]
Instead of iterating through the entire epoll events array just look at the ones that will actually contain data. (props to eliel on IRC for this)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91328
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 5 Dec 2007 22:57:57 +0000 (22:57 +0000)]
Merged revisions 91292 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91292 | mmichelson | 2007-12-05 16:57:13 -0600 (Wed, 05 Dec 2007) | 3 lines
Reverting extra stuff I didn't mean to commit
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91293
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 5 Dec 2007 22:55:49 +0000 (22:55 +0000)]
Merged revisions 91273 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91273 | mmichelson | 2007-12-05 16:35:52 -0600 (Wed, 05 Dec 2007) | 11 lines
The 'G' option for Dial() did not properly handle the case where only a label was
provided. This was due to the fact that the answering channel did not have an extension
set, so ast_parseable_goto would fail. This fix eliminates the call to ast_parseable_goto
on the answering channel since it is a wasteful call. The answering channel and the calling
channel are both directed to the same extension and context, just different priorities, so
we can just copy the values from the calling channel to the answering channel and increment
the answering channel's priority.
(closes issue #11382, reported by jon, patch by me with correction by jon)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91291
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 5 Dec 2007 21:46:42 +0000 (21:46 +0000)]
Merged revisions 91237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91237 | tilghman | 2007-12-05 15:38:13 -0600 (Wed, 05 Dec 2007) | 2 lines
Upgrade to the latest version of extra sounds
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91238
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 5 Dec 2007 17:49:03 +0000 (17:49 +0000)]
Merged revisions 91192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91192 | russell | 2007-12-05 11:31:42 -0600 (Wed, 05 Dec 2007) | 10 lines
Make the lock in the threadstorage debugging code untracked to avoid a deadlock
on thread destruction.
(closes issue #11207)
Reported by: ys
Patches:
threadstorage.c.diff uploaded by ys (license 281)
Also fixes an open bug report: (closes issue #11446)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91197
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 5 Dec 2007 17:44:59 +0000 (17:44 +0000)]
Resolve compiler warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91193
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 5 Dec 2007 16:46:47 +0000 (16:46 +0000)]
Change cdr_manager to use a "CDR" level, rather than the (overcrowded) "call" level.
(Closes issue #11015)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91173
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 5 Dec 2007 16:25:52 +0000 (16:25 +0000)]
Added multiple name listing. (Closes issue #10413)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91172
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 5 Dec 2007 16:14:06 +0000 (16:14 +0000)]
Remove second prefix line. Only need it documented once in the same file.
(closes issue #11472)
Reported by: eserra
Patches:
http.conf.sample.diff uploaded by eserra (license 45)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91171
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 5 Dec 2007 13:09:47 +0000 (13:09 +0000)]
Rename "username" to "defaultuser" to match with "defaultip".
"Username" still works, but is deprecated.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91152
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 5 Dec 2007 12:58:12 +0000 (12:58 +0000)]
Remove the cseqs from "sip show channel" and make more place for the call ID.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91151
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 5 Dec 2007 03:48:53 +0000 (03:48 +0000)]
revert part of my changes from earlier today since this code is no longer dependent on libpri.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91133
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 5 Dec 2007 03:34:51 +0000 (03:34 +0000)]
Use ast_free() instead of free().
(closes issue #11309)
Reported by: Laureano
Patches:
res_odbc.c.patch uploaded by Laureano (license 265)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91131
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 5 Dec 2007 01:59:32 +0000 (01:59 +0000)]
Merged revisions 91070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91070 | russell | 2007-12-04 18:35:31 -0600 (Tue, 04 Dec 2007) | 11 lines
Fix some crashes in chan_iax2 that were reported as happening on Mac systems.
It turns out that the problem was the Mac version of the ast_atomic_fetchadd_int()
function. The Mac atomic add function returns the _new_ value, while this function
is supposed to return the old value. So, the crashes happened on unreferencing
objects. If the reference count was decreased to 1, ao2_ref() thought that it
had been decreased to zero, and called the destructor. However, there was still
an outstanding reference around.
(closes issue #11176)
(closes issue #11289)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91114
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 5 Dec 2007 00:49:19 +0000 (00:49 +0000)]
Merged revisions 91074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91074 | russell | 2007-12-04 18:48:47 -0600 (Tue, 04 Dec 2007) | 4 lines
When DEBUG_THREADS is enabled, we only have the details about who is holding
a lock that we are waiting on for a mutex, not rwlocks. This should fix the
problem where people have reported "core show locks" crashing sometimes.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91077
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 4 Dec 2007 23:57:31 +0000 (23:57 +0000)]
Fix mwimonitornotify on reload ... again. This option was only read at startup
so a reload would erase it and not reset it. (pointed out by tzafrir)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91069
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 4 Dec 2007 23:47:28 +0000 (23:47 +0000)]
Blocked revisions 91032 via svnmerge
........
r91032 | russell | 2007-12-04 17:46:40 -0600 (Tue, 04 Dec 2007) | 5 lines
Modify file.h to maintain API compatibility with earlier versions. If a recent
compiler is being used, then a warning will show up for any modules still using
the old name "private" instead of "_private".
(patch suggested by paravoid)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91033
65c4cc65-6c06-0410-ace0-
fbb531ad65f3