Commit Graph

14903 Commits

Author SHA1 Message Date
Mark Michelson
27803e8d3e Merged revisions 108529 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r108529 | mmichelson | 2008-03-13 15:59:00 -0500 (Thu, 13 Mar 2008) | 11 lines

Fixing a potential buffer overflow in the manager command ModuleCheck.

Though this overflow is exploitable remotely, we are NOT issuing a security
advisory for this since in order to exploit the overflow, the attacker would
have to establish an authenticated manager session AND have the system privilege.
By gaining this privilege, the attacker already has more powerful weapons at his
disposal than overflowing a buffer with a malformed manager header, so the vulnerability
in this case really lies with the authentication method that allowed the attacker to 
gain the system privilege in the first place.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-13 21:31:44 +00:00
Russell Bryant
bcdaa03501 Merged revisions 108531 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108531 | russell | 2008-03-13 16:06:52 -0500 (Thu, 13 Mar 2008) | 18 lines

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

........
r108530 | russell | 2008-03-13 16:06:33 -0500 (Thu, 13 Mar 2008) | 10 lines

Make a tweak that gets the LEDs on polycom phones to blink when an extension that
has been subscribed to goes on hold.  Otherwise, they just stay on like it does
when an extension is in use.

(closes issue #11263)
Reported by: russell
Patches:
      notify_hold.rev1.txt uploaded by russell (license 2)
Tested by: russell

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-13 21:07:14 +00:00
Russell Bryant
a75ec6f0ba Merged revisions 108508 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r108508 | russell | 2008-03-13 15:35:28 -0500 (Thu, 13 Mar 2008) | 2 lines

Fix a place where configuration values could cause an overflow of a buffer.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-13 20:36:11 +00:00
Russell Bryant
42a70f149d Merged revisions 108472 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108472 | russell | 2008-03-13 15:26:59 -0500 (Thu, 13 Mar 2008) | 12 lines

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

........
r108469 | russell | 2008-03-13 15:26:28 -0500 (Thu, 13 Mar 2008) | 4 lines

Fix a couple uses of sprintf.  The second one could actually cause an overflow
of a stack buffer.  It's not a security issue though, it only depends on your
configuration.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-13 20:27:24 +00:00
Russell Bryant
53f827fd60 Blocked revisions 107721,107787,107790,107928,108034 via svnmerge
........
r107721 | tilghman | 2008-03-11 15:58:42 -0500 (Tue, 11 Mar 2008) | 2 lines

Add contributed script for separation of database access from Asterisk

........
r107787 | russell | 2008-03-11 17:21:19 -0500 (Tue, 11 Mar 2008) | 6 lines

Add a trivial new dialplan function, AST_CONFIG(), which allows you to access
a variable from an Asterisk configuration file in the dialplan, or anywhere
else where dialplan functions can be used.

(Inspired by a discussion with Tilghman and Pari)

........
r107790 | russell | 2008-03-11 17:54:25 -0500 (Tue, 11 Mar 2008) | 2 lines

remove documentation of an argument that i did not implement

........
r107928 | tilghman | 2008-03-11 21:53:21 -0500 (Tue, 11 Mar 2008) | 2 lines

Cache config files, when possible, for speed

........
r108034 | russell | 2008-03-12 12:06:37 -0500 (Wed, 12 Mar 2008) | 4 lines

 - Add Tilghman to the copyright info ... he wrote the hard part :)
 - Remove some magic in unload_module that isn't needed.  Module use counts
   already ensure that the function isn't going to be in use at this point.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:55:30 +00:00
Russell Bryant
9fa7595e11 Blocked revisions 107719 via svnmerge
........
r107719 | russell | 2008-03-11 15:54:32 -0500 (Tue, 11 Mar 2008) | 8 lines

This patch adds support for extended help prompts in voicemail.  These prompts
are in the 1.4.9 sounds release.

