Commit Graph

16573 Commits

Author SHA1 Message Date
Terry Wilson
cee2699a5d Merged revisions 168594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168594 | twilson | 2009-01-13 20:00:40 -0600 (Tue, 13 Jan 2009) | 27 lines
  
  Merged revisions 168593 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168593 | twilson | 2009-01-13 19:27:18 -0600 (Tue, 13 Jan 2009) | 20 lines
    
    Don't overflow when paging more than 128 extensions
    
    The number of available slots for calls in app_page was hardcoded to 128.
    Proper bounds checking was not in place to enforce this limit, so if more than
    128 extensions were passed to the Page() app, Asterisk would crash.  This patch
    instead dynamically allocates memory for the ast_dial structures and removes
    the (non-functional) arbitrary limit.
    
    This issue would have special importance to anyone who is dynamically creating
    the argument passed to the Page application and allowing more than 128
    extensions to be added by an outside user via some external interface.
    
    The patch posted by a_villacis was slightly modified for some coding guidelines
    and other cleanups.  Thanks, a_villacis!
    (closes issue #14217)
    Reported by: a_villacis
    Patches: 
          20080912-asterisk-app_page-fix-buffer-overflow.patch uploaded by a (license 660)
    Tested by: otherwiseguy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 02:06:19 +00:00
Terry Wilson
a33a19b699 Merged revisions 168588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168588 | twilson | 2009-01-13 17:05:43 -0600 (Tue, 13 Jan 2009) | 5 lines
  
  Fully overwrite a same-named file when uploading
  
  (closes issue #14190)
  Reported by: timking
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 23:11:19 +00:00
Terry Wilson
5c805d776b Blocked revisions 168585 via svnmerge
........
  r168585 | twilson | 2009-01-13 17:00:27 -0600 (Tue, 13 Jan 2009) | 8 lines
  
  Add option to hide console connect messages
  
  (closes issue #14222)
  Reported by: jamesgolovich
  Patches: 
        asterisk-hideconnect.diff.txt uploaded by jamesgolovich (license 176)
  Tested by: otherwiseguy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 23:01:25 +00:00
Terry Wilson
00647c1f8f Merged revisions 168578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168578 | twilson | 2009-01-13 16:22:34 -0600 (Tue, 13 Jan 2009) | 14 lines
  
  Merged revisions 168551 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168551 | twilson | 2009-01-13 12:34:14 -0600 (Tue, 13 Jan 2009) | 7 lines
    
    Don't pass a value with a side effect to a macro
    
    (closes issue #14176)
    Reported by: paraeco
    Patches: 
          chan_sip.c.diff uploaded by paraeco (license 658)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 22:31:20 +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
Tilghman Lesher
931ee5d3cb Merged revisions 168547 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168547 | tilghman | 2009-01-13 11:51:12 -0600 (Tue, 13 Jan 2009) | 13 lines
  
  Merged revisions 168546 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168546 | tilghman | 2009-01-13 11:48:00 -0600 (Tue, 13 Jan 2009) | 6 lines
    
    If either conditional is NULL, don't try copying it.
    (closes issue #14226)
     Reported by: caspy
     Patches: 
           20090113__bug14226.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168548 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 17:51:58 +00:00
Dwayne M. Hubbard
2a361e4b33 Blocked revisions 168539 via svnmerge
........
r168539 | dhubbard | 2009-01-13 10:02:13 -0600 (Tue, 13 Jan 2009) | 1 line

correct a CLI description
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-13 16:07:48 +00:00
Tilghman Lesher
a4fd6ae437 Merged revisions 168526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168526 | tilghman | 2009-01-12 17:45:51 -0600 (Mon, 12 Jan 2009) | 12 lines
  
  Merged revisions 167095 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r167095 | tilghman | 2008-12-31 18:01:22 -0600 (Wed, 31 Dec 2008) | 5 lines
    
    Repeat attempts to write when we receive -EAGAIN from the driver, as detailed
    in the ALSA sample code (see http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2pcm_8c-example.html#a32)
    Reported by: Jerry Geis (via the -users list)
    Fixed by: me (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 23:46:55 +00:00
Jeff Peeler
d1e7ac2285 Merged revisions 168517 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168517 | jpeeler | 2009-01-12 15:51:46 -0600 (Mon, 12 Jan 2009) | 12 lines
  
  Merged revisions 168516 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168516 | jpeeler | 2009-01-12 15:42:34 -0600 (Mon, 12 Jan 2009) | 5 lines
    
    (closes issue #13881)
    Reported by: hoowa
    
    Update the app CDR field for AGI commands that are not executing an application via "exec".
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 21:52:32 +00:00
Jeff Peeler
e8b5385c7e Merged revisions 168508 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168508 | jpeeler | 2009-01-12 14:53:04 -0600 (Mon, 12 Jan 2009) | 15 lines
  
  Merged revisions 168507 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168507 | jpeeler | 2009-01-12 14:26:22 -0600 (Mon, 12 Jan 2009) | 9 lines
    
    (closes issue #12269)
    Reported by: IgorG
    Tested by: denisgalvao
    
    This gits rid of the notion of an owning_app allowing the request and hangup to be initiated by different threads. Originating from an active agent channel requires this. The implementation primarily changes __login_exec to wait on a condition variable rather than a lock.
    
    Review: http://reviewboard.digium.com/r/35/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 21:01:55 +00:00
Olle Johansson
eeac5f539e Merged revisions 168497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168497 | oej | 2009-01-12 17:31:27 +0100 (MÃ¥n, 12 Jan 2009) | 2 lines

Better to use the proper app name in the STATUS variable

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168499 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 16:55:11 +00:00
Mark Michelson
03a951f368 Merged revisions 168485 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168485 | mmichelson | 2009-01-12 09:00:00 -0600 (Mon, 12 Jan 2009) | 13 lines

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

........
r168482 | mmichelson | 2009-01-12 08:58:25 -0600 (Mon, 12 Jan 2009) | 5 lines

I am reverting the fix made in revision 168128 (and its upward merges)
after being contacted by Olle Johansson and being shown how this fix is
incorrect. Thanks to Olle for clearing this up for me.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 15:00:31 +00:00
Russell Bryant
6f07826706 Merged revisions 168481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168481 | russell | 2009-01-12 08:57:49 -0600 (Mon, 12 Jan 2009) | 10 lines

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

........
r168480 | russell | 2009-01-12 08:57:27 -0600 (Mon, 12 Jan 2009) | 2 lines

s/ringdance/ringcadence/ for Bulgaria

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-12 14:58:38 +00:00
Tilghman Lesher
8f41e52f44 Merged revisions 168334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168334 | tilghman | 2009-01-09 19:42:45 -0600 (Fri, 09 Jan 2009) | 2 lines
  
  sizeof for a stringfield is 4.  Kinda low for reconstructing a field value.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-10 01:43:51 +00:00
Kevin P. Fleming
7f0d370d0d Merged revisions 168270 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168270 | kpfleming | 2009-01-09 17:16:08 -0600 (Fri, 09 Jan 2009) | 9 lines
  
  Merged revisions 168267 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168267 | kpfleming | 2009-01-09 17:12:29 -0600 (Fri, 09 Jan 2009) | 1 line
    
    update to use new sound file packages that include license files
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 23:17:14 +00:00
Richard Mudgett
6806bf4a69 Missed change from trunk -r168192 when resolving conflicts.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 23:14:57 +00:00
Richard Mudgett
16c8142b29 Merged revisions 168192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168192 | rmudgett | 2009-01-09 15:43:30 -0600 (Fri, 09 Jan 2009) | 10 lines
  
  Merged revisions 168191 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168191 | rmudgett | 2009-01-09 15:28:42 -0600 (Fri, 09 Jan 2009) | 3 lines
    
    *  Fix for JIRA AST-175/ABE-1757
    *  Miscellaneous doxygen comments added.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 22:34:54 +00:00
Russell Bryant
7cd060bb84 Merged revisions 168200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168200 | russell | 2009-01-09 16:21:05 -0600 (Fri, 09 Jan 2009) | 10 lines

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

........
r168198 | russell | 2009-01-09 16:14:38 -0600 (Fri, 09 Jan 2009) | 2 lines

Make this compile for mvanbaak

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 22:22:29 +00:00
Mark Michelson
271c6c9529 Merged revisions 168193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168193 | mmichelson | 2009-01-09 15:53:26 -0600 (Fri, 09 Jan 2009) | 21 lines

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

........
r168128 | mmichelson | 2009-01-09 14:08:04 -0600 (Fri, 09 Jan 2009) | 13 lines

Add check_via calls to more request handlers

INFO, NOTIFY, OPTIONS, REFER, and MESSAGE requests
were not checking the topmost Via to determine where
to send the response. Adding check_via calls to those
request handlers solves this.

(closes issue #13071)
Reported by: baron
Patches:
      check_via.patch uploaded by baron (license 531)
Tested by: baron

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 21:57:01 +00:00
Terry Wilson
3fc6826248 Merged revisions 168142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168142 | twilson | 2009-01-09 14:25:25 -0600 (Fri, 09 Jan 2009) | 7 lines
  
  Don't leak memory if phoneprov.conf does not exist
  
  (closes issue #14203)
  Reported by: jamesgolovich
  Patches: 
        asterisk-phoneprovleak.diff.txt uploaded by jamesgolovich (license 176)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 20:28:16 +00:00
Tilghman Lesher
76c697c90b Merged revisions 168090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168090 | tilghman | 2009-01-09 12:30:55 -0600 (Fri, 09 Jan 2009) | 3 lines
  
  When using ast_str with a non-ast_str-enabled API, we need to update the buffer
  or otherwise, we cannot use ast_str_strlen().
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 18:36:03 +00:00
Matthew Nicholson
05c6d88ab2 Merged revisions 168014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168014 | mnicholson | 2009-01-09 10:32:34 -0600 (Fri, 09 Jan 2009) | 5 lines
  
  Use ast_safe_system() in logger.c instead of system()
  
  (closes issue #14194)
  Reported by: pabelanger
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 16:41:36 +00:00
Terry Wilson
da5ecd2598 Blocked revisions 167973 via svnmerge
........
  r167973 | twilson | 2009-01-08 19:15:43 -0600 (Thu, 08 Jan 2009) | 2 lines
  
  Set ORIGINATE_STATUS instead of OUTGOING_STATUS to match the documentation
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 01:16:28 +00:00
Terry Wilson
7970bef2d2 Merged revisions 167935 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167935 | twilson | 2009-01-08 18:13:12 -0600 (Thu, 08 Jan 2009) | 2 lines
  
  Set peer context and exten values so MACRO_EXTEN and MACRO_CONTEXT will be set
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-09 00:37:01 +00:00
Tilghman Lesher
31d37012e0 Merged revisions 167894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r167894 | tilghman | 2009-01-08 16:37:20 -0600 (Thu, 08 Jan 2009) | 13 lines
  
  Merged revisions 167840 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r167840 | tilghman | 2009-01-08 16:08:56 -0600 (Thu, 08 Jan 2009) | 6 lines
    
    Don't truncate database results at 255 chars.
    (closes issue #14069)
     Reported by: evandro
     Patches: 
           20081214__bug14069.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-08 22:42:23 +00:00
Kevin P. Fleming
cad23358ab Merged revisions 167720 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r167720 | kpfleming | 2009-01-08 11:26:03 -0600 (Thu, 08 Jan 2009) | 9 lines
  
  Merged revisions 167714 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r167714 | kpfleming | 2009-01-08 11:24:21 -0600 (Thu, 08 Jan 2009) | 1 line
    
    remove an unnecessary argument to queue_request()
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-08 17:29:36 +00:00
Kevin P. Fleming
85ac907af2 Merged revisions 167700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r167700 | kpfleming | 2009-01-08 10:43:26 -0600 (Thu, 08 Jan 2009) | 12 lines
  
  Merged revisions 167620 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r167620 | kpfleming | 2009-01-07 17:32:21 -0600 (Wed, 07 Jan 2009) | 5 lines
    
    When a SIP request or response arrives for a dialog with an associated Asterisk channel, and the lock on that channel cannot be obtained because it is held by another thread, instead of dropping the request/response, queue it for later processing when the channel lock becomes available.
    
    http://reviewboard.digium.com/r/123/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-08 17:22:40 +00:00
Leif Madsen
6e2db4dc27 Merged revisions 167662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167662 | lmadsen | 2009-01-08 09:27:53 -0500 (Thu, 08 Jan 2009) | 1 line
  
  Oops... fix the fieldname I changed yesterday to be right.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-08 14:31:37 +00:00
Russell Bryant
685eda5a54 Merged revisions 167569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167569 | russell | 2009-01-07 16:36:34 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167566 | russell | 2009-01-07 16:35:36 -0600 (Wed, 07 Jan 2009) | 2 lines

Fix the last couple of places where free() was improperly used directly.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 22:37:14 +00:00
Russell Bryant
6232e6d659 Merged revisions 167555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167555 | russell | 2009-01-07 16:27:23 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167554 | russell | 2009-01-07 16:26:42 -0600 (Wed, 07 Jan 2009) | 2 lines

Don't fclose() the file early, the filestream destructor will handle it.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 22:27:47 +00:00
Russell Bryant
bc8cd9f02c Merged revisions 167546 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167546 | russell | 2009-01-07 16:20:31 -0600 (Wed, 07 Jan 2009) | 10 lines

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

........
r167545 | russell | 2009-01-07 16:19:47 -0600 (Wed, 07 Jan 2009) | 2 lines

Only try to close the file if one was actually opened

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167548 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 22:21:02 +00:00
Russell Bryant
8c2a49c221 Merged revisions 167542 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167542 | russell | 2009-01-07 16:05:29 -0600 (Wed, 07 Jan 2009) | 12 lines

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

........
r167541 | russell | 2009-01-07 16:03:59 -0600 (Wed, 07 Jan 2009) | 4 lines

Don't use free() directly.  This caused a crash since ast_filestream is now an ao2 object.

Reported by JunK-Y on IRC, #asterisk-dev

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 22:06:18 +00:00
BJ Weschke
976f09e010 Merged revisions 167478 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167478 | bweschke | 2009-01-07 13:20:31 -0500 (Wed, 07 Jan 2009) | 7 lines
  
   Answer the channel if it has not already been answered and we've already found a valid profile for followme. 
   (closes issue #14140)
   Reported by: dimas
   Patches:
         14140.patch uploaded by dimas
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 18:30:39 +00:00
Leif Madsen
eb0179bd13 Merged revisions 167477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167477 | lmadsen | 2009-01-07 13:18:45 -0500 (Wed, 07 Jan 2009) | 8 lines
  
  Update queues.conf.sample documentation.
  
  Update the queues.conf.sample documentation to mention that you need to preload chan_local.so as well if you plan on using Local channels for queue members, and you're preloading pbx_config.so.
  
  
  (closes issue #14179)
  Reported by: CrashHD
  Tested by: CrashHD
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167485 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 18:25:40 +00:00
Russell Bryant
6899204595 Merged revisions 167442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167442 | russell | 2009-01-07 11:35:39 -0600 (Wed, 07 Jan 2009) | 12 lines

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

........
r167432 | russell | 2009-01-07 11:29:53 -0600 (Wed, 07 Jan 2009) | 4 lines

Treat an empty string the same way as a NULL country argument.

In passing, simplify the handling of returning a default tone zone.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167450 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 17:42:27 +00:00
Leif Madsen
4d763741d4 Merged revisions 167373 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167373 | lmadsen | 2009-01-07 09:26:19 -0500 (Wed, 07 Jan 2009) | 1 line
  
  Update the sip-friends.sql file to use the non-deprecated 'defaultname' instead of 'username' and remove an extra comma that would cause the script to fail as-is
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167375 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-07 14:33:38 +00:00
Mark Michelson
b8b4ae6501 Merged revisions 167301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167301 | mmichelson | 2009-01-06 15:36:44 -0600 (Tue, 06 Jan 2009) | 16 lines

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

........
r167299 | mmichelson | 2009-01-06 15:35:57 -0600 (Tue, 06 Jan 2009) | 8 lines

Use the correct variable when creating the format string

(closes issue #14177)
Reported by: nic_bellamy
Patches:
      asterisk-trunk-svn-r167242-ast_db_gettree.patch uploaded by nic (license 299)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-06 21:38:19 +00:00
Tilghman Lesher
4e803082b3 Merged revisions 167265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r167265 | tilghman | 2009-01-06 15:02:33 -0600 (Tue, 06 Jan 2009) | 16 lines
  
  Merged revisions 167260 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r167260 | tilghman | 2009-01-06 14:48:05 -0600 (Tue, 06 Jan 2009) | 9 lines
    
    Merged revisions 167259 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r167259 | tilghman | 2009-01-06 14:44:03 -0600 (Tue, 06 Jan 2009) | 2 lines
      
      Security fix AST-2009-001.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-06 21:07:20 +00:00
Mark Michelson
bfbf5afa62 Merged revisions 167180 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167180 | mmichelson | 2009-01-05 10:59:36 -0600 (Mon, 05 Jan 2009) | 49 lines

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

........
r167179 | mmichelson | 2009-01-05 10:51:59 -0600 (Mon, 05 Jan 2009) | 41 lines

A couple of changes to T.38 SDP attribute handling

There are some boolean attributes for T.38 such
as T38FaxFillBitRemoval, T38FaxTranscodingMMR, and
T38FaxTranscodingJBIG. By simply being present, we
should treat these as a "true" value. The current
code, however, was requiring a 1 or 0 as the value
of the attribute in order to parse it. This is due
to the fact that there are some T.38 endpoints and
gateways that also transmit this information
incorrectly. This patch follows the "be liberal in
what you accept and strict in what you send"
philosophy by accepting both the correctly- and 
incorrectly-formatted attributes, but only sending
information as it is supposed to be sent.

It was also discovered that a particular type of 
T.38 gateway sends some non-standard T.38 SDP
attributes. Instead of using T38FaxMaxDatagram
and T38MaxBitRate, it used T38MaxDatagram and
T38FaxMaxRate respectively. We now will properly
accept these attributes as well.

Note that there are a lot of patches cited in
the below commit message template. This is
because the person who submitted these patches is
an awesome person and wrote 1.4, 1.6.0, and 1.6.1
variants.

(closes issue #13976)
Reported by: linulin
Patches:
     chan_sip.c.1.4-update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.0-update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.1-update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.4-relaxedT38_update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.0-relaxedT38_update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.1-relaxedT38_update1.diff uploaded by arcivanov (license 648)
Tested by: arcivanov


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-05 17:04:23 +00:00
Tilghman Lesher
1687071eed Merged revisions 167176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167176 | tilghman | 2009-01-05 10:44:47 -0600 (Mon, 05 Jan 2009) | 7 lines
  
  More clearly explain that quote marks are no longer necessary.
  (closes issue #13718)
   Reported by: davidw
   Patches: 
         20081020__bug13718.diff.txt uploaded by Corydon76 (license 14)
   Tested by: blitzrage
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-05 16:45:44 +00:00
Jeff Peeler
f37957c5b5 Blocked revisions 167125 via svnmerge
........
r167125 | jpeeler | 2009-01-03 14:29:54 -0600 (Sat, 03 Jan 2009) | 3 lines

When parsing environment variable ASTERISK_PROMPT, make sure to proceed to the next character when a non format specifier is used (no %). Otherwise, the while loop looking for the null byte will never exit.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-03 20:32:12 +00:00
Terry Wilson
228bf17ee7 Blocked revisions 167057 via svnmerge
........
  r167057 | twilson | 2008-12-31 16:53:55 -0600 (Wed, 31 Dec 2008) | 2 lines
  
  Don't forget to free typename
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-31 22:55:50 +00:00
Mark Michelson
dc2b180c27 Blocked revisions 167021 via svnmerge
........
r167021 | mmichelson | 2008-12-31 15:52:02 -0600 (Wed, 31 Dec 2008) | 4 lines

Change some incorrect syntax for pri set debug and correct
an off-by-one error in ss7 set debug command


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167022 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-31 21:53:40 +00:00
Tilghman Lesher
ac3a15778a Merged revisions 166954 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r166954 | tilghman | 2008-12-31 13:34:28 -0600 (Wed, 31 Dec 2008) | 12 lines
  
  Merged revisions 166953 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r166953 | tilghman | 2008-12-31 13:20:35 -0600 (Wed, 31 Dec 2008) | 5 lines
    
    Also inherit the musiconhold class.
    (Closes #14153)
    Reported by: Jerry Geis, via the users list.
    Patch by: me (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-31 19:37:03 +00:00
Terry Wilson
f43bfb0ace Merged revisions 166908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r166908 | twilson | 2008-12-30 14:50:05 -0600 (Tue, 30 Dec 2008) | 2 lines
  
  Fix some svn:keywords
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-30 20:55:05 +00:00
Mark Michelson
788f3a8fa5 Merged revisions 166861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166861 | mmichelson | 2008-12-29 12:04:52 -0600 (Mon, 29 Dec 2008) | 14 lines

Update app_queue to deal with the removal of AST_PBX_KEEPALIVE

When placing a call to a queue which ran a gosub on the member's
channel, Asterisk would crash every time, stemming from the fact
that the member's channel was being hung up unexpectedly when the
Gosub completed. The necessary change was pretty much copied and
pasted from app_dial's similar changes made last week.

I also took the opportunity to change a LOG_DEBUG message in
app_dial to use ast_debug. I am guessing this was due to a direct
merge from 1.4 that was not corrected to use trunk's preferred
syntax.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-29 18:15:22 +00:00
Eliel C. Sardanons
9c28554fb1 Blocked revisions 166823 via svnmerge
........
  r166823 | eliel | 2008-12-28 10:36:25 -0500 (Sun, 28 Dec 2008) | 3 lines
  
  Fix a typo in the XML documentation of the AUDIOHOOK_INHERIT dialplan function.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-28 15:44:09 +00:00
Russell Bryant
a80d937882 Merged revisions 166773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r166773 | russell | 2008-12-28 09:15:14 -0600 (Sun, 28 Dec 2008) | 12 lines

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

........
r166772 | russell | 2008-12-28 09:13:48 -0600 (Sun, 28 Dec 2008) | 4 lines

Use strncat() instead of an sprintf() in which source and target buffers overlap

http://lists.digium.com/pipermail/asterisk-dev/2008-December/035919.html

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-28 15:15:46 +00:00
Terry Wilson
ba8c827dd3 Blocked revisions 166731 via svnmerge
........
  r166731 | twilson | 2008-12-24 09:10:42 -0600 (Wed, 24 Dec 2008) | 10 lines
  
  There is no section 22.2.2 in rfc 3261.  I believe 26.2.2 is what was meant:
  
        Note that in the SIPS URI scheme, transport is independent of TLS,
        and thus "sips:alice@atlanta.com;transport=tcp" and
        "sips:alice@atlanta.com;transport=sctp" are both valid (although
        note that UDP is not a valid transport for SIPS).  The use of
        "transport=tls" has consequently been deprecated, partly because
        it was specific to a single hop of the request.  This is a change
        since RFC 2543.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-24 15:18:38 +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