Commit Graph

22238 Commits

Author SHA1 Message Date
Matthew Nicholson
8f2e8d4b8a Merged revisions 332022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r332022 | mnicholson | 2011-08-16 09:40:37 -0500 (Tue, 16 Aug 2011) | 16 lines
  
  In 10 and trunk this option is disabled by default.
  
  Merged revisions 332021 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r332021 | mnicholson | 2011-08-16 09:20:43 -0500 (Tue, 16 Aug 2011) | 7 lines
    
    Added the 'storesipcause' option to sip.conf to allow the user to disable the
    setting of HASH(SIP_CAUSE,<chan name>) on the channel.
    
    Having chan_sip set HASH(SIP_CAUSE,<chan name>) on the channel carries a
    significant performance penalty because of the usage of the MASTER_CHANNEL()
    dialplan function.
    
    AST-580
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-16 14:41:23 +00:00
Richard Mudgett
3d42d45f25 Merged revisions 331956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331956 | rmudgett | 2011-08-15 12:35:03 -0500 (Mon, 15 Aug 2011) | 20 lines
  
  Merged revisions 331955 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331955 | rmudgett | 2011-08-15 12:24:08 -0500 (Mon, 15 Aug 2011) | 13 lines
    
    Fix some minor chan_dahdi config load issues.
    
    * Address chan_dahdi.conf dahdichan option todo item about needing line
    number.
    
    * Make ignore_failed_channels option also apply to dahdichan option.
    
    * Don't attempt to create a default pseudo channel if the chan_dahdi.conf
    channel/channels option is not allowed.
    
    * Add a similar check for dahdichan in normal chan_dahdi.conf sections as
    is done in users.conf.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-15 17:36:47 +00:00
Paul Belanger
6428f6692f Merged revisions 331894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331894 | pabelanger | 2011-08-15 11:22:45 -0400 (Mon, 15 Aug 2011) | 12 lines
  
  Merged revisions 331886 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331886 | pabelanger | 2011-08-15 11:21:16 -0400 (Mon, 15 Aug 2011) | 5 lines
    
    Fix noisy message when briding channels
    
    (closes issue ASTERISK-18270)
    Reported by: Federico Alves
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-15 15:24:55 +00:00
David Vossel
30b2f36c72 Merged revisions 331868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331868 | dvossel | 2011-08-15 10:14:13 -0500 (Mon, 15 Aug 2011) | 12 lines
  
  Merged revisions 331867 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331867 | dvossel | 2011-08-15 10:12:16 -0500 (Mon, 15 Aug 2011) | 6 lines
    
    Fixes locking inversion issues present in the handling of the sip REFER method.
    
    (closes issue ASTERISK-18082)
    Reported by: James Van Vleet
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-15 15:15:43 +00:00
Olle Johansson
6b7e997df2 Formatting guideline fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-15 13:27:06 +00:00
Matthew Nicholson
c9f65ece49 Merged revisions 331775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331775 | mnicholson | 2011-08-12 14:03:31 -0500 (Fri, 12 Aug 2011) | 17 lines
  
  Merged revisions 331774 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331774 | mnicholson | 2011-08-12 14:01:27 -0500 (Fri, 12 Aug 2011) | 11 lines
    
    Unlock the channel before calling update_queue.
    
    Holding the channel lock when calling update_queue which attempts to lock the
    queue lock can cause a deadlock. This deadlock involves the following chain:
    
    1. hold chan lock -> wait queue lock
    2. hold queue lock -> wait agent list lock
    3. hold agent list lock -> wait chan list lock
    4. hold chan list lock -> wait chan lock
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12 19:06:10 +00:00
Richard Mudgett
28e2aa76b2 Merged revisions 331772 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331772 | rmudgett | 2011-08-12 13:59:45 -0500 (Fri, 12 Aug 2011) | 15 lines
  
  Merged revisions 331771 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331771 | rmudgett | 2011-08-12 13:58:40 -0500 (Fri, 12 Aug 2011) | 8 lines
    
    Suppress warning message when using DAHDITransfer or DAHDIHangup.
    
    * The fake event should only be processed by the channel that currently
    owns the private and not the associated call waiting or 3-way channel.
    
    JIRA AST-620
    JIRA SWP-3616
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12 19:01:04 +00:00
Jonathan Rose
39fe851e79 Merged revisions 331644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331644 | jrose | 2011-08-12 11:18:57 -0500 (Fri, 12 Aug 2011) | 9 lines
  
  Merged revisions 331635 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331635 | jrose | 2011-08-12 10:49:17 -0500 (Fri, 12 Aug 2011) | 1 line
    
    Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12 18:03:29 +00:00
