Commit Graph

3622 Commits

Author SHA1 Message Date
Tilghman Lesher
891d56d31c Merged revisions 278463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r278463 | tilghman | 2010-07-21 10:56:05 -0500 (Wed, 21 Jul 2010) | 11 lines
  
  Ensure realtime conferences are treated the same as static conferences when trying to find an empty one.
  
  Also, parse the useropts properly, when retrieving from realtime, and add them
  to the existing flags.
  
  (closes issue #17502)
   Reported by: kenji
   Patches: 
         20100720__issue17502.diff.txt uploaded by tilghman (license 14)
   Tested by: kenji
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@278464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-21 15:58:20 +00:00
Tilghman Lesher
1fc8b2f637 Merged revisions 278275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r278275 | tilghman | 2010-07-20 17:40:19 -0500 (Tue, 20 Jul 2010) | 14 lines
  
  Merged revisions 278261 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r278261 | tilghman | 2010-07-20 17:23:13 -0500 (Tue, 20 Jul 2010) | 7 lines
    
    Delete IMAP messages in reverse order, to ensure reordering after each expunge does not cause deletion of the wrong message.
    
    (closes issue #16350)
     Reported by: noahisaac
     Patches: 
           20100623__issue16350.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@278276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-20 22:43:51 +00:00
Jeff Peeler
481f5eddb5 Merged revisions 277488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r277488 | jpeeler | 2010-07-16 16:16:08 -0500 (Fri, 16 Jul 2010) | 10 lines
  
  Fix reporting estimated queue hold time.
  
  Just say the number of seconds (after minutes) rather than doing some incorrect
  calculation with respect to minutes.
  
  (closes issue #17498)
  Reported by: corruptor
  Patches: 
        holdesecs_bug.diff uploaded by corruptor (license 253)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@277489 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 21:16:51 +00:00
Jeff Peeler
a5120a3bc0 Merged revisions 277366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r277366 | jpeeler | 2010-07-16 14:22:49 -0500 (Fri, 16 Jul 2010) | 7 lines
  
  Add missing handling for ringing state for use with queue empty options.
  
  (closes issue #17471)
  Reported by: jazzy
  Patches: 
        app_queue.c.diff uploaded by jazzy (license 1056)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@277377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 19:24:38 +00:00
Paul Belanger
1d142f35da Merged revisions 277183 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r277183 | pabelanger | 2010-07-16 13:13:46 -0400 (Fri, 16 Jul 2010) | 15 lines
  
  Merged revisions 277182 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r277182 | pabelanger | 2010-07-16 13:10:36 -0400 (Fri, 16 Jul 2010) | 8 lines
    
    Total analysis time error with SIP and silence suppression
    
    When using app_amd with SIP providers that have silence
    suppression on, the iTotalTime count increases exponentially.
    
    (closes issue #17656)
    Reported by: juls
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@277188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 17:18:01 +00:00
Jeff Peeler
47d6d377ae Merged revisions 276074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r276074 | jpeeler | 2010-07-13 12:37:40 -0500 (Tue, 13 Jul 2010) | 19 lines
  
  Merged revisions 275773 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r275773 | jpeeler | 2010-07-12 15:34:51 -0500 (Mon, 12 Jul 2010) | 12 lines
    
    Make user removals and traversals thread safe in meetme.
    
    Race conditions present in meetme involving the user list where a lack of
    locking has the potential for a user to be removed during a traversal or as in
    the case of the reporter after checking if the list is empty could cause a
    crash. Fixing this was done by convering the userlist to an ao2 container.
    
    (closes issue #17390)
    Reported by: Vince
    
    Review: https://reviewboard.asterisk.org/r/746/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@276121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-13 19:01:29 +00:00
Matthew Nicholson
e05044b047 Merged revisions 275028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r275028 | mnicholson | 2010-07-09 11:05:58 -0500 (Fri, 09 Jul 2010) | 15 lines
  
  Merged revisions 275027 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r275027 | mnicholson | 2010-07-09 11:04:21 -0500 (Fri, 09 Jul 2010) | 8 lines
    
    Clear the AST_CDR_FLAG_DIALED flag for channels going into the pbx via the G option in app_dial
    
    (closes issue #17592)
    Reported by: jamicque
    Patches:
          G-flag-cdr-fix1.diff uploaded by mnicholson (license 96)
    Tested by: jamicque, mnicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@275029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-09 16:06:43 +00:00
Tilghman Lesher
abd171829c Merged revisions 273714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r273714 | tilghman | 2010-07-02 11:57:28 -0500 (Fri, 02 Jul 2010) | 2 lines
  
  The switch fallthrough could create some errorneous situations, so best to force directly to the default case.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-02 16:59:11 +00:00
Tzafrir Cohen
ffe8eb4150 Fix typos reported by Lintian
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-02 15:59:30 +00:00
Jeff Peeler
25f109d121 Merged revisions 273522 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r273522 | jpeeler | 2010-07-01 15:28:15 -0500 (Thu, 01 Jul 2010) | 21 lines
  
  Merged revisions 273474 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r273474 | jpeeler | 2010-07-01 15:19:16 -0500 (Thu, 01 Jul 2010) | 14 lines
    
    Allow admin user to join conference without using admin mode and no user pin.
    
    Configuring the conference in meetme.conf like the following:
    conf => 2345,,6666 
    did not prompt for pin when used without admin mode. This meant that the
    conference could not be joined as an admin even if the user knew the correct
    pin. The original bug report was submitted claiming that the blank user pin
    should deny entry into the conference. I think a better way to handle this
    would be with a feature enhancement that used the following syntax:
    conf => 2345,X,6666 - where X denotes no acceptable pin allowed
    
    (closes issue #15704)
    Reported by: modelnine
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-01 20:29:49 +00:00
Jeff Peeler
4aac070141 Merged revisions 273355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r273355 | jpeeler | 2010-07-01 10:12:31 -0500 (Thu, 01 Jul 2010) | 19 lines
  
  Merged revisions 273354 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r273354 | jpeeler | 2010-07-01 10:05:43 -0500 (Thu, 01 Jul 2010) | 12 lines
    
    Ensure channel placed in meetme in ringing state is properly hung up.
    
    An outgoing channel placed in meetme while still ringing which was then hung up
    would not exit meetme and the channel was not properly destroyed. Specifically
    checking for this scenario by looking at the appropriate control frames resolves
    the issue.
    
    (closes issue #15871)
    Reported by: Ivan
    Patches: 
          meetme_congestion_trunk_v2.patch uploaded by Ivan (license 229)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-01 15:14:41 +00:00
Matthew Nicholson
66400591a5 Merged revisions 272368 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r272368 | mnicholson | 2010-06-23 17:36:49 -0500 (Wed, 23 Jun 2010) | 16 lines
  
  Merged revisions 272367 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  This version of the patch only adds AgentComplete for attended transfers.  It was already present for blind transfers.
  
  ........
    r272367 | mnicholson | 2010-06-23 17:33:51 -0500 (Wed, 23 Jun 2010) | 8 lines
    
    Send AgentComplete manager events in the event of blind and attended transfers.
    
    (closes issue #16819)
    Reported by: elbriga
    Patches:
          app_queue.diff uploaded by elbriga (license 482)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 22:37:24 +00:00
Paul Belanger
80fe2c3ea7 Revert previous commit, ast_test_flag64 does not exist in 1.6.2
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:15:53 +00:00
Paul Belanger
c41f445251 Merged revisions 272259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r272259 | pabelanger | 2010-06-23 17:06:15 -0400 (Wed, 23 Jun 2010) | 2 lines
  
  Fix previous merge. ast_test_flag != ast_test_flag64
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:07:48 +00:00
Paul Belanger
2f20cacc97 Merged revisions 272257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r272257 | pabelanger | 2010-06-23 17:00:00 -0400 (Wed, 23 Jun 2010) | 19 lines
  
  Merged revisions 272255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r272255 | pabelanger | 2010-06-23 16:57:01 -0400 (Wed, 23 Jun 2010) | 12 lines
    
    First caller into a dynamic conference now enter pin once.
    
    If MeetMe is configured to use dynamic conference
    numbers, then the first caller (which creates the
    conference) had to enter the PIN number twice.
    
    (closes issue #15878)
    Reported by: shawkris
    Patches:
          issue15878.patch uploaded by pabelanger (license 224)
    Tested by: pabelanger
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:01:47 +00:00
Terry Wilson
84c6f9c750 Merged revisions 272146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r272146 | twilson | 2010-06-23 13:39:20 -0500 (Wed, 23 Jun 2010) | 2 lines
  
  Don't start the sla thread unless we realy need it
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 18:41:35 +00:00
Terry Wilson
f8a201041b Merged revisions 272109 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r272109 | twilson | 2010-06-23 12:21:40 -0500 (Wed, 23 Jun 2010) | 12 lines
  
  Make sure reload updates SLA config
  
  Even if there are no stations or trunks defined, we need to start the sla
  thread to make sure we get the reload event. Also, when doing a reload we need
  to remove the existing trunks and stations or they end up hanging around.
  
  (closes issue #16818)
  Reported by: mbonin
  Patches: 
        sla_reload.patch uploaded by twilson (license 396)
  Tested by: twilson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 17:28:35 +00:00
Paul Belanger
7b22456daf Merged revisions 271089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r271089 | pabelanger | 2010-06-16 20:30:51 -0400 (Wed, 16 Jun 2010) | 5 lines
  
  option w[(secs)] incorrectly capitalized in xmldoc
  
  (closes issue #17516)
  Reported by: karlfife
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@271090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-17 00:32:06 +00:00
Matthew Nicholson
54eb5a56f2 Merged revisions 269083 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r269083 | mnicholson | 2010-06-08 13:50:45 -0500 (Tue, 08 Jun 2010) | 9 lines
  
  Don't pass null to manager_event()
  
  (closes issue #17087)
  Reported by: bklang
  Patches:
        app-fax-null-sprintf1.diff uploaded by mnicholson (license 96)
  Tested by: bklang
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@269084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-08 18:51:19 +00:00
Matthew Nicholson
bdb62057a8 Merged revisions 265611 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r265611 | mnicholson | 2010-05-25 12:00:11 -0500 (Tue, 25 May 2010) | 15 lines
  
  Merged revisions 265610 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r265610 | mnicholson | 2010-05-25 11:48:19 -0500 (Tue, 25 May 2010) | 8 lines
    
    Don't mark the cdr records of unanswered queue calls with "NOANSWER".  This restores the behavior prior to r258670.
    
    (closes issue #17334)
    Reported by: jvandal
    Patches:
          queue-cdr-fixes1.diff uploaded by mnicholson (license 96)
    Tested by: aragon, jvandal
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@265612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-25 17:06:04 +00:00
Mark Michelson
032ae964b5 Fix memory hogging behavior of app_queue.
From reviewboard:
This review request is for the patch on issue 17081.

A user reported that he saw increasing numbers of allocations stemming
from app_queue.c when he would run the "queue show" CLI command. The
user reported that he was using approximately 40 realtime queues and
as he ran the CLI command more and more, the memory usage would shoot up.
As it turns out, there was a memory leak and a separate usage of memory
that, while not really a leak, was very irresponsible.

Both memory problems can be attributed to the function init_queue(). When
the "queue show" command is run, all realtime queues have the init_queue()
function called on the in-memory queue. The idea is to place the queue in
its default state and then overwrite options specified in the realtime backend
as we read them.

The first problem, the memory leak, had to do with the fact that the string
field for the name of the first periodic announcement file was being re-created
every time init_queue was called. This patch corrects the behavior by only
calling ast_str_create if the memory has not already been allocated. 

The other problem is a bit more complicated. The majority of the strings
in the call_queue structure were changed to use the ast_string_fields API
for 1.6.0 and beyond. init_queue resets all string fields on the queue to
their default values. Then, later in the realtime queue loading process,
these string fields are set to their configured values.

For those unfamiliar with string fields, frequent resizing of a string like
this is not what the string fields API is designed for. The result of this
constant resizing is that as the queue gets loaded, eventually space for
the string runs out and so a new memory pool, at twice the size of the
previously allocated one, is created for the string fields. The reporter
of issue 17081 wrote a script that ran the "queue show" CLI command 2100
times. By the end, each of his 40 queues was taking about a megabyte of
memory apiece just for their string fields.

My fix for this problem is to revert the call_queue structure from using
string fields. In my patch here, I have moved the queue back to using
fixed-sized buffers. I ran the script provided by the reporter of 17081
and determined that I no longer saw the steadily-increasing memory usage
that I had seen before applying the patch.

(closes issue #17081)
Reported by: wliegel
Patches:
      17081v2.patch uploaded by mmichelson (license 60)
Tested by: wliegel, mmichelson

Review: https://reviewboard.asterisk.org/r/651/



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@265172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-21 21:57:24 +00:00
Mark Michelson
d3ae642446 Merged revisions 265090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r265090 | mmichelson | 2010-05-21 16:08:51 -0500 (Fri, 21 May 2010) | 15 lines
  
  Merged revisions 265089 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r265089 | mmichelson | 2010-05-21 15:59:14 -0500 (Fri, 21 May 2010) | 8 lines
    
    Don't hang up on a queue caller if the file we attempt to play does not exist.
    
    This also fixes a documentation mistake in file.h that made my original attempt
    to correct this problem not work correctly.
    
    (closes issue #17061)
    Reported by: RoadKill
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@265091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-21 21:10:04 +00:00
Tilghman Lesher
7e8a5f2af3 Merged revisions 264752 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r264752 | tilghman | 2010-05-20 16:28:53 -0500 (Thu, 20 May 2010) | 7 lines
  
  Error message fix.
  
  (closes issue #17356)
   Reported by: kenner
   Patches: 
         app_stack.c.diff uploaded by kenner (license 1040)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@264753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-20 21:30:19 +00:00
Matthew Nicholson
33fc0b768a Merged revisions 264335 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r264335 | mnicholson | 2010-05-19 15:02:57 -0500 (Wed, 19 May 2010) | 12 lines
  
  Merged revisions 264334 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r264334 | mnicholson | 2010-05-19 15:01:38 -0500 (Wed, 19 May 2010) | 5 lines
    
    Set quieted flag when receiving a dtmf tone during playback in speechbackground.
    
    (closes issue #16966)
    Reported by: asackheim
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@264336 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-19 20:05:05 +00:00
Jeff Peeler
5e55e1f9ca Merged revisions 263807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r263807 | jpeeler | 2010-05-18 14:27:34 -0500 (Tue, 18 May 2010) | 17 lines
  
  Merged revisions 263769 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r263769 | jpeeler | 2010-05-18 13:54:58 -0500 (Tue, 18 May 2010) | 10 lines
    
    Modify directory name reading to be interrupted with operator or pound escape.
    
    In the case of accidentally entering the wrong first three letters for the
    reading, users could be very frustrated if the name listing is very long. This
    allows interrupting the reading by pressing 0 or #. 0 will attempt to execute
    a configured operator (o) extension and # will exit and proceed in the
    dialplan.
    
    ABE-2200
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@263809 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-18 19:41:10 +00:00
Tilghman Lesher
ec63586e57 Merged revisions 263589 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r263589 | tilghman | 2010-05-17 14:31:15 -0500 (Mon, 17 May 2010) | 9 lines
  
  With IMAP backend, messages in INBOX were counted twice for MWI.
  
  (closes issue #17135)
   Reported by: edhorton
   Patches: 
         20100513__issue17135.diff.txt uploaded by tilghman (license 14)
         17135_2.diff uploaded by ebroad (license 878)
   Tested by: edhorton, ebroad
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@263590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-17 19:37:11 +00:00
David Vossel
2f50e81931 Merged revisions 262744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r262744 | dvossel | 2010-05-12 13:01:20 -0500 (Wed, 12 May 2010) | 17 lines
  
  Merged revisions 262662 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r262662 | dvossel | 2010-05-12 12:00:04 -0500 (Wed, 12 May 2010) | 11 lines
    
    fixes app_meetme dsp error
    
    We attempted to detect silence after translating a frame
    from signed linear.  This caused a flooding of errors.  To
    resolve this the code to detect silence was moved before the
    translation.
    
    (closes issue #17133)
    Reported by: jsdyer
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-12 18:03:38 +00:00
Tilghman Lesher
e8e38c4887 Merged revisions 262656 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r262656 | tilghman | 2010-05-12 11:23:26 -0500 (Wed, 12 May 2010) | 8 lines
  
  Ensure the arguments are initialized.  Also miscellaneous CG cleanup.
  
  (closes issue #16576)
   Reported by: uxbod
   Patches: 
         20100505__issue16576.diff.txt uploaded by tilghman (license 14)
   Tested by: uxbod
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-12 16:29:14 +00:00
Tilghman Lesher
3a61e13e21 Merged revisions 262330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r262330 | tilghman | 2010-05-11 12:23:51 -0500 (Tue, 11 May 2010) | 9 lines
  
  Merged revisions 262321 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r262321 | tilghman | 2010-05-11 12:22:07 -0500 (Tue, 11 May 2010) | 2 lines
    
    Fix issue #17302 a slightly different way (mad props to Qwell)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-11 17:25:28 +00:00
David Vossel
f1f84978a4 Merged revisions 262240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r262240 | dvossel | 2010-05-10 14:06:08 -0500 (Mon, 10 May 2010) | 9 lines
  
  fixes PickupChan application
  
  (closes issue #16863)
  Reported by: schern
  Patches:
        app_directed_pickup.c.patch uploaded by schern (license 995)
        for_trunk.diff uploaded by cjacobsen (license 1029)
  Tested by: Graber, cjacobsen, lathama, rickead2000, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-10 19:06:54 +00:00
Jeff Peeler
efeb6547ad Merged revisions 261736 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r261736 | jpeeler | 2010-05-06 15:11:53 -0500 (Thu, 06 May 2010) | 15 lines
  
  Merged revisions 261735 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r261735 | jpeeler | 2010-05-06 15:10:59 -0500 (Thu, 06 May 2010) | 8 lines
    
    Only allow the operator key to be accepted after leaving a voicemail.
    
    Or rather disallow the operator key from being accepted when not offered,
    such as after finishing a recording from within the mailbox options menu.
    
    ABE-2121
    SWP-1267
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@261739 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-06 20:13:24 +00:00
Paul Belanger
b673bc6b2a Merged revisions 261232 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r261232 | pabelanger | 2010-05-05 11:42:07 -0400 (Wed, 05 May 2010) | 10 lines
  
  'queue reset stats' erroneously clears wrapuptime configuration.
  
  Resets each member's lastcall to 0 now.
  
  (closes issue #17262, #16519)
  Reported by: rain
  Patches:
        wrapuptime_reset_fix.diff uploaded by rain (license 327)
  Tested by: rain
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@261233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-05 15:59:38 +00:00
Jeff Peeler
445c61a106 Merged revisions 260924 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260924 | jpeeler | 2010-05-04 13:51:28 -0500 (Tue, 04 May 2010) | 18 lines
  
  Merged revisions 260923 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260923 | jpeeler | 2010-05-04 13:46:46 -0500 (Tue, 04 May 2010) | 12 lines
    
    Voicemail transfer to operator should occur immediately, not after main menu.
    
    There were two scenarios in the advanced options that while using the
    operator=yes and review=yes options, the transfer occurred only after exiting
    the main menu (after sending a reply or leaving a message for an extension).
    Now after the audio is processed for the reply or message the transfer occurs
    immediately as expected.
    
    ABE-2107
    ABE-2108
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@260927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-04 19:01:11 +00:00
Jeff Peeler
c65bf1934a Merged revisions 259672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259672 | jpeeler | 2010-04-28 12:18:43 -0500 (Wed, 28 Apr 2010) | 11 lines
  
  Merged revisions 259664 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259664 | jpeeler | 2010-04-28 12:13:29 -0500 (Wed, 28 Apr 2010) | 4 lines
    
    Do not play goodbye prompt after timeout of message review.
    
    ABE-2124
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@259681 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 17:19:56 +00:00
Jeff Peeler
e7138f93f3 Merged revisions 258433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258433 | jpeeler | 2010-04-21 16:56:09 -0500 (Wed, 21 Apr 2010) | 15 lines
  
  Merged revisions 258432 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r258432 | jpeeler | 2010-04-21 16:45:36 -0500 (Wed, 21 Apr 2010) | 8 lines
    
    Fix looping forever when no input received in certain voicemail menu scenarios.
    
    Specifically, prompting for an extension (when leaving or forwarding a message)
    or when prompting for a digit (when saving a message or changing folders).
    
    ABE-2122
    SWP-1268
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@258436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-21 22:11:47 +00:00
Jeff Peeler
debee3bb2d Merged revisions 258065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258065 | jpeeler | 2010-04-20 12:06:19 -0500 (Tue, 20 Apr 2010) | 17 lines
  
  Merged revisions 258029 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r258029 | jpeeler | 2010-04-20 11:16:33 -0500 (Tue, 20 Apr 2010) | 11 lines
    
    Play correct prompt when voicemail store failure occurs after attempted forward.
    
    If a user's mailbox was full and a message was attempted to be forwarded to
    said box, warnings on the console would indicate failure. However, the played
    prompt was that of success (vm-msgsaved). Now storage failure is taken into
    account and the correct prompt (vm-mailboxfull) is played when appropriate.
    
    ABE-2123
    SWP-1262
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@258108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-20 18:04:27 +00:00
Dwayne M. Hubbard
2056f7faab Merged revisions 257713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257713 | dhubbard | 2010-04-16 16:22:30 -0500 (Fri, 16 Apr 2010) | 28 lines
  
  Merged revisions 257686 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257686 | dhubbard | 2010-04-16 16:15:43 -0500 (Fri, 16 Apr 2010) | 21 lines
    
    Make the mixmonitor thread process audio frames faster
    
    Mantis issue 17078 reports MixMonitor recordings have shorter durations than 
    the call duration.  This was because the mixmonitor thread was not processing 
    frames from the audiohook fast enough.  The mixmonitor thread would slowly fall 
    behind the most recent audio frame and when the channel hangs up, the mixmonitor 
    thread would exit without processing the same number of frames as the channel; 
    leaving the mixmonitor recording shorter than actual call duration.
    
    This revision fixes this issue by moving the ast_audiohook_trigger_wait() and 
    the subsequent audiohook.status check into the block where the 
    ast_audiohook_read_frame() function returns NULL.
    
    (closes issue #17078)
    Reported by: geoff2010
    Patches:
          dw-M17078.patch uploaded by dhubbard (license 733)
    Tested by: dhubbard, geoff2010
    
    Review: https://reviewboard.asterisk.org/r/611/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@257740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-16 21:47:01 +00:00
Leif Madsen
d261aa1154 Merged revisions 256860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r256860 | lmadsen | 2010-04-12 11:16:43 -0500 (Mon, 12 Apr 2010) | 3 lines
  
  Remove silly debug message that is not useful.
  
  (issue #17159)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@256862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-12 16:17:20 +00:00
Russell Bryant
9d5fa49b76 Merged revisions 256019 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r256019 | russell | 2010-04-02 18:55:57 -0500 (Fri, 02 Apr 2010) | 10 lines
  
  Export MEETMEBOOKID and fix pin-less conferences with realtime conferences
  
  (closes issue #16866)
  Reported by: DEA
  Patches:
        rt-meetme-options.txt uploaded by DEA (license 3)
  Tested by: DEA
  
  Review: https://reviewboard.asterisk.org/r/582/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@256020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-02 23:56:45 +00:00
Tilghman Lesher
770e085d88 Recorded merge of revisions 255592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r255592 | tilghman | 2010-03-31 14:13:02 -0500 (Wed, 31 Mar 2010) | 22 lines
  
  Recorded merge of revisions 255591 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r255591 | tilghman | 2010-03-31 14:09:46 -0500 (Wed, 31 Mar 2010) | 15 lines
    
    Ensure line terminators in email are consistent.
    
    Fixes an issue with certain Mail Transport Agents, where attachments are not
    interpreted correctly.
    
    (closes issue #16557)
     Reported by: jcovert
     Patches: 
           20100308__issue16557__1.4.diff.txt uploaded by tilghman (license 14)
           20100308__issue16557__1.6.0.diff.txt uploaded by tilghman (license 14)
           20100308__issue16557__trunk.diff.txt uploaded by tilghman (license 14)
     Tested by: ebroad, zktech
     
    Reviewboard: https://reviewboard.asterisk.org/r/544/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@255676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-31 19:34:47 +00:00
Leif Madsen
81245345dd Merged revisions 255504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255504 | lmadsen | 2010-03-31 12:48:09 -0500 (Wed, 31 Mar 2010) | 5 lines
  
  Add documentation clarifying when 't' and 'T' can be used.
  
  (closes issue #17021)
  Reported by: kovzol
  Tested by: lmadsen, kovzol, davidw, ebroad
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@255505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-31 17:49:07 +00:00
Russell Bryant
eb744f5ca3 Merged revisions 253538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve compiler warnings on FreeBSD.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@253612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 17:28:36 +00:00
Leif Madsen
d75b120fbd Merged revisions 253345 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253345 | lmadsen | 2010-03-18 12:52:35 -0500 (Thu, 18 Mar 2010) | 7 lines
  
  Change usage of pipe to comma in UserEvent docs.
  
  Change the example usage of pipe as a separator to comma in the UserEvent
  documentation.
  
  (closes issue #16961)
  Reported by: jlpedrosa
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@253346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-18 17:54:21 +00:00
Tilghman Lesher
09c4bf599b Merged revisions 252976 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252976 | tilghman | 2010-03-16 18:49:35 -0500 (Tue, 16 Mar 2010) | 8 lines
  
  Mask out previous arguments on each nested invocation of Gosub.
  (closes issue #16758)
   Reported by: wdoekes
   Patches: 
         20100316__issue16758.diff.txt uploaded by tilghman (license 14)
   
  Review: https://reviewboard.asterisk.org/r/561/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@252978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 23:54:30 +00:00
Sean Bright
91004a858c Merged revisions 252623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252623 | seanbright | 2010-03-15 17:55:44 -0400 (Mon, 15 Mar 2010) | 4 lines
  
  Resolve a crash in SLATrunk when the specified trunk doesn't exist.
  
  Reported by philipp64 in #asterisk-dev.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@252626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 21:59:43 +00:00
Tilghman Lesher
cd4aa016a1 Merged revisions 251989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251989 | tilghman | 2010-03-12 13:43:23 -0600 (Fri, 12 Mar 2010) | 8 lines
  
  Don't override a user option with the global option.
  
  (closes issue #16849)
   Reported by: ip-rob
   Patches: 
         20100311__issue16849.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@251994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:50:57 +00:00
Tilghman Lesher
2edfdc9440 Merged revisions 251884 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251884 | tilghman | 2010-03-11 15:07:07 -0600 (Thu, 11 Mar 2010) | 8 lines
  
  Because ExecIf needs to reprocess arguments, it's best if we don't remove quotes during parsing.
  
  (closes issue #16905)
   Reported by: ip-rob
   Patches: 
         20100303__issue16905.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@251887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 21:08:33 +00:00
Tilghman Lesher
50bfdf5ac9 Merged revisions 251877 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251877 | tilghman | 2010-03-11 14:25:02 -0600 (Thu, 11 Mar 2010) | 8 lines
  
  If the argument to the system application is quoted, ensure we remove the quotes before trying to execute.
  
  (closes issue #16842)
   Reported by: ip-rob
   Patches: 
         20100310__issue16842.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@251879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 20:27:37 +00:00
Alec L Davis
e96c2b0f46 Merged revisions 251779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251779 | alecdavis | 2010-03-11 20:03:51 +1300 (Thu, 11 Mar 2010) | 14 lines
  
  Add supporting code for app-directory pause option.
  
  Since 1.6.1 CLI help reports that option p(n) 'initial pause' is available.
  Supporting code was never implemented.
  
  (closes issue #16751)
  Reported by: alecdavis
  Patches: 
        directory_pause.trunk.diff.txt uploaded by alecdavis (license 585)
  Tested by: alecdavis
  
  Review: https://reviewboard.asterisk.org/r/481/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@251820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 07:48:14 +00:00
Leif Madsen
f2f4b4b267 Merged revisions 251680 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251680 | lmadsen | 2010-03-10 14:53:43 -0600 (Wed, 10 Mar 2010) | 10 lines
  
  Be less ambiguous in Record() app docs.
  For some reason the documentation for the 'k' application in trunk
  and 1.6.2 is different than 1.6.0 and 1.6.1, so I'm setting them all
  to match. The wording in 1.6.2 and trunk was ambiguous, so you could
  interpret the wording the mean that recording would continue upon hangup
  indefinitely, or you could interpret it to mean that the recorded
  data would not be discarded upon hangup. This change makes it clear
  we mean the latter, and not the former.
  
  Came from a discussion in #asterisk on IRC.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@251683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-10 20:54:19 +00:00