Commit Graph

277 Commits

Author SHA1 Message Date
Mark Michelson
6f8d167899 Merged revisions 243487 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r243487 | mmichelson | 2010-01-27 12:08:02 -0600 (Wed, 27 Jan 2010) | 9 lines
  
  Merged revisions 243486 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r243486 | mmichelson | 2010-01-27 12:06:43 -0600 (Wed, 27 Jan 2010) | 3 lines
    
    Use a safe list traversal while checking for duplicate vars in pbx_builtin_setvar_helper.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@243488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-27 18:08:51 +00:00
Alec L Davis
ce33012dbb Update CDR variables as pbx starts
Allows CDR variables added in cdr.c:set_one_cid to become visable during the call,
by executing ast_cdr_update() early in __ast_pbx_run.

Based on cdr_update.diff3.txt

(issue #16638)
Reported by: alecdavis
Patches: 
      cdr_update.diff3.txt uploaded by alecdavis (license 585)
Tested by: alecdavis



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-20 09:37:54 +00:00
Jeff Peeler
75b6779b19 Merged revisions 241366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r241366 | jpeeler | 2010-01-19 16:59:53 -0600 (Tue, 19 Jan 2010) | 13 lines
  
  Initialize data on the stack so that Park doesn't interpret random arguments.
  
  passdata was only being set in pbx_substitue_variables when arguments were
  passed.
  
  (closes issue #16406)
  (closes issue #16586)
  Reported by: DLNoah
  Patches: 
        bug16586v2.patch uploaded by jpeeler (license 325)
  Tested by: DLNoah
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-19 23:01:02 +00:00
Sean Bright
bf915a27cb Merged revisions 240717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240717 | seanbright | 2010-01-17 14:45:48 -0500 (Sun, 17 Jan 2010) | 5 lines
  
  Avoid a crash on Solaris when running 'core show functions.'
  
  (closes issue #16309)
  Reported by: asgaroth
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-17 19:47:43 +00:00
Tilghman Lesher
3e039cb60c Merged revisions 240175 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines
  
  Similarly, ensure that matchcid is duplicated correctly when merging contexts.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 17:39:02 +00:00
Tilghman Lesher
c00e8397c3 Merged revisions 239571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines
  
  Blank callerid and NULL callerid should not compare equal.
  The second is the default state for matching CID in the dialplan (no matching)
  while the first matches one particular CallerID.  This is a regression.
  (fixes AST-314, SWP-611)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 19:59:23 +00:00
David Vossel
50512e1bdf Merged revisions 237839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237839 | dvossel | 2010-01-05 13:29:47 -0600 (Tue, 05 Jan 2010) | 19 lines
  
  fixes subscriptions being lost after 'module reload'
  
  During a module reload if multiple extension configs are present,
  such as both extensions.conf and extensions.ael, watchers for one
  config's hints will be lost during the merging of the other config.
  
  This happens because hint watchers are only preserved for the
  current config being merged.  The old context list is destroyed
  after the merging takes place, meaning any watchers that were not
  perserved will be removed.
  
  Now all hints are preserved during merging regardless of what config
  file is being merged.  These hints are only restored if they
  are present within the new context list.
  
  (closes issue #16093)
  Reported by: jlaroff
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 19:43:06 +00:00
Tilghman Lesher
371e756c4f Merged revisions 237494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237494 | tilghman | 2010-01-04 14:59:01 -0600 (Mon, 04 Jan 2010) | 15 lines
  
  Merged revisions 237493 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237493 | tilghman | 2010-01-04 14:57:35 -0600 (Mon, 04 Jan 2010) | 8 lines
    
    Regression in issue #15421 - Pattern matching
    (closes issue #16482)
     Reported by: wdoekes
     Patches: 
           astsvn-16482-betterfix.diff uploaded by wdoekes (license 717)
           20091223__issue16482.diff.txt uploaded by tilghman (license 14)
     Tested by: wdoekes, tilghman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 21:00:29 +00:00
Tilghman Lesher
900879455b Merged revisions 237406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237406 | tilghman | 2010-01-04 12:28:28 -0600 (Mon, 04 Jan 2010) | 23 lines
  
  Merged revisions 237405 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237405 | tilghman | 2010-01-04 12:19:00 -0600 (Mon, 04 Jan 2010) | 16 lines
    
    Add a flag to disable the Background behavior, for AGI users.
    This is in a section of code that relates to two other issues, namely
    issue #14011 and issue #14940), one of which was the behavior of
    Background when called with a context argument that matched the current
    context.  This fix broke FreePBX, however, in a post-Dial situation.
    Needless to say, this is an extremely difficult collision of several
    different issues.  While the use of an exception flag is ugly, fixing all
    of the issues linked is rather difficult (although if someone would like
    to propose a better solution, we're happy to entertain that suggestion).
    (closes issue #16434)
     Reported by: rickead2000
     Patches: 
           20091217__issue16434.diff.txt uploaded by tilghman (license 14)
           20091222__issue16434__1.6.1.diff.txt uploaded by tilghman (license 14)
     Tested by: rickead2000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 18:30:36 +00:00
Tilghman Lesher
db84a76520 Merged revisions 235422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines
  
  Merged revisions 235421 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines
    
    Use context from which Macro is executed, not macro context, if applicable.
    Also, ensure that the extension COULD match, not just that it won't match more.
    (closes issue #16113)
     Reported by: OrNix
     Patches: 
           20091216__issue16113.diff.txt uploaded by tilghman (license 14)
     Tested by: OrNix
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@235423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-17 17:24:28 +00:00
David Vossel
4231ba3e97 Merged revisions 231867 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r231867 | dvossel | 2009-12-01 15:20:19 -0600 (Tue, 01 Dec 2009) | 9 lines
  
  Merged revisions 231853 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r231853 | dvossel | 2009-12-01 15:14:31 -0600 (Tue, 01 Dec 2009) | 3 lines
    
    WaitExten m option with no parameters generates frame with zero datalen but non-null data ptr
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@231879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-01 21:22:30 +00:00
David Brooks
af7fdf370e Merged revisions 229499 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r229499 | dbrooks | 2009-11-11 13:48:18 -0600 (Wed, 11 Nov 2009) | 15 lines
  
  Merged revisions 229498 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229498 | dbrooks | 2009-11-11 13:46:19 -0600 (Wed, 11 Nov 2009) | 8 lines
    
    Solaris doesn't like NULL going to ast_log
    
    Solaris will crash if NULL is passed to ast_log. This simple patch simply uses S_OR to
    get around this.
    
    (closes issue #15392)
    Reported by: yrashk
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@229500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-11 19:51:46 +00:00
Tilghman Lesher
ecd6891241 Merged revisions 229361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r229361 | tilghman | 2009-11-10 16:14:22 -0600 (Tue, 10 Nov 2009) | 19 lines
  
  Merged revisions 229360 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229360 | tilghman | 2009-11-10 16:09:16 -0600 (Tue, 10 Nov 2009) | 12 lines
    
    If two pattern classes start with the same digit and have the same number of characters, they will compare equal.
    The example given in the issue report is that of [234] and [246], which have
    these characteristics, yet they are clearly not equivalent.  The code still
    uses these two characteristics, yet when the two scores compare equal, an
    additional check will be done to compare all characters within the class to
    verify equality.
    (closes issue #15421)
     Reported by: jsmith
     Patches: 
           20091109__issue15421__2.diff.txt uploaded by tilghman (license 14)
     Tested by: jsmith, thedavidfactor
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@229363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-10 22:17:17 +00:00
Tilghman Lesher
b8b4e92f99 Merged revisions 225360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r225360 | tilghman | 2009-10-22 12:11:23 -0500 (Thu, 22 Oct 2009) | 11 lines
  
  Merged revisions 225105 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r225105 | tilghman | 2009-10-21 11:02:12 -0500 (Wed, 21 Oct 2009) | 4 lines
    
    Fix documentation for ast_softhangup() and correct the misuse thereof.
    (closes issue #16103)
     Reported by: majorbloodnok
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@225361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 17:13:28 +00:00
Sean Bright
f3b41c917f Properly initialize ast_devstate_aggregate so we don't crash sporadically.
This looks like it was just missed during a merge.

(closes issue #15841)
Reported by: amorsen
Patches:
      ast_devstate_aggregate_init-in-ast_extension_state2.patch uploaded by amorsen (license 676)
Tested by: amorsen

(closes issue #15852)
Reported by: amorsen
Tested by: amorsen, farisraouf


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@222605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-07 18:35:02 +00:00
Tilghman Lesher
670aa3b5f0 Merged revisions 220289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220289 | tilghman | 2009-09-24 14:41:02 -0500 (Thu, 24 Sep 2009) | 13 lines
  
  Merged revisions 220288 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220288 | tilghman | 2009-09-24 14:39:41 -0500 (Thu, 24 Sep 2009) | 6 lines
    
    Implicitly sending a progress signal breaks some applications.
    Call Progress() in your dialplan if you explicitly want progress to be sent.
    (Reverts change 216430, closes issue #15957)
    Reported by: Pavel Troller on the Asterisk-Dev mailing list
    http://lists.digium.com/pipermail/asterisk-dev/2009-September/039897.html
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 19:42:25 +00:00
David Brooks
34431fe518 Merged revisions 218868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218868 | dbrooks | 2009-09-16 13:06:42 -0500 (Wed, 16 Sep 2009) | 20 lines
  
  Merged revisions 218867 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218867 | dbrooks | 2009-09-16 13:00:45 -0500 (Wed, 16 Sep 2009) | 13 lines
    
    Fixes CID pattern matching behavior to mirror that of extension pattern matching.
    
    Pattern matching for extensions uses a type of scoring system, giving values for
    specificity to each character in the pattern. Unfortunately, this is done character
    by character, in order. This does lead to some less specific patterns being first
    in line for matching, but it will usually get the job done.
    
    This patch merely brings CID matching to the same level as extension matching.
    This patch does not attempt to tackle the problem shared by extension matching.
    
    (closes issue #14708)
    Reported by: klaus3000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 18:11:13 +00:00
Olle Johansson
9ecf61f22c Merged revisions 216438 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r216438 | oej | 2009-09-04 16:02:34 +0200 (Fre, 04 Sep 2009) | 35 lines

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

........
r216430 | oej | 2009-09-04 15:45:48 +0200 (Fre, 04 Sep 2009) | 27 lines

Make apps send PROGRESS control frame for early media and fix too early media issue in SIP

The issue at hand is that some legacy (dying) PBX systems send empty media frames on PRI
links *before* any call progress. The SIP channel receives these frames and by default
signals 183 Session progress and starts sending media. This will cause phones to 
play silence and ignore the later 180 ringing message. A bad user experience.

The fix is twofold:
- We discovered that asterisk apps that support early media ("noanswer") did not send
  any PROGRESS frame to indicate early media. Fixed.
- We introduce a setting in chan_sip so that users can disable any relay of media frames
  before the outbound channel actually indicates any sort of call progress.
  In 1.4, 1.6.0 and 1.6.1, this will be disabled for backward compatibility. In later versions
  of Asterisk, this will be enabled. We don't assume that it will change your Asterisk
  phone experience - only for the better.

We encourage third-party application developers to make sure that if they have applications
that wants to send early media, add a PROGRESS control frame transmission to make sure that
all channel drivers actually will start sending early media. This has not been the default
in Asterisk previous to this patch, so if you got inspiration from our code, you need to
update accordingly. Sorry for the trouble and thanks for your support.

This code has been running for a few months in a large scale installation (over 250
servers with PRI and/or BRI links to old PBX systems). 
That's no proof that this is an excellent patch, but, well, it's tested :-)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@216645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-07 10:29:15 +00:00
Tilghman Lesher
d8c6c65d88 Merged revisions 216547 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r216547 | tilghman | 2009-09-04 12:31:44 -0500 (Fri, 04 Sep 2009) | 3 lines
  
  Enable turning off the application delimiter warning with the 'dontwarn' option.
  Suggested on the -dev list, and implemented in an alternate way by me.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@216548 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-04 17:32:55 +00:00
Tilghman Lesher
39e243e913 Merged revisions 213971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r213971 | tilghman | 2009-08-25 01:35:37 -0500 (Tue, 25 Aug 2009) | 14 lines
  
  Merged revisions 213970 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r213970 | tilghman | 2009-08-25 01:34:44 -0500 (Tue, 25 Aug 2009) | 7 lines
    
    Improve error message by informing user exactly which function is missing a parethesis.
    (closes issue #15242)
     Reported by: Nick_Lewis
     Patches: 
           pbx.c-funcparenthesis.patch2 uploaded by dbrooks (license 790)
           pbx.c-funcparenthesis-1.4.diff uploaded by loloski (license 68)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@213972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-08-25 06:36:40 +00:00
Tilghman Lesher
2662264c44 AST-2009-005
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@211551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-08-10 19:25:03 +00:00
David Vossel
308c62cf59 Merged revisions 205412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r205412 | dvossel | 2009-07-08 17:15:06 -0500 (Wed, 08 Jul 2009) | 12 lines
  
  Merged revisions 205409 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r205409 | dvossel | 2009-07-08 16:35:12 -0500 (Wed, 08 Jul 2009) | 6 lines
    
    moving ast_devstate_to_extenstate to pbx.c from devicestate.c
    
    ast_devstate_to_extenstate belongs in pbx.c.  This change
    fixes a compile time error with chan_vpb as well.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@205415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-08 22:17:08 +00:00
David Vossel
d7306096a8 Merged revisions 204710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r204710 | dvossel | 2009-07-02 11:03:44 -0500 (Thu, 02 Jul 2009) | 21 lines
  
  Merged revisions 204681 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r204681 | dvossel | 2009-07-02 10:05:57 -0500 (Thu, 02 Jul 2009) | 14 lines
    
    Improved mapping of extension states from combined device states.
    
    This fixes a few issues with incorrect extension states and adds
    a cli command, core show device2extenstate, to display all possible
    state mappings.
    
    (closes issue #15413)
    Reported by: legart
    Patches:
          exten_helper.diff uploaded by dvossel (license 671)
    Tested by: dvossel, legart, amilcar
    
    Review: https://reviewboard.asterisk.org/r/301/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@204754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-02 18:07:35 +00:00
David Brooks
3516eaa7e0 Fixes the argument order in definition of new_find_extension().
In the definition of new_find_extension(), the arguments 'callerid' and
'label' were swapped. The prototype declaration and all calls to the
function are ordered 'callerid' then 'label', but the function itself
was ordered 'label' then 'callerid'.

(closes issue #15303)
Reported by: JimDickenson


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-10 20:29:52 +00:00
David Vossel
8e3df8bd1f Merged revisions 199298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199298 | dvossel | 2009-06-05 16:21:22 -0500 (Fri, 05 Jun 2009) | 21 lines
  
  Merged revisions 199297 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199297 | dvossel | 2009-06-05 16:19:56 -0500 (Fri, 05 Jun 2009) | 14 lines
    
    Fixes issue with hints giving unexpected results.
    
    Hints with two or more devices that include ONHOLD gave unexpected results.
    
    (closes issue #15057)
    Reported by: p_lindheimer
    Patches:
          onhold_trunk.diff uploaded by dvossel (license 671)
          pbx.c.1.4.patch uploaded by p (license 558)
          devicestate.c.trunk.patch uploaded by p (license 671)
    Tested by: p_lindheimer, dvossel
    
    Review: https://reviewboard.asterisk.org/r/254/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-05 21:37:01 +00:00
Eliel C. Sardanons
8bba1f73ce Merged revisions 195162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r195162 | eliel | 2009-05-18 10:45:23 -0400 (Mon, 18 May 2009) | 9 lines
  
  Warn about the use of the application WaitExten() within a Macro().
  
  Update applications documentation to warn the user about the use of the
  WaitExten() application within a Macro(). Recommend the use of Read()
  instead.
  
  (closes issue #14444)
  Reported by: ewieling
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@195177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-18 15:19:27 +00:00
Tilghman Lesher
b306d2e1ab Merged revisions 194138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r194138 | tilghman | 2009-05-12 19:52:49 -0500 (Tue, 12 May 2009) | 14 lines
  
  Merged revisions 194137 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r194137 | tilghman | 2009-05-12 19:52:03 -0500 (Tue, 12 May 2009) | 7 lines
    
    Fix logic for how to proceed with a single digit extension.
    (closes issue #15091)
     Reported by: andrew
     Patches: 
           20090512__issue15091.diff.txt uploaded by tilghman (license 14)
     Tested by: andrew
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@194139 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-13 00:54:07 +00:00
Tilghman Lesher
46cb79f430 Merged revisions 193120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r193120 | tilghman | 2009-05-07 18:42:28 -0500 (Thu, 07 May 2009) | 26 lines
  
  Merged revisions 193119 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193119 | tilghman | 2009-05-07 18:41:11 -0500 (Thu, 07 May 2009) | 19 lines
    
    Fix Background within a Macro for FreePBX.
    If the single digit DTMF is an extension in the specified context, then
    go there and signal no DTMF.  Otherwise, we should exit with that DTMF.
    If we're in Macro, we'll exit and seek that DTMF as the beginning of an
    extension in the Macro's calling context.  If we're not in Macro, then
    we'll simply seek that extension in the calling context.  Previously,
    someone complained about the behavior as it related to the interior of a
    Gosub routine, and the fix (#14011) inadvertently broke FreePBX
    (#14940).  This change should fix both of these situations, but with the
    possible incompatibility that if a single digit extension does not exist
    (but a longer extension COULD have matched), it would have previously
    gone immediately to the "i" extension, but will now need to wait for a
    timeout.
    (closes issue #14940)
     Reported by: p_lindheimer
     Patches: 
           20090420__bug14940.diff.txt uploaded by tilghman (license 14)
     Tested by: p_lindheimer
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@193121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-07 23:43:23 +00:00
Tilghman Lesher
960bc63346 Merged revisions 190726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r190726 | tilghman | 2009-04-27 14:34:48 -0500 (Mon, 27 Apr 2009) | 4 lines
  
  Don't warn on pipe in the System call.
  (closes issue #14979)
   Reported by: pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-27 19:36:05 +00:00
Tilghman Lesher
8efbe92b1f Merged revisions 190352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r190352 | tilghman | 2009-04-23 15:42:11 -0500 (Thu, 23 Apr 2009) | 7 lines
  
  Labels are sometimes (most of the time?) NULL for extensions.
  (closes issue #14895)
   Reported by: chris-mac
   Patches: 
         20090423__bug14895__2.diff.txt uploaded by tilghman (license 14)
   Tested by: lmadsen
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-23 20:42:58 +00:00
Matthew Nicholson
73426fbc34 Merged revisions 189010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189010 | mnicholson | 2009-04-17 10:44:18 -0500 (Fri, 17 Apr 2009) | 12 lines
  
  Merged revisions 189009 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189009 | mnicholson | 2009-04-17 10:43:09 -0500 (Fri, 17 Apr 2009) | 5 lines
    
    Make Busy() application set the CDR disposition to BUSY.
    
    (closes issue #14306)
    Reported by: cristiandimache
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@189070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-17 17:33:36 +00:00
Tilghman Lesher
b7c591df10 Merged revisions 188210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188210 | tilghman | 2009-04-14 00:45:13 -0500 (Tue, 14 Apr 2009) | 2 lines
  
  As suggested by Russell, warn users when their dialplan arguments contain pipes, but not commas.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-14 05:45:55 +00:00
Tilghman Lesher
d6c817f2f1 Merged revisions 177787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r177787 | tilghman | 2009-02-20 17:02:35 -0600 (Fri, 20 Feb 2009) | 16 lines
  
  Merged revisions 177786 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r177786 | tilghman | 2009-02-20 16:59:52 -0600 (Fri, 20 Feb 2009) | 9 lines
    
    Don't print the CR-NL combination when we aren't outputting to the manager.
    
    An embedded CR-NL in a CLI command screws up several AMI parsers that don't
    expect to see that combination in the middle of output.
    
    (Closes issue #14305)
    Reported by: martins
    Patch by: tilghman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-20 23:04:33 +00:00
Steve Murphy
babd94b38e Merged revisions 176943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r176943 | murf | 2009-02-18 08:35:26 -0700 (Wed, 18 Feb 2009) | 45 lines


This patch fixes merge_contexts_and_delete so it does not deadlock when hints are present.

Reason: when I re-engineered the merge_and_delete func to
reduce its lock time, I failed to notice that the 
functions it calls still also do locking as before.
This leads to deadlocks on dialplan reloads, when
there are actually living, subscribed hints registered
in the system.

While the reporter come across this problem while using
AEL, I might note that these deadlocks should also happen
if extensions.conf were used.

Here I added these routines to pbx.c:

ast_add_extension_nolock
add_pri_lockopt
ast_add_extension2_lockopt
find_context
add_hint_nolock

All of the above routines are static and restricted
to be used only within pbx.c, and more specifically
within the merge_contexts_and_delete routine.

They are pretty much the same as their counterparts
except they don't lock contexts or hints.

Most of them now do the real work of their
name-alike, with optional locking via extra arguments,
and are called by their name-alike. The goal was to
have the original functions so they would behave
exactly as before.

Both PJ and I tested these fixes, and the deadlocking
problem is no longer encountered.

(closes issue #14357)
Reported by: pj
Patches:
      14357.diff uploaded by murf (license 17)
Tested by: pj, murf


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@176944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-18 15:49:10 +00:00
Mark Michelson
a45ec0c30a Merged revisions 174945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174945 | mmichelson | 2009-02-11 16:41:01 -0600 (Wed, 11 Feb 2009) | 29 lines
  
  Fix 'd' option for app_dial and add new option to Answer application
  
  The 'd' option would not work for channel types which use RTP to transport
  DTMF digits. The only way to allow for this to work was to answer the channel
  if we saw that this option was enabled.
  
  I realized that this may cause issues with CDRs, specifically with giving false
  dispositions and answer times. I therefore modified ast_answer to take another
  parameter which would tell if the CDR should be marked answered.
  
  I also extended this to the Answer application so that the channel may be answered
  but not CDRified if desired.
  
  I also modified app_dictate and app_waitforsilence to only answer the channel if it
  is not already up, to help not allow for faulty CDR answer times.
  
  All of these changes are going into Asterisk trunk. For 1.6.0 and 1.6.1, however, all
  the changes except for the change to the Answer application will go in since we do
  not introduce new features into stable branches
  
  (closes issue #14164)
  Reported by: DennisD
  Patches:
        14164.patch uploaded by putnopvut (license 60)
  Tested by: putnopvut
  
  Review: http://reviewboard.digium.com/r/145
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@174946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-11 22:48:11 +00:00
Tilghman Lesher
3d71c38287 Merged revisions 173311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173311 | tilghman | 2009-02-03 18:43:52 -0600 (Tue, 03 Feb 2009) | 10 lines
  
  Ensure that commas placed in the middle of extension character classes do not
  interfere with correct parsing of the extension.  Also, if an unterminated
  character class DOES make its way into the pbx core (through some other
  method), ensure that it does not crash Asterisk.
  (closes issue #14362)
   Reported by: Nick_Lewis
   Patches: 
         20090129__bug14362.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@173312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 00:45:32 +00:00
Steve Murphy
491c4a9c68 Merged revisions 172063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r172063 | murf | 2009-01-28 13:31:06 -0700 (Wed, 28 Jan 2009) | 52 lines
  
  Merged revisions 172030 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r172030 | murf | 2009-01-28 11:51:16 -0700 (Wed, 28 Jan 2009) | 46 lines
    
    This patch fixes h-exten running misbehavior in manager-redirected 
    situations.
    
    What it does:
    1. A new Flag value is defined in include/asterisk/channel.h,
     AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
     bridge hangup exten code not to run the h-exten there (nor
     publish the bridge cdr there). It will done at the pbx-loop
     level instead.
    2. In the manager Redirect code, I set this flag on the channel
     if the channel has a non-null pbx pointer. I did the same for the
     second (chan2) channel, which gets run if name2 is set...
     and the first succeeds.
    3. I restored the ending of the cdr for the pbx loop h-exten
     running code. Don't know why it was removed in the first place.
    4. The first attempt at the fix for this bug was to place code
       directly in the async_goto routine, which was called from a
       large number of places, and could affect a large number of
       cases, so I tested that fix against a fair number of transfer
       scenarios, both with and without the patch. In the process,
       I saw that putting the fix in async_goto seemed not to affect
       any of the blind or attended scenarios, but still, I was
       was highly concerned that some other scenarios I had not tested
       might be negatively impacted, so I refined the patch to 
       its current scope, and jmls tested both. In the process, tho,
       I saw that blind xfers in one situation, when the one-touch
       blind-xfer feature is used by the peer, we got strange 
       h-exten behavior.  So, I  inserted code to swap CDRs and
       to set the HANGUP_DONT field, to get uniform behavior.
    5. I added code to the bridge to obey the HANGUP_DONT flag,
       skipping both publishing the bridge CDR, and running
       the h-exten; they will be done at the pbx-loop (higher)
       level instead.
    6. I removed all the debug logs from the patch before committing.
    7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
       so it's only done if the h-exten is going to be run. A very
       minor performance improvement, but technically correct.
    
    
    (closes issue #14241)
    Reported by: jmls
    Patches:
          14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
    Tested by: murf, jmls
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@172065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 20:41:45 +00:00
Joshua Colp
1f843fc79d Merged revisions 170051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170051 | file | 2009-01-22 11:14:50 -0400 (Thu, 22 Jan 2009) | 13 lines
  
  Merged revisions 170050 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170050 | file | 2009-01-22 11:13:56 -0400 (Thu, 22 Jan 2009) | 6 lines
    
    Do a string comparison instead of pointer comparison since some people specify the context they are actually in as an argument to get around some funkiness.
    (closes issue #14011)
    Reported by: dveiga
    Patches:
          pbx.c.patch uploaded by dveiga (license 665)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@170052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 15:15:35 +00:00
Joshua Colp
dbf61acd1f Merged revisions 169869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r169869 | file | 2009-01-21 19:25:27 -0400 (Wed, 21 Jan 2009) | 11 lines
  
  Merged revisions 169867 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r169867 | file | 2009-01-21 19:20:47 -0400 (Wed, 21 Jan 2009) | 4 lines
    
    Read lock the contexts to maintain the locking order when we are notified that the state of a device has changed.
    (closes issue #13839)
    Reported by: mcallist
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 23:27:19 +00:00
Russell Bryant
1b1c2db6bd Merged revisions 168562 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines

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

........
r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines

Revert unnecessary indications API change from rev 122314

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 19:27:54 +00:00
Steve Murphy
5d34e0df03 Merged revisions 166665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

Due to non-symmetrical updating, I had some fairly
interesting conflicts to straighten out in this
release. The changes were such that I was compelled
to run thru all the same tests as trunk, which turned
up some problems, which I fixed. 

................
  r166665 | murf | 2008-12-23 11:13:49 -0700 (Tue, 23 Dec 2008) | 153 lines
  
  Merged revisions 166093 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  In order to merge this 1.4 patch into trunk,
  I had to resolve some conflicts and wait for
  Russell to make some changes to res_agi.
  I re-ran all the tests; 39 calls in all, and
  made fairly careful notes and comparisons: I
  don't want this to blow up some aspect of 
  asterisk; I completely removed the KEEPALIVE
  from the pbx.h decls. The first 3 scenarios
  involving feature park; feature xfer to 700;
  hookflash park to Park() app call all behave
  the same, don't appear to leave hung channels,
  and no crashes.
  
  ........
    r166093 | murf | 2008-12-19 15:30:32 -0700 (Fri, 19 Dec 2008) | 131 lines
    
    This merges the masqpark branch into 1.4
    
    These changes eliminate the need for (and use of)
    the KEEPALIVE return code in res_features.c;
    There are other places that use this result code
    for similar purposes at a higher level, these appear
    to be left alone in 1.4, but attacked in trunk.
    
    The reason these changes are being made in 1.4, is
    that parking ends a channel's life, in some situations,
    and the code in the bridge (and some other places),
    was not checking the result code properly, and dereferencing
    the channel pointer, which could lead to memory corruption
    and crashes.
    
    Calling the masq_park function eliminates this danger 
    in higher levels.
    
    A series of previous commits have replaced some parking calls
    with masq_park, but this patch puts them ALL to rest,
    (except one, purposely left alone because a masquerade
    is done anyway), and gets rid of the code that tests
    the KEEPALIVE result, and the NOHANGUP_PEER result codes.
    
    While bug 13820 inspired this work, this patch does
    not solve all the problems mentioned there.
    
    I have tested this patch (again) to make sure I have
    not introduced regressions. 
    
    Crashes that occurred when a parked party hung up
    while the parking party was listening to the numbers
    of the parking stall being assigned, is eliminated.
    
    These are the cases where parking code may be activated:
    
    1. Feature one touch (eg. *3)
    2. Feature blind xfer to parking lot (eg ##700)
    3. Run Park() app from dialplan (eg sip xfer to 700)
       (eg. dahdi hookflash xfer to 700)
    4. Run Park via manager.
    
    The interesting testing cases for parking are:
    I. A calls B, A parks B
        a. B hangs up while A is getting the numbers announced.
        b. B hangs up after A gets the announcement, but 
           before the parking time expires
        c. B waits, time expires, A is redialed,
           A answers, B and A are connected, after
           which, B hangs up.
        d. C picks up B while still in parking lot.
    
    II. A calls B, B parks A
        a. A hangs up while B is getting the numbers announced.
        b. A hangs up after B gets the announcement, but 
           before the parking time expires
        c. A waits, time expires, B is redialed,
           B answers, A and B are connected, after
           which, A hangs up.
        d. C picks up A while still in parking lot.
    
    Testing this throroughly involves acting all the permutations
    of I and II, in situations 1,2,3, and 4.
    
    Since I added a few more changes (ALL references to KEEPALIVE in the bridge
    code eliimated (I missed one earlier), I retested
    most of the above cases, and no crashes.
    
    H-extension weirdness.
    
    Current h-extension execution is not completely
    correct for several of the cases.
    
    For the case where A calls B, and A parks B, the
    'h' exten is run on A's channel as soon as the park
    is accomplished. This is expected behavior.
    
    But when A calls B, and B parks A, this will be
    current behavior:
    
    After B parks A, B is hung up by the system, and
    the 'h' (hangup) exten gets run, but the channel
    mentioned will be a derivative of A's...
    
    Thus, if A is DAHDI/1, and B is DAHDI/2,
    the h-extension will be run on channel
    Parked/DAHDI/1-1<ZOMBIE>, and the 
    start/answer/end info will be those 
    relating to Channel A.
    
    And, in the case where A is reconnected to
    B after the park time expires, when both parties
    hang up after the joyful reunion, no h-exten
    will be run at all.
    
    In the case where C picks up A from the 
    parking lot, when either A or C hang up,
    the h-exten will be run for the C channel.
    
    CDR's are a separate issue, and not addressed
    here.
    
    As to WHY this strange behavior occurs, 
    the answer lies in the procedure followed
    to accomplish handing over the channel
    to the parking manager thread. This procedure
    is called masquerading. In the process,
    a duplicate copy of the channel is created,
    and most of the active data is given to the
    new copy. The original channel gets its name
    changed to XXX<ZOMBIE> and keeps the PBX
    information for the sake of the original
    thread (preserving its role as a call 
    originator, if it had this role to begin
    with), while the new channel is without
    this info and becomes a call target (a
    "peer").
    
    In this case, the parking lot manager
    thread is handed the new (masqueraded)
    channel. It will not run an h-exten
    on the channel if it hangs up while
    in the parking lot. The h exten will
    be run on the original channel instead,
    in the original thread, after the bridge
    completes.
    
    See bug 13820 for our intentions as
    to how to clean up the h exten behavior.
  
  Review: http://reviewboard.digium.com/r/29/
  
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-24 00:52:12 +00:00
Russell Bryant
ca1c37e47c Merged revisions 165723 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r165723 | russell | 2008-12-18 13:33:42 -0600 (Thu, 18 Dec 2008) | 14 lines

Remove the need for AST_PBX_KEEPALIVE with the GoSub option from Dial.

This is part of an effort to completely remove AST_PBX_KEEPALIVE and other
similar return codes from the source.  While this usage was perfectly safe,
there are others that are problematic.  Since we know ahead of time that
we do not want to PBX to destroy the channel, the PBX API has been changed
so that information can be provided as an argument, instead, thus removing
the need for the KEEPALIVE return value.

Further changes to get rid of KEEPALIVE and related code is being done by
murf.  There is a patch up for that on review 29.

Review: http://reviewboard.digium.com/r/98/

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 19:40:14 +00:00
Steve Murphy
cd1587ae99 Merged revisions 164801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r164801 | murf | 2008-12-16 13:04:46 -0700 (Tue, 16 Dec 2008) | 36 lines

(closes issue #14076)
Reported by: toc
Tested by: murf

OK, Well this issue has had its share of flip-flopping.
I found the following:

1. the code in question, in ext_cmp1 in pbx.c, would not
allow two extensions that vary only by any dashes contained
within them, to be defined in the same context.

2. for input dialstrings, dashes are NOT ignored.
So, skipping them when sorting patterns seemed a bit silly.
Thus, you might declare ext 891 in a context, but
if you try dialing 8-9-1, it will NOT match 891.

So, I proposed to remove the code from ext_cmp1 to 
skip the spaces and dashes. Just kept us from 
declaring 891 and 8-9-1 in the same context,
forcing users to generate otherwise uselessly
obfuscated dialplan code to get the same effect.

Then, I tried out 1.4, and found that:

1. you can declare 891 and 8-9-1 in the
same context!

2. You can't define 891, and have 8-9-1 match
it! Nor can you define 8-9-1, and have 891
match it!

So, it appears that my proposal simply restores
the pbx to behaving as it did in 1.4.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@164803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-16 20:08:39 +00:00
Steve Murphy
218d7cebb1 Merged revisions 164648 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r164648 | murf | 2008-12-16 08:31:54 -0700 (Tue, 16 Dec 2008) | 13 lines

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

........
r164634 | murf | 2008-12-16 08:15:58 -0700 (Tue, 16 Dec 2008) | 5 lines

I added a sentence to clarify why - and ' ' are ignored in patterns
as per bug 14076. Leif says he'll put some stuff about it in the
extensions.conf sample, etc.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@164654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-16 15:37:46 +00:00
Mark Michelson
fa979f0828 Merged revisions 162266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r162266 | mmichelson | 2008-12-09 14:30:07 -0600 (Tue, 09 Dec 2008) | 14 lines

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

........
r162265 | mmichelson | 2008-12-09 14:28:44 -0600 (Tue, 09 Dec 2008) | 6 lines

If we fail to start a thread for the pbx to run in, we need to
be sure to decrease the number of active calls on the system.

This fix may relate to ABE-1713, but it is not certain yet.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@162268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 20:31:21 +00:00
Russell Bryant
39742e18c6 Merged revisions 161288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r161288 | russell | 2008-12-05 08:16:24 -0600 (Fri, 05 Dec 2008) | 10 lines

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

........
r161287 | russell | 2008-12-05 08:12:14 -0600 (Fri, 05 Dec 2008) | 2 lines

Fix a NULL format string warning found by buildbot.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@161289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 14:17:50 +00:00
Tilghman Lesher
107dfe787e Merged revisions 152969,153122,154264,154268,154366,155399,155863,156166,156295,156690,156756,158066,158082,158540,158602,159276 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152969 | tilghman | 2008-10-30 15:35:46 -0500 (Thu, 30 Oct 2008) | 10 lines
  
  Merged revisions 152958 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152958 | tilghman | 2008-10-30 15:33:28 -0500 (Thu, 30 Oct 2008) | 3 lines
    
    Cannot join detached threads.  See http://www.opengroup.org/onlinepubs/000095399/functions/pthread_join.html
    (Closes issue #13400)
  ........
................
  r153122 | tilghman | 2008-10-31 11:35:21 -0500 (Fri, 31 Oct 2008) | 10 lines
  
  Merged revisions 153114 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r153114 | tilghman | 2008-10-31 11:30:32 -0500 (Fri, 31 Oct 2008) | 3 lines
    
    Turn off qualify on uncached realtime peers.
    (Closes issue #13383)
  ........
................
  r154264 | tilghman | 2008-11-04 12:59:48 -0600 (Tue, 04 Nov 2008) | 10 lines
  
  Recorded merge of revisions 154263 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154263 | tilghman | 2008-11-04 12:58:05 -0600 (Tue, 04 Nov 2008) | 3 lines
    
    Make the monitor thread non-detached, so it can be joined (suggested by Russell
    on -dev list).
  ........
................
  r154268 | rmudgett | 2008-11-04 13:07:26 -0600 (Tue, 04 Nov 2008) | 11 lines
  
  Merged revisions 154266 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154266 | rmudgett | 2008-11-04 13:01:08 -0600 (Tue, 04 Nov 2008) | 4 lines
    
    JIRA ABE-1703
    mISDN sets the channel to the wrong state when it receives
    the indication AST_CONTROL_RINGING.
  ........
................
  r154366 | tilghman | 2008-11-04 14:51:18 -0600 (Tue, 04 Nov 2008) | 16 lines
  
  Merged revisions 154365 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154365 | tilghman | 2008-11-04 14:49:33 -0600 (Tue, 04 Nov 2008) | 9 lines
    
    On busy systems, it's possible for the values checked within a single line
    of code to change, unless the structure is locked to ensure a consistent
    state.
    (closes issue #13717)
     Reported by: kowalma
     Patches: 
           20081102__bug13717.diff.txt uploaded by Corydon76 (license 14)
     Tested by: kowalma
  ........
................
  r155399 | tilghman | 2008-11-07 16:28:58 -0600 (Fri, 07 Nov 2008) | 14 lines
  
  Merged revisions 155398 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r155398 | tilghman | 2008-11-07 16:27:32 -0600 (Fri, 07 Nov 2008) | 7 lines
    
    Clarify error message.
    (closes issue #13809)
     Reported by: denke
     Patches: 
           20081104__bug13809.diff.txt uploaded by Corydon76 (license 14)
     Tested by: denke
  ........
................
  r155863 | mmichelson | 2008-11-10 15:14:44 -0600 (Mon, 10 Nov 2008) | 22 lines
  
  Merged revisions 155861 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r155861 | mmichelson | 2008-11-10 15:07:39 -0600 (Mon, 10 Nov 2008) | 14 lines
  
  Channel drivers assume that when their indicate callback
  is invoked, that the channel on which the callback was called
  is locked. This patch corrects an instance in chan_agent where
  a channel's indicate callback is called directly without first
  locking the channel.
  
  This was leading to some observed locking issues in chan_local,
  but considering that all channel drivers operate under the
  same expectations, the generic fix in chan_agent is the right
  way to go.
  
  AST-126
  
  
  ........
................
  r156166 | russell | 2008-11-12 11:38:20 -0600 (Wed, 12 Nov 2008) | 15 lines
  
  Merged revisions 156164 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r156164 | russell | 2008-11-12 11:29:52 -0600 (Wed, 12 Nov 2008) | 7 lines
  
  Move the sanity check that makes sure "always fork" is not set along with the 
  console option to be after the code that reads options from asterisk.conf.  
  This resolves a situation where Asterisk can start taking up 100% when
  misconfigured.
  (Thanks to Bryce Porter (x86 on IRC) for letting me log in to his system to
   figure out what was causing the 100% CPU problem.)
  
  ........
................
  r156295 | tilghman | 2008-11-12 13:28:22 -0600 (Wed, 12 Nov 2008) | 13 lines
  
  Merged revisions 156294 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156294 | tilghman | 2008-11-12 13:26:45 -0600 (Wed, 12 Nov 2008) | 6 lines
    
    If the SLA thread is not started, then reload causes a memory leak.
    (closes issue #13889)
     Reported by: eliel
     Patches: 
           app_meetme.c.patch uploaded by eliel (license 64)
  ........
................
  r156690 | tilghman | 2008-11-13 15:30:41 -0600 (Thu, 13 Nov 2008) | 14 lines
  
  Merged revisions 156688 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156688 | tilghman | 2008-11-13 15:24:00 -0600 (Thu, 13 Nov 2008) | 7 lines
    
    Provide more space for all the data which can appear in an originating
    channel name.
    (closes issue #13398)
     Reported by: bamby
     Patches: 
           manager.c.diff uploaded by bamby (license 430)
  ........
................
  r156756 | tilghman | 2008-11-13 18:43:13 -0600 (Thu, 13 Nov 2008) | 13 lines
  
  Merged revisions 156755 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156755 | tilghman | 2008-11-13 18:41:37 -0600 (Thu, 13 Nov 2008) | 6 lines
    
    ast_waitfordigit() requires that the channel be up, for no good logical
    reason.  This prevents While/EndWhile from working within the "h"
    extension.
    Reported by: jgalarneau (for ABE C.2)
    Fixed by: me
  ........
................
  r158066 | mmichelson | 2008-11-20 11:39:06 -0600 (Thu, 20 Nov 2008) | 20 lines
  
  Merged revisions 158053 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r158053 | mmichelson | 2008-11-20 11:33:06 -0600 (Thu, 20 Nov 2008) | 12 lines
  
  Make sure to set the hangup cause on the calling channel in the case
  that ast_call() fails. For incoming SIP channels, this was causing
  us to send a 603 instead of a 486 when the call-limit was reached on
  the destination channel.
  
  (closes issue #13867)
  Reported by: still_nsk
  Patches:
        13867.diff uploaded by putnopvut (license 60)
  Tested by: blitzrage
  
  
  ........
................
  r158082 | mmichelson | 2008-11-20 11:54:31 -0600 (Thu, 20 Nov 2008) | 24 lines
  
  Merged revisions 158071 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r158071 | mmichelson | 2008-11-20 11:48:42 -0600 (Thu, 20 Nov 2008) | 16 lines
  
  We don't handle 4XX responses to BYE well. According to
  section 15 of RFC 3261, we should terminate a dialog if we
  receive a 481 or 408 in response to our BYE. Since I am aware
  of at least one phone manufacturer who may sometimes send a 
  404 as well, I am being liberal and saying that any 4XX response
  to a BYE should result in a terminated dialog.
  
  
  (closes issue #12994)
  Reported by: pabelanger
  Patches:
        12994.patch uploaded by putnopvut (license 60)
  
  Closes AST-129
  
  
  ........
................
  r158540 | russell | 2008-11-21 16:12:37 -0600 (Fri, 21 Nov 2008) | 10 lines
  
  Merged revisions 158539 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r158539 | russell | 2008-11-21 16:05:55 -0600 (Fri, 21 Nov 2008) | 2 lines
  
  When compiling with DEBUG_THREADS, report the real file/func/line for ao2_lock/ao2_unlock
  
  ........
................
  r158602 | tilghman | 2008-11-21 17:14:11 -0600 (Fri, 21 Nov 2008) | 12 lines
  
  Merged revisions 158600 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r158600 | tilghman | 2008-11-21 17:07:46 -0600 (Fri, 21 Nov 2008) | 5 lines
    
    The passed extension may not be the same in the list as the current entry,
    because we strip spaces when copying the extension into the structure.
    Therefore, use the copied item to place the item into the list.
    (found by lmadsen on -dev, fixed by me)
  ........
................
  r159276 | tilghman | 2008-11-25 15:57:59 -0600 (Tue, 25 Nov 2008) | 14 lines
  
  Merged revisions 159269 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159269 | tilghman | 2008-11-25 15:56:48 -0600 (Tue, 25 Nov 2008) | 7 lines
    
    Don't try to send a response on a NULL pvt.
    (closes issue #13919)
     Reported by: barthpbx
     Patches: 
           chan_iax2.c.patch uploaded by eliel (license 64)
     Tested by: barthpbx
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160389 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 22:56:36 +00:00
Tilghman Lesher
0a9c41ca89 Merged revisions 160208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160208 | tilghman | 2008-12-01 18:37:21 -0600 (Mon, 01 Dec 2008) | 10 lines
  
  Merged revisions 160207 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160207 | tilghman | 2008-12-01 18:25:16 -0600 (Mon, 01 Dec 2008) | 3 lines
    
    Ensure that Asterisk builds with --enable-dev-mode, even on the latest gcc
    and glibc.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 00:57:31 +00:00
Steve Murphy
6db3b2ff26 Merged revisions 156299 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156299 | murf | 2008-11-12 12:47:29 -0700 (Wed, 12 Nov 2008) | 26 lines

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

........
r156297 | murf | 2008-11-12 12:36:16 -0700 (Wed, 12 Nov 2008) | 18 lines

It turns out that the 0x0XX00 codes being returned for
N, X, and Z are off by one, as per conversation with
jsmith on #asterisk-dev;  he was teaching a class
and disconcerted that this published rule was not
being followed, with patterns _NXX, _[1-8]22 and
_[2-9]22... and NXX was winning, but [1-8] should
have been. 

This change, tested on these 3 patterns now 
picks the proper one.

However, this change may surprise users who
set up dialplans based on previous behavior,
which has been there for what, 2 and half 
years or so now.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 19:56:34 +00:00
Steve Murphy
062d3041fe Merged revisions 147807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r147807 | murf | 2008-10-09 08:17:33 -0600 (Thu, 09 Oct 2008) | 15 lines

(closes issue #13557)
Reported by: nickpeirson
Patches:
      pbx.c.patch uploaded by nickpeirson (license 579)
      replace_bzero+bcopy.patch uploaded by nickpeirson (license 579)
Tested by: nickpeirson, murf

1. replaced all refs to bzero and bcopy to memset and memmove instead.
2. added a note to the CODING-GUIDELINES
3. add two macros to asterisk.h to prevent bzero, bcopy from creeping
   back into the source
4. removed bzero from configure, configure.ac, autoconfig.h.in



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@147809 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-09 14:56:51 +00:00