Richard Mudgett
452f198609 Merged revisions 331715 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331715 | rmudgett | 2011-08-12 12:54:47 -0500 (Fri, 12 Aug 2011) | 29 lines
  
  Merged revisions 331714 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331714 | rmudgett | 2011-08-12 12:47:57 -0500 (Fri, 12 Aug 2011) | 22 lines
    
    AMI actions DAHDIHangup and DAHDITransfer have no effect.
    
    The AMI actions DAHDIHangup and DAHDITransfer have no effect on a DAHDI
    channel.  These two AMI actions are highly specialized to analog channels
    and appear to make the channel behave like a jack port for headsets.
    
    * Made the faked DAHDI event get processed before a normal media stream
    read in dahdi_read() instead of trying to trigger an exception read by
    setting the AST_FLAG_EXCEPTION flag.  Apparently a change was made long
    ago that changed how AST_FLAG_EXCEPTION is processed in the core.
    Unfortunately, the faked DAHDI events no longer worked when that happened.
    
    * Updated the DAHDI AMI action documentation for the following actions:
    DAHDITransfer, DAHDIHangup, DAHDIDialOffhook, DAHDIDNDon, DAHDIDNDoff,
    DAHDIShowChannels, and DAHDIRestart.
    
    * Made use sscanf() instead of atoi() for better error checking of the
    DAHDIChannel header string.
    
    JIRA AST-620
    JIRA SWP-3616
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12 17:56:46 +00:00
Terry Wilson
7b07828f2b Merged revisions 331659 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331659 | twilson | 2011-08-12 11:31:21 -0500 (Fri, 12 Aug 2011) | 11 lines
  
  Merged revisions 331658 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331658 | twilson | 2011-08-12 11:30:26 -0500 (Fri, 12 Aug 2011) | 4 lines
    
    Fix netsock2 multiple zero-expansion test
    
    Remove erroneous single bracket.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331660 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12 16:32:24 +00:00
Kinsey Moore
baa2d1d891 Merged revisions 331654 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331654 | kmoore | 2011-08-12 11:21:37 -0500 (Fri, 12 Aug 2011) | 19 lines
  
  Merged revisions 331649 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331649 | kmoore | 2011-08-12 11:20:25 -0500 (Fri, 12 Aug 2011) | 12 lines
    
    Logger does not warn of failure to open logging channels
    
    Currently, logger only prints an error message to stderr when it fails to open
    a logger channel where many users will not see it because the logger lock is
    held.  The alternative provided by this patch is to log the error to all
    attached consoles in the hopes that it will be easier to see.  Additionally,
    this patch prevents the failed logger channel from being added to the list
    where it would silently fail on each call to the Asterisk logger.
    
    (closes issue ASTERISK-16231)
    Review: https://reviewboard.asterisk.org/r/1338
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12 16:22:45 +00:00
Jason Parker
1a8069abe2 Merged revisions 331579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331579 | qwell | 2011-08-11 16:54:54 -0500 (Thu, 11 Aug 2011) | 13 lines
  
  Merged revisions 331578 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331578 | qwell | 2011-08-11 16:46:39 -0500 (Thu, 11 Aug 2011) | 6 lines
    
    Use proper values for 64-bit option flags.
    
    Also, reusing bits es no bueno, so change the value of a duplicate.
    
    (issue ASTERISK-18239)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-11 21:55:48 +00:00