(closes issue #11705)
Reported by: jaroth
Patches:
      helpprompts.patch uploaded by jaroth (license 50)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:54:26 +00:00
Russell Bryant
688c69c0d3 Blocked revisions 107551 via svnmerge
........
r107551 | tilghman | 2008-03-11 11:28:03 -0500 (Tue, 11 Mar 2008) | 2 lines

Whitespace changes only

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108357 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:54:06 +00:00
Russell Bryant
4732160860 Blocked revisions 107475 via svnmerge
........
r107475 | kpfleming | 2008-03-11 10:19:05 -0500 (Tue, 11 Mar 2008) | 2 lines

block fix that is already here

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:53:46 +00:00
Russell Bryant
68ebba346c Merged revisions 107465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107465 | file | 2008-03-11 10:05:17 -0500 (Tue, 11 Mar 2008) | 4 lines

Clarify comment about masquerading and playback of the parking slot.
(closes issue #12180)
Reported by: davidw

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:53:24 +00:00
Russell Bryant
82922e116c Merged revisions 107157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107157 | file | 2008-03-10 15:00:21 -0500 (Mon, 10 Mar 2008) | 4 lines

If we receive a 488 on a T38 request reinvite back to audio. As well reinvite across a bridge back to audio if one side doesn't negotiate to T38.
(closes issue #8677)
Reported by: alex-911

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:52:58 +00:00
Russell Bryant
871cb71a98 Merged revisions 106892 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106892 | mattf | 2008-03-07 16:36:49 -0600 (Fri, 07 Mar 2008) | 1 line

Make sure we don't start a call when we have already done so in response to a COT message
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:52:33 +00:00
Russell Bryant
8332692806 Merged revisions 106843 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106843 | qwell | 2008-03-07 16:15:20 -0600 (Fri, 07 Mar 2008) | 13 lines

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

........
r106842 | qwell | 2008-03-07 16:14:45 -0600 (Fri, 07 Mar 2008) | 5 lines

Fix hardcoded grep in editline, were GNU grep is required.

(closes issue #12124)
Reported by: dmartin

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:52:07 +00:00
Russell Bryant
732df2cbdb Blocked revisions 106757 via svnmerge
........
r106757 | murf | 2008-03-07 12:57:57 -0600 (Fri, 07 Mar 2008) | 126 lines

(closes issue #6002)
Reported by: rizzo
Tested by: murf

Proposal of the changes to be made, and then an announcement of how they were accomplished:

http://lists.digium.com/pipermail/asterisk-dev/2008-February/032065.html

and:

http://lists.digium.com/pipermail/asterisk-dev/2008-March/032124.html

Here is a recap, file by file, of what I have done:

pbx/pbx_config.c
pbx/pbx_ael.c

All funcs that were passed a ptr to the context list, now will ALSO be passed a hashtab ptr to the same set.
Why? because (for the time being), the dialplan is stored in both, to facilitate a quick, low-cost move to
hash-tables to speed up dialplan processing. If it was deemed necessary to pass the context LIST, well, it
is just as necessary to have the TABLE available. This is because the list/table in question might not be
the global one, but temporary ones we would use to stage the dialplan on, and then swap into the global
position when things are ready.

We now have one external function for apps to use, "ast_context_find_or_create()" instead of the pre-existing
"find" and "create", as all existing usages used both in tandem anyway.

pbx_config, and pbx_ael, will stage the reloaded dialplan into local lists and tables, and 
then call merge_contexts_and_delete, which will merge (now) existing contexts and 
priorities from other registrars into this local set by copying them. Then, merge_contexts_and_delete will
lock down the contexts, swap the lists and tables, and unlock (real quick), and then 
destroy the old dialplan.



chan_sip.c
chan_iax.c
chan_skinny.c

All the channel drivers that would add regcontexts now use the ast_context_find_or_create now.

chan_sip also includes a small fix to get rid of warnings about removing priorities that never got entered.


apps/app_meetme.c
apps/app_dial.c
apps/app_queue.c

All the apps that added a context/exten/priority were also modified to use ast_context_find_or_create instead.


include/asterisk/pbx.h

ast_context_create() is removed. Find_or_create_ is the new method.
ast_context_find_or_create()  interface gets the hashtab added.
ast_merge_contexts_and_delete() gets the local hashtab arg added.
ast_wrlock_contexts_version() is added so you can detect if someone else got a writelock between your readlocking and writelocking.
ast_hashtab_compare_contexts was made public for use in pbx_config/pbx_ael
ast_hashtab_hash_contexts was in like fashion make public.


include/asterisk/pval.h

ast_compile_ael2() interface changed to include the local hashtab table ptr.


main/features.c

For the sake of the parking context, we use ast_context_find_or_create().



main/pbx.c

I changed all the "tree" names to "table" instead. That's because the original
implementation was based on binary trees. (had a free library). Then I moved
to hashtabs. Now, the names move forward too.

refcount field added to contexts, so you can keep track of how many modules
wanted this context to exist.

Some log messages that are warnings were inflated from LOG_NOTICE to LOG_WARNING.

Added some calls to ast_verb(3,...) for debug messages

Lots of little mods to ast_context_remove_extension2, which is now excersized in ways
it was not previously; one definite bug fixed.

find_or_create was upgraded to handle both local lists/tables as well as the globals.

context_merge() was added to do the per-context merging of the old/present contexts/extens/prios into the new/proposed local list/tables

ast_merge_contexts_and_delete() was heavily modified.

ast_add_extension2() was also upgraded to handle changes. 

the context_destroy() code was re-engineered to handle the new way of doing things,
by exten/prio instead of by context.



res/ael/pval.c
res/ael/ael.tab.c
res/ael/ael.tab.h
res/ael/ael.y
res/ael/ael_lex.c
res/ael/ael.flex
utils/ael_main.c
utils/extconf.c
utils/conf2ael.c
utils/Makefile

Had to change the interface to ast_compile_ael2(), to include the hashtab ptr.
This ended up involving several external apps.  The main gotcha was I had to 
include lock.h and hashtab.h in several places.


As a side note, I tested this stuff pretty thoroughly, I replicated the problems
originally reported by Luigi, and made triply sure that reloads worked, and everything
worked thru "stop gracefully". I found a and fixed a few bugs as I was merging into
trunk, that did not appear in my tests of bug6002.

How's this for verbose commit messages?



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:51:38 +00:00
Russell Bryant
50de1f9043 Blocked revisions 108226 via svnmerge
........
r108226 | file | 2008-03-12 16:06:50 -0500 (Wed, 12 Mar 2008) | 2 lines

Doxygenify slinfactory a bit.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:51:03 +00:00
Russell Bryant
cc9f77eef9 Blocked revisions 108286 via svnmerge
........
r108286 | kpfleming | 2008-03-12 16:37:40 -0500 (Wed, 12 Mar 2008) | 13 lines

add support for named sections in zapata.conf, and fix a few bugs in config file parsing

(closes issue #9503)
Reported by: tzafrir
Patches:
      fix_cleanups uploaded by tzafrir (license 46)
      zapata_sections uploaded by tzafrir (license 46)
      skipchannel_options uploaded by tzafrir (license 46)
      conf_sample uploaded by tzafrir (license 46)

patches updated by me to better conform to coding guidelines and fix some problems


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:50:45 +00:00
Russell Bryant
967d9d2c40 Merged revisions 108295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r108295 | russell | 2008-03-12 17:13:18 -0500 (Wed, 12 Mar 2008) | 3 lines

Rename ast_tcptls_server_instance to session_instance, since this pertains to
server and client usage.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:50:14 +00:00
Russell Bryant
64a69c1348 Merged revisions 108346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r108346 | russell | 2008-03-12 17:49:26 -0500 (Wed, 12 Mar 2008) | 4 lines

Make the default prefix empty, like it was in Asterisk 1.4.

(closes issue #12198, reported by bkruse, patched by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:49:47 +00:00
Mark Michelson
78e9f784f1 Merged revisions 108293 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r108293 | mmichelson | 2008-03-12 17:09:52 -0500 (Wed, 12 Mar 2008) | 3 lines

Let's get this to compile


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:10:20 +00:00
Mark Michelson
e3af4b3632 Merged revisions 108289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108289 | mmichelson | 2008-03-12 16:57:41 -0500 (Wed, 12 Mar 2008) | 22 lines

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

........
r108288 | mmichelson | 2008-03-12 16:53:46 -0500 (Wed, 12 Mar 2008) | 14 lines

Change AST_SCHED_DEL use to ast_sched_del for autocongestion in chan_sip.

The scheduler callback will always return 0. This means that this id 
is never rescheduled, so it makes no sense to loop trying to delete
the id from the scheduler queue. If we fail to remove the item from the
queue once, it will fail every single time.

(Yes I realize that in this case, the macro would exit early because the
id is set to -1 in the callback, but it still makes no sense to use
that macro in favor of calling ast_sched_del once and being done with it)

This is the first of potentially several such fixes.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 21:58:29 +00:00
Mark Michelson
2b948919be Merged revisions 108238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108238 | mmichelson | 2008-03-12 16:19:30 -0500 (Wed, 12 Mar 2008) | 20 lines

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

........
r108227 | mmichelson | 2008-03-12 16:16:28 -0500 (Wed, 12 Mar 2008) | 12 lines

Added a large comment before the AST_SCHED_DEL macro to explain its purpose as well as when
it is appropriate and when it is not appropriate to use it.

I also removed the part of the debug message that mentions that this is probably a bug because
there are some perfectly legitimate places where ast_sched_del may fail to delete an entry (e.g.
when the scheduler callback manually reschedules with a new id instead of returning non-zero to
tell the scheduler to reschedule with the same idea). I also raised the debug level of the debug
message in AST_SCHED_DEL since it seems like it could come up quite frequently since the macro
is probably being used in several places where it shouldn't be. Also removed the redundant line,
file, and function information since that is provided by ast_log.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108246 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 21:21:02 +00:00
Kevin P. Fleming
3592c06d29 Merged revisions 108191 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108191 | kpfleming | 2008-03-12 15:27:01 -0500 (Wed, 12 Mar 2008) | 14 lines

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

........
r108086 | kpfleming | 2008-03-12 14:16:07 -0500 (Wed, 12 Mar 2008) | 6 lines

if we receive an INVITE with a Content-Length that is not a valid number, or is zero, then don't process the rest of the message body looking for an SDP

closes issue #11475
Reported by: andrebarbosa


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 20:29:50 +00:00
Russell Bryant
45de934e14 Merged revisions 108137 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108137 | russell | 2008-03-12 14:59:05 -0500 (Wed, 12 Mar 2008) | 48 lines

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

........
r108135 | russell | 2008-03-12 14:57:42 -0500 (Wed, 12 Mar 2008) | 40 lines

(closes issue #12187, reported by atis, fixed by me after some brainstorming
 on the issue with mmichelson)

- Update copyright info on app_chanspy.

- Fix a race condition that caused app_chanspy to crash.  The issue was that
  the chanspy datastore magic that was used to ensure that spyee channels did
  not disappear out from under the code did not completely solve the problem.
  It was actually possible for chanspy to acquire a channel reference out of
  its datastore to a channel that was in the middle of being destroyed.  That
  was because datastore destruction in ast_channel_free() was done near the
  end.  So, this left the code in app_chanspy accessing a channel that was
  partially, or completely invalid because it was in the process of being free'd
  by another thread.  The following sort of shows the code path where the race 
  occurred:

  =============================================================================
  Thread 1 (PBX thread for spyee chan)  ||   Thread 2 (chanspy)
  --------------------------------------||-------------------------------------
  ast_channel_free()                    ||
    - remove channel from channel list  ||
    - lock/unlock the channel to ensure ||
      that no references retrieved from ||
      the channel list exist.           ||
  --------------------------------------||-------------------------------------
                                        || channel_spy()
    - destroy some channel data         ||  - Lock chanspy datastore
                                        ||  - Retrieve reference to channel
                                        ||  - lock channel
                                        ||  - Unlock chanspy datastore
  --------------------------------------||-------------------------------------
     - destroy channel datastores       ||
        - call chanspy datastore d'tor  ||  
          which NULL's out the ds'      ||  - Operate on the channel ...
          reference to the channel      ||     
                                        ||
    - free the channel                  || 
                                        ||
                                        ||  - unlock the channel
  --------------------------------------||-------------------------------------
  =============================================================================

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 19:59:24 +00:00
Joshua Colp
de10acaa07 Merged revisions 108084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108084 | file | 2008-03-12 15:29:33 -0300 (Wed, 12 Mar 2008) | 12 lines

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

........
r108083 | file | 2008-03-12 15:26:37 -0300 (Wed, 12 Mar 2008) | 4 lines

Add a trigger mode that triggers on both read and write. The actual function that returns the combined audio frame though will wait until both sides have fed in audio, or until one side stops (such as the case when you call Wait).
(closes issue #11945)
Reported by: xheliox

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 18:31:07 +00:00
Russell Bryant
3e717dce36 Merged revisions 108032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r108032 | russell | 2008-03-12 12:02:57 -0500 (Wed, 12 Mar 2008) | 12 lines

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

........
r108031 | russell | 2008-03-12 11:59:07 -0500 (Wed, 12 Mar 2008) | 4 lines

Destroy the channel lock after the channel datastores.

(inspired by issue #12187)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 17:03:18 +00:00
Tilghman Lesher
a92dc508ec Merged revisions 107998 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107998 | tilghman | 2008-03-12 02:43:03 -0500 (Wed, 12 Mar 2008) | 7 lines

Deadlock fixes
(closes issue #12143)
 Reported by: kactus
 Patches: 
       20080312__bug12143__2.diff.txt uploaded by Corydon76 (license 14)
 Tested by: kactus

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 07:44:28 +00:00
Tilghman Lesher
02519b9df1 Merged revisions 107960 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107960 | tilghman | 2008-03-12 00:46:39 -0500 (Wed, 12 Mar 2008) | 4 lines

Revert several changes from revision 102525, as the changes were not
compatible, and, in fact, introduced regressions.
(Closes issue #12190)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 05:47:37 +00:00
Tilghman Lesher
4206a8f4f6 Merged revisions 107878 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107878 | tilghman | 2008-03-11 20:54:00 -0500 (Tue, 11 Mar 2008) | 10 lines

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

........
r107877 | tilghman | 2008-03-11 20:52:40 -0500 (Tue, 11 Mar 2008) | 2 lines

Document all of the possible realtime fields

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 01:55:41 +00:00
Jason Parker
007b33e9c6 Merged revisions 107827 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107827 | qwell | 2008-03-11 18:38:00 -0500 (Tue, 11 Mar 2008) | 15 lines

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

........
r107826 | qwell | 2008-03-11 18:37:05 -0500 (Tue, 11 Mar 2008) | 7 lines

Update documentation for pgsql ODBC voicemail.

(closes issue #12186)
Reported by: jsmith
Patches:
      vm_pgsql_doc_update.patch uploaded by jsmith (license 15)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107828 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 23:38:31 +00:00
Tilghman Lesher
0d5ad6e21c Merged revisions 107791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107791 | tilghman | 2008-03-11 17:55:16 -0500 (Tue, 11 Mar 2008) | 5 lines

An offhand comment from Russell made me realize that the configuration file
caching would not work properly for users.conf and any other file read from
more than one place.  I needed to add the filename which requested the config
file to get it to work properly.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 22:59:52 +00:00
Tilghman Lesher
082e13ee49 Blocked revisions 107722 via svnmerge
........
r107722 | tilghman | 2008-03-11 16:10:45 -0500 (Tue, 11 Mar 2008) | 7 lines

Convert prepare_and_execute to direct_execute for speed
(closes issue #11935)
 Reported by: falves11
 Patches: 
       20080208__bug11935.diff.txt uploaded by Corydon76 (license 14)
 Tested by: falves11, Corydon76

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 21:11:31 +00:00
Jason Parker
2b1b649a97 Merged revisions 107718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107718 | qwell | 2008-03-11 15:53:48 -0500 (Tue, 11 Mar 2008) | 13 lines

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

........
r107714 | qwell | 2008-03-11 15:49:56 -0500 (Tue, 11 Mar 2008) | 5 lines

Copy voicemail dependency logic for res_adsi to chan_gtalk and chan_jingle (for jabber).

(closes issue #12014)
Reported by: junky

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 20:54:38 +00:00
Kevin P. Fleming
2ada3e4bba Merged revisions 107715 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107715 | kpfleming | 2008-03-11 15:50:57 -0500 (Tue, 11 Mar 2008) | 10 lines

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

........
r107713 | kpfleming | 2008-03-11 15:48:58 -0500 (Tue, 11 Mar 2008) | 2 lines

get chan_vpb to build properly in dev mode

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 20:51:18 +00:00
Joshua Colp
e86f6f817a Merged revisions 107710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107710 | file | 2008-03-11 17:36:14 -0300 (Tue, 11 Mar 2008) | 6 lines

Dial a device even if it's state is unknown.
(closes issue #12184)
Reported by: bluecrow76
Patches:
      asterisk-svn-app_page.c.devicestate_unknown.diff uploaded by bluecrow76 (license 270)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 20:37:09 +00:00
Joshua Colp
a241dd0b5d Merged revisions 107659 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107659 | file | 2008-03-11 16:23:28 -0300 (Tue, 11 Mar 2008) | 12 lines

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

........
r107646 | file | 2008-03-11 16:20:01 -0300 (Tue, 11 Mar 2008) | 4 lines

Make sure the visible indication is on the right channel so when the masquerade happens the proper indication is enacted.
(closes issue #11707)
Reported by: iam

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 19:25:00 +00:00
Joshua Colp
aad2069958 Merged revisions 107638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107638 | file | 2008-03-11 15:48:59 -0300 (Tue, 11 Mar 2008) | 12 lines

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

........
r107637 | file | 2008-03-11 15:47:33 -0300 (Tue, 11 Mar 2008) | 4 lines

Add an additional check for setting conference parameter when using the marked user options. It was possible for it to return to a no listen/no talk state if a masquerade happened.
(closes issue #12136)
Reported by: aragon

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 18:50:15 +00:00
Joshua Colp
f0649d1105 Blocked revisions 107583 via svnmerge
................
r107583 | file | 2008-03-11 14:34:46 -0300 (Tue, 11 Mar 2008) | 11 lines

Blocked revisions 107582 via svnmerge

........
r107582 | file | 2008-03-11 14:32:17 -0300 (Tue, 11 Mar 2008) | 4 lines

Fix a minor spelling error.
(closes issue #12183)
Reported by: darrylc

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 17:37:04 +00:00
Mark Michelson
0996e4b518 Blocked revisions 107530 via svnmerge
........
r107530 | mmichelson | 2008-03-11 10:59:32 -0500 (Tue, 11 Mar 2008) | 7 lines

Remove some redundant logic from wait_for_answer. This also let's us get rid of one of 
those XXX comments from the code.

The redundancy occurs because the 'single' flag implies that the 'r' and 'm' flags are
not set, so there's no need to explicitly check them again.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 16:04:05 +00:00
Kevin P. Fleming
2932ac2f59 Merged revisions 107525 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107525 | kpfleming | 2008-03-11 10:39:37 -0500 (Tue, 11 Mar 2008) | 2 lines

fix another potential bug found by gcc 4.3

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107526 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 15:39:53 +00:00
Kevin P. Fleming
19ca2892c0 Merged revisions 107466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107466 | kpfleming | 2008-03-11 10:13:38 -0500 (Tue, 11 Mar 2008) | 10 lines

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

........
r107464 | kpfleming | 2008-03-11 09:53:03 -0500 (Tue, 11 Mar 2008) | 2 lines

fix various other problems found by gcc 4.3

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 15:13:54 +00:00
Kevin P. Fleming
07e93e4598 Merged revisions 107462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107462 | kpfleming | 2008-03-11 09:37:03 -0500 (Tue, 11 Mar 2008) | 10 lines

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

........
r107461 | kpfleming | 2008-03-11 09:33:45 -0500 (Tue, 11 Mar 2008) | 2 lines

stop checking for mktime() in the configure script... we don't use it, and the test is buggy under gcc 4.3

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 14:37:23 +00:00
Kevin P. Fleming
ca8d368a80 Merged revisions 107409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107409 | kpfleming | 2008-03-11 09:09:49 -0500 (Tue, 11 Mar 2008) | 13 lines

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

........
r107408 | kpfleming | 2008-03-11 09:07:59 -0500 (Tue, 11 Mar 2008) | 5 lines

check for compiler support for -fno-strict-overflow before using it (tested with Debian's gcc 4.3, 4.1 and 3.4)

(closes issue #12179)
Reported by: Netview

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 14:10:08 +00:00
Kevin P. Fleming
ba3a3a37ef Merged revisions 107406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107406 | kpfleming | 2008-03-11 08:58:37 -0500 (Tue, 11 Mar 2008) | 10 lines

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

........
r107405 | kpfleming | 2008-03-11 08:57:08 -0500 (Tue, 11 Mar 2008) | 2 lines

fix small bug in IMAP toolkit testing

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 13:59:27 +00:00
Kevin P. Fleming
b2fabfdb4c Merged revisions 107373 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107373 | kpfleming | 2008-03-11 06:36:51 -0500 (Tue, 11 Mar 2008) | 19 lines

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

........
r107352 | kpfleming | 2008-03-11 06:04:29 -0500 (Tue, 11 Mar 2008) | 11 lines

fix up various compiler warnings found with gcc-4.3:

- the output of flex includes a static function called 'input' that is not used, so for the moment we'll stop having the compiler tell us about unused variables in the flex source files (a better fix would be to improve our flex post-processing to remove the unused function)

- main/stdtime/localtime.c makes assumptions about signed integer overflow, and gcc-4.3's improved optimizer tries to take advantage of handling potential overflow conditions at compile time; for now, suppress these optimizations until we can fiure out if the code needs improvement

- main/udptl.c has some references to uninitialized variables; in one case there was no bug, but in the other it was certainly possibly for unexpected behavior to occur

- main/editline/readline.c had an unused variable


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 11:39:32 +00:00
Terry Wilson
c9411643ea Merged revisions 107292 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107292 | twilson | 2008-03-10 20:09:46 -0500 (Mon, 10 Mar 2008) | 10 lines

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

........
r107290 | twilson | 2008-03-10 19:59:18 -0500 (Mon, 10 Mar 2008) | 2 lines

If we fail to alloc a channel, we should re-lock the pvt structure before returning.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107336 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 01:27:23 +00:00
Steve Murphy
e261ad9b4c Merged revisions 107019 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107019 | murf | 2008-03-10 08:55:21 -0600 (Mon, 10 Mar 2008) | 1 line

way back in July, in r.75706, a fix was made ot the strftime usages, which was good, but in this case, the check for a nil time was accidentally removed, and now it is restored, to keep timevals like '1969-12-31 17:00:00' from showing up in the cdrs. No idea what databases will do with this. No bugs filed as yet, but it felt like a bug.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 23:46:02 +00:00
Tilghman Lesher
109b374629 Blocked revisions 107231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107231 | tilghman | 2008-03-10 16:48:20 -0500 (Mon, 10 Mar 2008) | 6 lines

(closes issue #6019)
 Reported by: ssokol
 Patches: 
       20080304__bug6019.diff.txt uploaded by Corydon76 (license 14)
 Tested by: putnopvut

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 22:02:33 +00:00
Jason Parker
3d33906019 Merged revisions 107177 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107177 | qwell | 2008-03-10 15:28:33 -0500 (Mon, 10 Mar 2008) | 13 lines

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

........
r107173 | qwell | 2008-03-10 15:27:08 -0500 (Mon, 10 Mar 2008) | 5 lines

Make sure to reenable echo can after a "failed" (canceled, etc) three-way call.

(closes issue #11335)
Reported by: rebuild

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 20:29:21 +00:00
Russell Bryant
95289aa843 Merged revisions 107162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107162 | russell | 2008-03-10 15:17:37 -0500 (Mon, 10 Mar 2008) | 16 lines

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

........
r107161 | russell | 2008-03-10 15:17:11 -0500 (Mon, 10 Mar 2008) | 8 lines

Fix another bug specifically related to asynchronous call origination.  Once the
PBX is started on the channel using ast_pbx_start(), then the ownership of the
channel has been passed on to another thread.  We can no longer access it in this
code.  If the channel gets hung up very quickly, it is possible that we could
access a channel that has been free'd.

(inspired by BE-386)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 20:18:13 +00:00
Russell Bryant
bf658f9798 Merged revisions 107159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107159 | russell | 2008-03-10 15:05:12 -0500 (Mon, 10 Mar 2008) | 17 lines

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

........
r107158 | russell | 2008-03-10 15:04:27 -0500 (Mon, 10 Mar 2008) | 9 lines

Fix some bugs related to originating calls.  If the code failed to start a PBX
on the channel (such as if you set a call limit based on the system's load
average), then there were cases where a channel that has already been free'd
using ast_hangup() got accessed.  This caused weird memory corruption and
crashes to occur.

(fixes issue BE-386)
(much debugging credit goes to twilson, final patch written by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 20:05:37 +00:00
Russell Bryant
9d24a5691f Merged revisions 107103 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107103 | russell | 2008-03-10 12:13:34 -0500 (Mon, 10 Mar 2008) | 10 lines

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

........
r107102 | russell | 2008-03-10 12:13:17 -0500 (Mon, 10 Mar 2008) | 2 lines

Resolve a compiler warning.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 17:13:54 +00:00