Richard Mudgett
e12184cf95 Merged revisions 331576 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331576 | rmudgett | 2011-08-11 16:42:21 -0500 (Thu, 11 Aug 2011) | 16 lines
  
  Merged revisions 331575 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331575 | rmudgett | 2011-08-11 16:39:58 -0500 (Thu, 11 Aug 2011) | 9 lines
    
    Segfault in shell_helper in func_shell.c.
    
    The return value of popen() was not checked for failure to open.
    
    (closes issue ASTERISK-18109)
    JIRA SWP-3633
    Reported by: Michael Myles
    Tested by: rmudgett
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-11 21:44:08 +00:00
Kinsey Moore
a6ea606a78 Merged revisions 331518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331518 | kmoore | 2011-08-10 17:23:49 -0500 (Wed, 10 Aug 2011) | 17 lines
  
  Merged revisions 331517 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331517 | kmoore | 2011-08-10 17:23:08 -0500 (Wed, 10 Aug 2011) | 10 lines
    
    SIP Notify via AMI or CLI leaks SIP PVTs
    
    Any SIP notify sent via AMI or CLI leaks a SIP PVT with ref count +2.  Removing
    the additional ref just before the invite and adding an unref following it
    corrects the issue as seen via REF_DEBUG.  The unref existed in a distant
    revision and it appears as though the wrong ref operation was removed.
    
    (closes issue ASTERISK-18091)
    Review: https://reviewboard.asterisk.org/r/1332/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 22:24:38 +00:00
Richard Mudgett
9d785ca5f3 Merged revisions 331462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331462 | rmudgett | 2011-08-10 15:41:35 -0500 (Wed, 10 Aug 2011) | 37 lines
  
  Merged revisions 331461 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331461 | rmudgett | 2011-08-10 15:29:59 -0500 (Wed, 10 Aug 2011) | 30 lines
    
    Output of queue log not started until logger reloaded.
    
    ASTERISK-15863 caused a regression with queue logging.  The output of the
    queue log is not started until the logger configuration is reloaded.
    
    * Queue log initialization is completely delayed until the first message
    is posted to the queue log system.  Including the initial opening of the
    queue log file.
    
    * Fixed rotate_file() ROTATE strategy to give the file just rotated out to
    the configured exec function after rotate.  Just like the other strategies.
    
    * Fixed logger reload to always post the queue reload entry instead of
    just if there is a queue log file.
    
    * Refactored some code to eliminate some redundancy and to reduce stack
    utilization.
    
    (closes issue ASTERISK-17036)
    JIRA SWP-2952
    Reported by: Juan Carlos Valero
    Patches:
          jira_asterisk_17036_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: rmudgett
    
    (closes issue ASTERISK-18208)
    Reported by: Christian Pinedo
    
    Review: https://reviewboard.asterisk.org/r/1333/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 20:51:07 +00:00
Richard Mudgett
fa794d8f7a Merged revisions 331420 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331420 | rmudgett | 2011-08-10 14:07:53 -0500 (Wed, 10 Aug 2011) | 2 lines
  
  Make sure feature_request_and_dial() initializes outstate if passed in.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 19:08:22 +00:00
Richard Mudgett
02ecb12f64 Merged revisions 331418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331418 | rmudgett | 2011-08-10 13:25:08 -0500 (Wed, 10 Aug 2011) | 6 lines
  
  Revert -r318141.  It was a band-aid that only partially fixed parking.
  
  A better fix is on reviewboard review 1358.
  
  (issue ASTERISK-17374)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 18:27:16 +00:00
Jonathan Rose
dc9513a69d SIP display-name needed to be empty for Avaya IP500
In order to address a compatability issue with certain features on certain devices
which rely on display name content to change behavior, initreqprep in chan_sip.c
has been changed to no longer substitute cid_number into the display name when
cid_name isn't present.  Instead, it will send no display name in that case.

(closes issue ASTERISK-16198)
Reported by: Walter Doekes

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




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 15:45:57 +00:00
Kinsey Moore
0208f0ac71 Merged revisions 331316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331316 | kmoore | 2011-08-10 08:48:41 -0500 (Wed, 10 Aug 2011) | 15 lines
  
  Merged revisions 331315 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331315 | kmoore | 2011-08-10 08:47:46 -0500 (Wed, 10 Aug 2011) | 8 lines
    
    AMI action ModuleReload returns Error if Module: missing or empty
    
    An empty string was not being checked for properly causing identification of
    the module to be reloaded to fail and return an Error with message
    "No such module."
    
    (closes issue AST-616)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 13:49:31 +00:00
Richard Mudgett
b99b1116be Merged revisions 331265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331265 | rmudgett | 2011-08-09 18:12:49 -0500 (Tue, 09 Aug 2011) | 22 lines
  
  Merged revisions 331248 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331248 | rmudgett | 2011-08-09 17:12:59 -0500 (Tue, 09 Aug 2011) | 15 lines
    
    Misc minor items found in code.
    
    * Add some reentrancy protection in pbx.c when creating the contexts_table
    hash table.
    
    * Fix inverted test in chan_sip.c conditional code.
    
    * Fix uninitialized variable and use of the wrong variable in chan_iax2.c.
    
    * Fix test of return value in app_parkandannounce.c.  Explicitly testing
    for -1 is bad if the function does not actually return that value when it
    fails.
    
    * Fixup some comments and add some curly braces in features.c.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 23:17:13 +00:00
Alexandr Anikin
1626b29f6f Merged revisions 331147,331200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331147 | may | 2011-08-09 20:16:55 +0400 (Tue, 09 Aug 2011) | 11 lines
  
  Merged revisions 331146 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331146 | may | 2011-08-09 20:13:09 +0400 (Tue, 09 Aug 2011) | 4 lines
    
    move ast_cond_signal for admitted call after all data filled/freed
    clear all log channels by pointed number not only first
    free allocated callToken in ooh323_answer
  ........
................
  r331200 | may | 2011-08-09 20:36:39 +0400 (Tue, 09 Aug 2011) | 9 lines
  
  Setup IP proto version for call in GK mode
  Added additional check for IP semantics before parse destination
  by ast_parse_args due to it can parse numeric as IP.
  
   (closes issue ASTERISK-18218)
   Reported by: slesru
   Patch: ASTERISK-18218.patch
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 17:12:27 +00:00
Kinsey Moore
c3bd5892a6 Allow ENUM query functions to report lookup errors
The ENUM dialplan functions do not report DNS query errors properly. It is
useful to differentiate between failed query (e.g. non-existent domain) vs. no
data records of the appropriate type. This is required to make overlapped
dialing work.

(closes issue ASTERISK-13769)
Review: https://reviewboard.asterisk.org/r/1355/
Patch-by: Timo Teras


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 17:08:33 +00:00
Jason Parker
5fe104ddb9 Merged revisions 331143 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331143 | qwell | 2011-08-09 10:59:54 -0500 (Tue, 09 Aug 2011) | 9 lines
  
  Merged revisions 331142 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331142 | qwell | 2011-08-09 10:58:16 -0500 (Tue, 09 Aug 2011) | 1 line
    
    Regenerate asterisk man page from sgml.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 16:02:45 +00:00
Jason Parker
873962f772 Merged revisions 331139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331139 | qwell | 2011-08-09 10:50:07 -0500 (Tue, 09 Aug 2011) | 19 lines
  
  Merged revisions 306999 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r306999 | lathama | 2011-02-08 14:22:35 -0600 (Tue, 08 Feb 2011) | 12 lines
    
    Documentation Updates
    
    Note default polling setting in voicemail.conf
    Add missing config to asterisk.conf
    Update manpage
    
    (issue #16505)
    Reported by: tzafrir
    Patches: 
          asterisk_sgml_fixes_demo.diff uploaded by tzafrir (license 46)
    Tested by: lathama, tzafrir
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331141 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 15:53:26 +00:00
Jason Parker
19c8278815 Merged revisions 331138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line
  
  Revert merge of r306999, due to merge conflict.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 15:51:38 +00:00
Terry Wilson
16acfefa74 Merged revisions 331097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331097 | twilson | 2011-08-08 17:59:01 -0500 (Mon, 08 Aug 2011) | 5 lines
  
  Bump the AMI protocol version to 1.2
  
  As a result of converting Unlink events that were missed in the AMI
  1.1 update to Bridge events, the AMI protocol version is being incremented.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08 22:59:45 +00:00
Terry Wilson
5901f2d0b1 Merged revisions 331041 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331041 | twilson | 2011-08-08 16:12:51 -0500 (Mon, 08 Aug 2011) | 6 lines
  
  Replace AMI Unlink events with Bridge events
  
  A previous update converted some of the Link and Unlink events to
  Bridge events, but a couple of Unlink events were missed. This patch
  rectifies the situation.

  (closes issues ASTERISK-17455)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08 21:16:25 +00:00
Kinsey Moore
38efff0ca3 Merged revisions 331039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331039 | kmoore | 2011-08-08 15:53:30 -0500 (Mon, 08 Aug 2011) | 18 lines
  
  Merged revisions 331038 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331038 | kmoore | 2011-08-08 15:52:45 -0500 (Mon, 08 Aug 2011) | 11 lines
    
    In-queue MOH stops after a periodic announcement
    
    If the seek value is past the end of file when resuming G.722 MOH, MOH will
    cease to function for the duration of the MOH session through all starts and
    stops until saved state is cleared.  Adjusting the code to guarantee a single
    valid read (which is already assumed) fixes the bug.
    
    (closes issue ASTERISK-18077)
    Review: https://reviewboard.asterisk.org/r/1328/
    Tested-by: Jonathan Rose <jrose@digium.com>
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08 20:54:14 +00:00
Kinsey Moore
0f5ef2c781 Log queue member name when state_interface is set for ADDMEMBER and REMOVEMEMBER events
app_queue logs the events ADDMEMBER and REMOVEMEMBER with the agent field set
to the interface value rather than the membername value when a member is added
with a state_interface value set.  However all other member related queue
events are logged with the membername when a state_interface is set.  This
patch makes these fields optionally more consistent and correct.

(closes issue ASTERISK-14769)
Review: https://reviewboard.asterisk.org/r/1286
Patch-by: Jamuel Starkey
Tested-by: Kinsey Moore <kmoore@digium.com>


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08 20:28:20 +00:00
Kinsey Moore
d1a0938c99 app_queue: Add StateInterface to output of "queue show" and "QueueStatus"
This patch adds the state_interface of the queue member struct to the output
of "queue show" (CLI command) and "QueueStatus" (AMI action) when displaying
relevant queue member information.  For the AMI event message the variable
StateInterface has been added.

(closes issue ASTERISK-18071)
Review: https://reviewboard.asterisk.org/r/1300/
Patch-by: Jamuel Starkey


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08 15:00:26 +00:00
David Vossel
80a4611fd7 Merged revisions 330940 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r330940 | dvossel | 2011-08-05 10:53:49 -0500 (Fri, 05 Aug 2011) | 2 lines
  
  The slin resampler is no longer dependent on an external library, but the dependency was not removed correctly.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-05 15:57:06 +00:00
Alexandr Anikin
872e0411bd Merged revisions 330899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330899 | may | 2011-08-05 11:38:28 +0400 (Fri, 05 Aug 2011) | 11 lines
  
  Merged revisions 330827 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330827 | may | 2011-08-04 23:37:16 +0400 (Thu, 04 Aug 2011) | 4 lines
    
    change gk client behaivour on rrq/grq failures to setup timers
    and next tries after timeout instead of complete failure in the ooh323
    stack
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-05 08:47:59 +00:00
Terry Wilson
72eba1af20 Merged revisions 330844 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330844 | twilson | 2011-08-04 15:51:23 -0500 (Thu, 04 Aug 2011) | 11 lines
  
  Merged revisions 330843 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330843 | twilson | 2011-08-04 15:29:19 -0500 (Thu, 04 Aug 2011) | 4 lines
    
    Make libsrtp instructions more explicit when linking fails
    
    (closes issue ASTERISK-18139)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330845 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-04 20:53:16 +00:00
Kinsey Moore
276c795486 Merged revisions 330763 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330763 | kmoore | 2011-08-03 10:15:26 -0500 (Wed, 03 Aug 2011) | 16 lines
  
  Merged revisions 330762 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330762 | kmoore | 2011-08-03 10:14:36 -0500 (Wed, 03 Aug 2011) | 9 lines
    
    editing files in main/editline does not ensure rebuild of libedit.a
    
    When editing a source file in main/editline, the build system does not rebuild
    libedit.a and uses the already existing one instead.  Adding a PHONY to
    CHECK_SUBDIR fixes this problem.
    
    (closes issue ASTERISK-16221)
    Patch-by: Walter Doekes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-03 15:16:25 +00:00
Kinsey Moore
db3d113414 Merged revisions 330706 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330706 | kmoore | 2011-08-03 08:39:06 -0500 (Wed, 03 Aug 2011) | 17 lines
  
  Merged revisions 330705 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330705 | kmoore | 2011-08-03 08:38:17 -0500 (Wed, 03 Aug 2011) | 10 lines
    
    Call pickup broken for DAHDI channels when beginning with #
    
    The call pickup feature did not work on DAHDI devices for anything other than
    feature codes beginning with * since all feature codes in chan_dahdi were
    originally hard-coded to begin with *.  This patch is also applied to
    chan_dahdi.c to fix this bug with radio modes.
    
    (closes issue AST-621)
    Review: https://reviewboard.asterisk.org/r/1336/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-03 13:40:22 +00:00
Kevin P. Fleming
ed6ac7359f Merged revisions 330649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330649 | kpfleming | 2011-08-02 15:52:44 -0500 (Tue, 02 Aug 2011) | 9 lines
  
  Merged revisions 330648 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330648 | kpfleming | 2011-08-02 15:51:56 -0500 (Tue, 02 Aug 2011) | 2 lines
    
    Convert an error message to actually be helpful.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-02 20:54:19 +00:00
David Vossel
e128ee2567 Merged revisions 330586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330586 | dvossel | 2011-08-02 11:17:59 -0500 (Tue, 02 Aug 2011) | 15 lines
  
  Merged revisions 330581 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330581 | dvossel | 2011-08-02 11:15:08 -0500 (Tue, 02 Aug 2011) | 8 lines
    
    Fixes crash in chan_iax2.
    
    Fixes crash in chan_iax2 resulting from an edge case in the
    way control frames are queued during calltoken negotiation is complete.
    
    (closes issue ASTERISK-17610)
    Reported by: mgrobecker
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-02 16:19:32 +00:00
David Vossel
6f112cce0d Merged revisions 330579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330579 | dvossel | 2011-08-02 11:08:57 -0500 (Tue, 02 Aug 2011) | 9 lines
  
  Merged revisions 330578 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330578 | dvossel | 2011-08-02 11:07:02 -0500 (Tue, 02 Aug 2011) | 2 lines
    
    Optimization to buffer initialization fix.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-02 16:09:50 +00:00
David Vossel
d50e68c827 Merged revisions 330576 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330576 | dvossel | 2011-08-02 10:55:36 -0500 (Tue, 02 Aug 2011) | 12 lines
  
  Merged revisions 330575 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330575 | dvossel | 2011-08-02 10:53:21 -0500 (Tue, 02 Aug 2011) | 5 lines
    
    Fixes uninitialized string buffer in log message.
    
    (closes issue ASTERISK-17200)
    Reported by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-02 16:04:34 +00:00
Jonathan Rose
4e1b07f243 Blocked revisions 330514 via svnmerge
................
  r330514 | jrose | 2011-08-01 16:21:23 -0500 (Mon, 01 Aug 2011) | 14 lines
  
  Blocked revisions 330510 via svnmerge
  
  ................
    r330510 | jrose | 2011-08-01 16:20:40 -0500 (Mon, 01 Aug 2011) | 8 lines
    
    Blocked revisions 330505 via svnmerge
    
    ........
      r330505 | jrose | 2011-08-01 16:19:47 -0500 (Mon, 01 Aug 2011) | 3 lines
      
      fixes reference leak pointed out by rmudgett in https://reviewboard.asterisk.org/r/1337/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-01 21:22:08 +00:00
Jonathan Rose
5e1a744a9d Blocked revisions 330492 via svnmerge
................
  r330492 | jrose | 2011-08-01 16:10:35 -0500 (Mon, 01 Aug 2011) | 24 lines
  
  Blocked revisions 330491 via svnmerge
  
  ................
    r330491 | jrose | 2011-08-01 16:09:15 -0500 (Mon, 01 Aug 2011) | 18 lines
    
    Blocked revisions 330490 via svnmerge
    
    ........
      r330490 | jrose | 2011-08-01 16:08:10 -0500 (Mon, 01 Aug 2011) | 12 lines
      
      Asterisk 18103 - Fix reload crash caused by destroying default parking lot
      
      Default parking lot was being destroyed in reload and was not being rebuilt properly.
      This patch keeps features.c reload from destroying the default parking lot in 1.6.2.
      Bug was caused by a hasty backport which didn't test reload enough times to catch the
      problem.
      
      (Closes Issue ASTERISK-18103)
      Reported by: 808blogger
      
      Review: https://reviewboard.asterisk.org/r/1337/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-01 21:11:24 +00:00
Kinsey Moore
dc8df80e56 Merged revisions 330434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330434 | kmoore | 2011-08-01 10:23:29 -0500 (Mon, 01 Aug 2011) | 16 lines
  
  Merged revisions 330433 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330433 | kmoore | 2011-08-01 10:22:10 -0500 (Mon, 01 Aug 2011) | 9 lines
    
    Incorrect playback for Spanish in some circumstances
    
    When you say the time in spanish and it is 01:00 - 01:59 or 13:00 - 13:59 you
    must use female pronunciation "1F". The function "say_date_with_format_es" does
    not take this in account.
    
    (closes ASTERISK-15016)
    Patch-by: Luis Jimenez
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-01 15:24:21 +00:00
Richard Mudgett
6cf345e023 Fixed compiler warning and a couple prototype mismatches.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-31 00:19:11 +00:00
Richard Mudgett
a5be6a0f85 Merged revisions 330369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330369 | rmudgett | 2011-07-30 18:57:56 -0500 (Sat, 30 Jul 2011) | 11 lines
  
  Merged revisions 330368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330368 | rmudgett | 2011-07-30 18:56:29 -0500 (Sat, 30 Jul 2011) | 4 lines
    
    Remove some redundant locking code in ast_do_masquerade().
    
    Also updated some comments.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-31 00:05:55 +00:00
Gregory Nietsky
1c0078286e Merged revisions 330312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330312 | irroot | 2011-07-30 17:34:41 +0200 (Sat, 30 Jul 2011) | 15 lines
  
  Merged revisions 330311 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330311 | irroot | 2011-07-30 17:25:16 +0200 (Sat, 30 Jul 2011) | 9 lines
    
    prevent double masqurading channels when one is been hung up and deadlock avoidance is used.
    
    There is a race condition in ast_do_masquerade / ast_hangup (at least)
    
    Reported by me signed off by schmidts with input from David Vossel
    
    Review: https://reviewboard.asterisk.org/r/1323/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-30 15:54:23 +00:00
Russell Bryant
6a15e95a32 astobj2: Avoid using temporary objects + ao2_find() with OBJ_POINTER.
There is a fairly common pattern making its way through the code base where we
put a temporary object on the stack so we can call ao2_find() with OBJ_POINTER.
The purpose is so that it can be passed into the object hash function.
However, this really seems like a hack and potentially error prone.  This patch
is a first stab at approach to avoid having to do that.

It adds a new flag, OBJ_KEY, which can be used instead of OBJ_POINTER in these
situations.  Then, the hash function can know whether it was given an object or
some custom data to hash.

The patch also changes some uses of ao2_find() for iax2_user and iax2_peer
objects to reflect how OBJ_KEY would be used.

So long, and thanks for all the fish.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-29 19:34:36 +00:00
Sean Bright
d2ed4ed5f7 Merged revisions 330217 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330217 | seanbright | 2011-07-29 13:19:42 -0400 (Fri, 29 Jul 2011) | 9 lines
  
  Merged revisions 330213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330213 | seanbright | 2011-07-29 13:18:56 -0400 (Fri, 29 Jul 2011) | 2 lines
    
    Correct the check for O_RDONLY.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-29 17:20:20 +00:00
Sean Bright
4e1fe6ccb7 Merged revisions 330204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330204 | seanbright | 2011-07-29 12:58:40 -0400 (Fri, 29 Jul 2011) | 9 lines
  
  Merged revisions 330203 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330203 | seanbright | 2011-07-29 12:58:08 -0400 (Fri, 29 Jul 2011) | 2 lines
    
    Only write to wav files that were opened to be written to.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-29 17:02:11 +00:00
Paul Belanger
b6a9795b9a Merged revisions 330162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r330162 | pabelanger | 2011-07-29 01:25:18 -0400 (Fri, 29 Jul 2011) | 4 lines
  
  Fix typo pointed out on #asterisk
  
  Thanks notten
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-29 05:27:22 +00:00
Terry Wilson
be38ebe316 Merged revisions 330108 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330108 | twilson | 2011-07-28 16:44:31 -0500 (Thu, 28 Jul 2011) | 9 lines
  
  Merged revisions 330107 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330107 | twilson | 2011-07-28 16:42:41 -0500 (Thu, 28 Jul 2011) | 2 lines
    
    Make console colors work for TERM=xterm-256color
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-28 21:46:27 +00:00