Commit Graph

3356 Commits

Author SHA1 Message Date
Sean Bright
28e93c7288 Merged revisions 161349-161350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161349 | seanbright | 2008-12-05 10:56:15 -0500 (Fri, 05 Dec 2008) | 5 lines
  
  When using IMAP_STORAGE, it's important to convert bare newlines (\n) in
  emailbody and pagerbody to CR-LF so that the IMAP server doesn't spit out an
  error.  This was informally reported on #asterisk-dev a few weeks ago.  Reviewed
  by Mark M. on IRC.
........
  r161350 | seanbright | 2008-12-05 11:04:36 -0500 (Fri, 05 Dec 2008) | 2 lines
  
  Use ast_free() instead of free(), pointed out by eliel on IRC.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 16:18:52 +00:00
Russell Bryant
74e171a47c Merged revisions 161252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r161252 | russell | 2008-12-05 07:46:01 -0600 (Fri, 05 Dec 2008) | 2 lines

Resolve a compiler warning from buildbot about a NULL format string.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 14:03:32 +00:00
Sean Bright
7a09b4b153 Merged revisions 161147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161147 | seanbright | 2008-12-04 21:47:54 -0500 (Thu, 04 Dec 2008) | 3 lines
  
  Check the return value of fread/fwrite so the compiler doesn't complain.  Only a
  problem when IMAP_STORAGE is enabled.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 02:52:37 +00:00
Tilghman Lesher
a8bc1d2476 Merged revisions 160791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160791 | tilghman | 2008-12-03 15:58:21 -0600 (Wed, 03 Dec 2008) | 9 lines
  
  Merged revisions 160770 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160770 | tilghman | 2008-12-03 15:54:07 -0600 (Wed, 03 Dec 2008) | 2 lines
    
    Some compilers warn on null format strings; some don't (caught by buildbot)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 22:02:28 +00:00
Mark Michelson
ec71774eae Merged revisions 160626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r160626 | mmichelson | 2008-12-03 12:37:46 -0600 (Wed, 03 Dec 2008) | 16 lines

Add some safety measures when using gosub, especially when using the options
for app_dial and app_queue to run a gosub when the call is answered.

* Check for the existence of the gosub target in gosub_exec. If it is nonexistent,
  then this will cause errors when we attempt to actually run the gosub, including
  a definite memory leak and potential crashes. Return an error in this situation
* Check the return value of pbx_exec in app_dial and app_queue before attempting
  to actually run the gosub routine. If there was an error, we should not attempt
  to run the gosub.
* Change a '|' to a ',' in app_queue.
* Add some extra curly braces where they had been missing previously.

(closes issue #13548)
Reported by: fiddur


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 18:42:01 +00:00
Mark Michelson
96792dba18 Merged revisions 160555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r160555 | mmichelson | 2008-12-03 11:07:09 -0600 (Wed, 03 Dec 2008) | 11 lines

When investigating issue #13548, I found that gosub
handling in app_queue was just completely wrong, mostly
because the channel operations being performed were being
done on the incorrect channel.

With this set of changes, a gosub will correctly run on
the answering queue member's channel. There are still crash
issues which occur if there are dialplan syntax errors, so
I cannot yet close the referenced issue.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 17:10:04 +00:00
Tilghman Lesher
6674ef2c22 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.1@160234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 00:58:43 +00:00
Tilghman Lesher
05b4275693 Merged revisions 159853 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r159853 | tilghman | 2008-11-29 12:33:18 -0600 (Sat, 29 Nov 2008) | 2 lines
  
  Allow the '#' sign to exist within an extension (inspired by issue #13330)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@159854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-29 18:34:12 +00:00
Mark Michelson
81826df05d Merged revisions 159554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r159554 | mmichelson | 2008-11-26 13:57:11 -0600 (Wed, 26 Nov 2008) | 19 lines

Add some necessary hangup commands in the case that forwarding
a call fails

1) Hang up the original destination if the local channel cannot
   be requested.
2) Hang up the local channel (in addition to the original destination)
   if ast_call fails when calling the newly created local channel.

This prevents channels from sticking around forever in the
case of a botched call forward (e.g. to an extension which does not
exist).

(closes issue #13764)
Reported by: davidw
Patches:
      13764_v2.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, davidw


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@159561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 19:58:43 +00:00
Terry Wilson
3988a3ab93 Merged revisions 159093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r159093 | twilson | 2008-11-25 10:18:53 -0600 (Tue, 25 Nov 2008) | 2 lines
  
  Add missing variable declaration for PPC code
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@159095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 16:21:55 +00:00
Tilghman Lesher
e20e4281a0 Merged revisions 159050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r159050 | tilghman | 2008-11-24 23:02:11 -0600 (Mon, 24 Nov 2008) | 10 lines
  
  Merged revisions 159025 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159025 | tilghman | 2008-11-24 22:50:00 -0600 (Mon, 24 Nov 2008) | 3 lines
    
    System call ioperm is non-portable, so check for its existence in autoconf.
    (Closes issue #13863)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@159053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 05:05:18 +00:00
Matthew Nicholson
39f8b957f2 Merged revisions 158924 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158924 | mnicholson | 2008-11-24 18:05:41 -0600 (Mon, 24 Nov 2008) | 6 lines
  
  Make the Join event from app_queue use CallerIDNum insead of CallerID for
  indicating the callerid number just like the rest of asterisk.
  
  (closes issue #13883)
  Reported by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@158927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 00:41:07 +00:00
Mark Michelson
7122ee6adb Merged revisions 158066 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@158067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-20 17:40:20 +00:00
Kevin P. Fleming
040bbb51c7 Merged revisions 157706 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157706 | kpfleming | 2008-11-19 06:42:19 -0600 (Wed, 19 Nov 2008) | 5 lines
  
  make some corrections to the ast_agi_register_multiple(), ast_agi_unregister_multiple() and ast_agi_fdprintf() API calls to be consistent with API guidelines
  
  also, move UPGRADE.txt to UPGRADE-1.6.txt and make the new UPGRADE.txt contain information about upgrading between Asterisk 1.6 releases
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-19 13:03:50 +00:00
Mark Michelson
a230136289 Merged revisions 157562 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r157562 | mmichelson | 2008-11-18 17:28:23 -0600 (Tue, 18 Nov 2008) | 11 lines

Fix the logic for when delete=yes when IMAP storage
is in use so that the message is deleted from both
local and IMAP storage.

(closes issue #13642)
Reported by: jaroth
Patches:
      deleteyes.patch uploaded by jaroth (license 50)



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 23:28:54 +00:00
Jeff Peeler
737c06fa38 Merged revisions 157366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r157366 | jpeeler | 2008-11-18 13:16:00 -0600 (Tue, 18 Nov 2008) | 14 lines

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

........
r157365 | jpeeler | 2008-11-18 13:13:33 -0600 (Tue, 18 Nov 2008) | 6 lines

(closes issue #13899)
Reported by: akkornel

This fix is the result of a bug fix in ast_app_separate_args r124395. If an argument does not exist it should always be set to a null string rather than a null pointer.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 19:18:51 +00:00
Mark Michelson
892f98a1e6 Merged revisions 157306 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r157306 | mmichelson | 2008-11-18 12:31:08 -0600 (Tue, 18 Nov 2008) | 20 lines

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

........
r157305 | mmichelson | 2008-11-18 12:25:55 -0600 (Tue, 18 Nov 2008) | 12 lines

Fix a crash in the end_bridge_callback of app_dial and
app_followme which would occur at the end of an attended
transfer. The error occurred because we initially stored
a pointer to an ast_channel which then was hung up due
to a masquerade.

This commit adds a "fixup" callback to the bridge_config
structure to allow for end_bridge_callback_data to be
changed in the case that a new channel pointer is needed
for the end_bridge_callback.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157308 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 18:32:54 +00:00
Tilghman Lesher
ed1113b08e Merged revisions 157253 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157253 | tilghman | 2008-11-17 16:25:06 -0600 (Mon, 17 Nov 2008) | 8 lines
  
  Can't use items duplicated off the stack frame in an element returned from
  a function: in these cases, we have to use the heap, or garbage will result.
  (closes issue #13898)
   Reported by: alecdavis
   Patches: 
         20081114__bug13898__2.diff.txt uploaded by Corydon76 (license 14)
   Tested by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-17 22:39:55 +00:00
Mark Michelson
2831947109 This is the 1.6.1 version of trunk commit 156883.
It is functionally equivalent to the 1.6.0 commit



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 16:57:04 +00:00
Mark Michelson
786b83aa69 Merged revisions 156817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156817 | mmichelson | 2008-11-14 09:20:03 -0600 (Fri, 14 Nov 2008) | 18 lines

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

........
r156816 | mmichelson | 2008-11-14 09:18:59 -0600 (Fri, 14 Nov 2008) | 10 lines

If the prompt to reenter a voicemail password timed out, it
resulted in the password not being saved, even if the input matched
what you gave when first prompted to enter a new password. This is
because the return value of ast_readstring was checked, but not checked
properly.

This bug was discovered by Jared Smith during an Asterisk training course.
Thanks for reporting it!


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 15:22:56 +00:00
Tilghman Lesher
4edee6ec5e Merged revisions 156756 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156757 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 00:44:10 +00:00
Tilghman Lesher
1b8217193c Merged revisions 156388 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r156388 | tilghman | 2008-11-12 15:34:51 -0600 (Wed, 12 Nov 2008) | 12 lines
  
  Merged revisions 156386 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156386 | tilghman | 2008-11-12 15:18:57 -0600 (Wed, 12 Nov 2008) | 5 lines
    
    When using call limits under 1 second, infinite call lengths are allowed,
    instead.
    (closes issue #13851)
     Reported by: ruddy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156389 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 21:36:02 +00:00
Tilghman Lesher
ce89e9403b Merged revisions 156295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  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)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156296 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 19:29:12 +00:00
Jeff Peeler
1f615ccdf6 Merged revisions 156290 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156290 | jpeeler | 2008-11-12 13:11:15 -0600 (Wed, 12 Nov 2008) | 11 lines

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

........
r156289 | jpeeler | 2008-11-12 13:10:12 -0600 (Wed, 12 Nov 2008) | 3 lines

For whatever reason, gcc only warned me about the possible use of an uninitialized variable when compiling 1.6.1. 


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 19:11:41 +00:00
Tilghman Lesher
412cbf7035 Fix build (res possibly unused in this function, says gcc)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 19:04:23 +00:00
Jeff Peeler
62bb302943 Merged revisions 156228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156228 | jpeeler | 2008-11-12 12:32:46 -0600 (Wed, 12 Nov 2008) | 16 lines

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

........
r156178 | jpeeler | 2008-11-12 11:53:44 -0600 (Wed, 12 Nov 2008) | 8 lines

(closes issue #13173)
Reported by: pep

This change adds an announce_thread responsible for playing announcements to an existing conference. This allows all announcing to be immediately stopped if necessary but more importantly allows other threads that need to play something to not block. There are multiple benefits to this, but the actual bug is for solving the scenario for a channel to be unusable after hang up for the entire duration of the parting announcement. The parting announcement can be extremely long depending on what the user recorded upon joining the conference.

Reviewed by Russell on Review Board:
http://reviewboard.digium.com/r/25/

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 18:55:52 +00:00
Mark Michelson
0c0fdebd9f Merged revisions 156169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156169 | mmichelson | 2008-11-12 11:41:56 -0600 (Wed, 12 Nov 2008) | 15 lines

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

........
r156167 | mmichelson | 2008-11-12 11:38:33 -0600 (Wed, 12 Nov 2008) | 7 lines

When doing some tests, I was having a crash at the end of every call
if an attended transfer occurred during the call. I traced the cause to
the CDR on one of the channels being NULL. murf suggested a check in
the end bridge callback to be sure the CDR is non-NULL before proceeding,
so that's what I'm adding.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 17:48:24 +00:00
Sean Bright
839cb83ea3 Merged revisions 155554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r155554 | seanbright | 2008-11-08 20:27:00 -0500 (Sat, 08 Nov 2008) | 14 lines

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

........
r155553 | seanbright | 2008-11-08 20:08:07 -0500 (Sat, 08 Nov 2008) | 6 lines

Use static functions here instead of nested ones.  This requires a small
change to the ast_bridge_config struct as well.  To understand the reason
for this change, see the following post:

    http://gcc.gnu.org/ml/gcc-help/2008-11/msg00049.html

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@155556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-09 01:43:14 +00:00
Tilghman Lesher
1c523df75c Recorded merge of revisions 154072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r154072 | tilghman | 2008-11-03 16:28:12 -0600 (Mon, 03 Nov 2008) | 12 lines
  
  Merged revisions 154066 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154066 | tilghman | 2008-11-03 16:27:10 -0600 (Mon, 03 Nov 2008) | 5 lines
    
    Attempting to expunge a mailbox when the mailstream is NULL will crash Asterisk.
    (Closes issue #13829)
    Reported by: jaroth
    Patch by: me (modified jaroth's patch)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@154092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 22:32:27 +00:00
Kevin P. Fleming
d660c03fdc Merged revision 153709 from trunk
------------------------------------------------------------------------
r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines

instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.


------------------------------------------------------------------------



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:21:04 +00:00
Kevin P. Fleming
1036849a42 import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 23:56:13 +00:00
Terry Wilson
239f1d53bc Merged revisions 153181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r153181 | twilson | 2008-10-31 13:55:33 -0500 (Fri, 31 Oct 2008) | 5 lines
  
  Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten.  Added a callback function to handle setting variables, etc. from w/in the bridging code.  Calls back into a nested function within the function calling ast_bridge_call
  
  (closes issue #13793)
  Reported by: greenfieldtech
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 22:11:11 +00:00
Mark Michelson
bc4cf44e6b Merged revisions 152646 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152646 | mmichelson | 2008-10-29 15:53:53 -0500 (Wed, 29 Oct 2008) | 9 lines

If there was no named defined in a voicemail.conf mailbox
entry, then app_directory would crash when attempting to
read that entry from the file. We now check for the NULL
or empty string properly so that there will be no crash.

(closes issue #13804)
Reported by: bluecrow76


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:55:22 +00:00
Terry Wilson
c30b0d8d10 Small modification to putnopvut's patch to fix this issue. Thanks for all the help, putnopvut!
(closes issue #12884)
	    Reported by: bcnit
		    Patches:
			          12884v4-1.6.0-branch.patch uploaded by otherwiseguy (license 396)
	    Tested by: otherwiseguy



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:16:09 +00:00
Steve Murphy
039de710a7 Merged revisions 152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152605 | murf | 2008-10-28 23:47:13 -0600 (Tue, 28 Oct 2008) | 22 lines

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

........
r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines

A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.

I hope this doesn't spoil some vast, eternal plan...


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:52:41 +00:00
Steve Murphy
f1da1c3957 Merged revisions 152536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152536 | murf | 2008-10-28 23:01:00 -0600 (Tue, 28 Oct 2008) | 57 lines

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

........
r152535 | murf | 2008-10-28 22:36:32 -0600 (Tue, 28 Oct 2008) | 46 lines

The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the 
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
Why? because CDR's aren't generated via parking,
so nothing is needed, but if a transfer occurred,
there are critical things I need.

If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.

If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.

Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden 
(in trunk).

All the places that previously tested for 
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.

I tested this against the 4 common parking
scenarios:


1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.

2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.

3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.

4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.


No crash.

I also ran the scenarios above against valgrind, and accesses looked good.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:09:20 +00:00
Tilghman Lesher
2098685d9e Merged revisions 152467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines
  
  Merged revisions 152463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines
    
    Quoting in the wrong direction
    (Fixes AST-107)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 22:35:01 +00:00
Tilghman Lesher
a7a57a4f61 Merged revisions 152369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
  
  Merged revisions 152368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
    
    Reset all DIAL variables back to blank, in case Dial is called multiple times
    per call (which could otherwise lead to inconsistent status reports).
    (closes issue #13216)
     Reported by: ruddy
     Patches: 
           20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ruddy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 17:08:47 +00:00
Tilghman Lesher
95c0f16b9a Merged revisions 152134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152134 | tilghman | 2008-10-27 11:24:11 -0500 (Mon, 27 Oct 2008) | 4 lines
  
  Oops, only delete the ARG variables once upon release.  The following section
  would have removed them again (removing variables from 2 stack frames, instead
  of just one).
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:42:07 +00:00
Jason Parker
d8814693ba Merged revisions 152132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152132 | qwell | 2008-10-27 11:03:12 -0500 (Mon, 27 Oct 2008) | 7 lines
  
  Remove options argument parsing/syntax (it isn't used any longer)
  
  (closes issue #13789)
  Reported by: IgorG
  Patches:
        app_transfer.c.diff uploaded by IgorG (license 20)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:06:01 +00:00
Tilghman Lesher
2e70e247bc Merged revisions 151371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r151371 | tilghman | 2008-10-21 10:20:50 -0500 (Tue, 21 Oct 2008) | 5 lines
  
  Default file modes should always be full read and write, to allow the system
  administrator to make the decision of what permissions will actually be given,
  through the use of the process umask.
  (Closes issue# 13751)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@151372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-21 15:21:42 +00:00
Kevin P. Fleming
f0c712cf4b Merged revisions 151101 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r151101 | kpfleming | 2008-10-19 22:11:28 +0300 (Sun, 19 Oct 2008) | 13 lines
  
  cleaup of the TCP/TLS socket API:
  
  1) rename 'struct server_args' to 'struct ast_tcptls_session_args', to follow coding guidelines
  
  2) make ast_make_file_from_fd() static and rename it to something that indicates what it really is for (again coding guidelines)
  
  3) rename address variables inside 'struct ast_tcptls_session_args' to be more descriptive (dare i say it... coding guidelines)
  
  4) change ast_tcptls_client_start() to use the new 'remote_address' field of the session args for the destination of the connection, and use the 'local_address' field to bind() the socket to the proper source address, if one is supplied
  
  5) in chan_sip, ensure that we pass in the PP address we are bound to when creating outbound (client) connections, so that our connections will appear from the correct address
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@151135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-19 19:33:42 +00:00
Mark Michelson
362daccd6f Merged revisions 150257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r150257 | mmichelson | 2008-10-16 17:44:05 -0500 (Thu, 16 Oct 2008) | 9 lines

Answer the channel prior to checking for the 'a'
option in app_sms.

(closes issue #13675)
Reported by: alecdavis
Patches:
      app_sms.bug13675.148985.diff.txt uploaded by alecdavis (license 585)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@150258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-16 22:44:31 +00:00
Kevin P. Fleming
a890790280 Merged revisions 149384 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r149384 | kpfleming | 2008-10-15 10:55:47 +0200 (Wed, 15 Oct 2008) | 3 lines
  
  building this module depends on res_agi being built as well
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-16 09:19:35 +00:00
Tilghman Lesher
28e24b3dce Merged revisions 149588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r149588 | tilghman | 2008-10-15 10:30:21 -0500 (Wed, 15 Oct 2008) | 6 lines
  
  Minor spacing change
  (closes issue #13697)
   Reported by: alecdavis
   Patches: 
         app_echo.bug13697.103249.diff.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-15 15:31:03 +00:00
Mark Michelson
28aafe781b Merged revisions 149279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r149279 | mmichelson | 2008-10-14 18:57:46 -0500 (Tue, 14 Oct 2008) | 7 lines

When specifying an invalid timeout to Dial, take it
to mean that no timeout is desired.

(closes issue #13625)
Reported by: atis


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 23:58:10 +00:00
Mark Michelson
4e44db9dee Merged revisions 149201 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r149201 | mmichelson | 2008-10-14 17:41:13 -0500 (Tue, 14 Oct 2008) | 20 lines

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

........
r149200 | mmichelson | 2008-10-14 17:40:42 -0500 (Tue, 14 Oct 2008) | 12 lines

Update the queue with the correct number of calls and
whether the call was completed within the service level
when a transfer takes place. This way, we do not "break"
the leastrecent and fewestcalls strategies by not logging
a call until after the transferred call has ended.

(closes issue #13395)
Reported by: Marquis
Patches:
      app_queue.c.transfer.patch uploaded by Marquis (license 32)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 22:43:08 +00:00
Tilghman Lesher
80b2a0379f Merged revisions 149062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r149062 | tilghman | 2008-10-14 15:16:48 -0500 (Tue, 14 Oct 2008) | 13 lines
  
  Merged revisions 149061 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r149061 | tilghman | 2008-10-14 15:09:06 -0500 (Tue, 14 Oct 2008) | 6 lines
    
    Check correct values in the return of ast_waitfor(); also, get rid of a
    possible memory leak.
    (closes issue #13658)
     Reported by: explidous
     Patch by: me
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 20:17:34 +00:00
Tilghman Lesher
81253add70 Merged revisions 148985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r148985 | tilghman | 2008-10-14 13:58:19 -0500 (Tue, 14 Oct 2008) | 6 lines
  
  App is ignoring 'p' parameter -- initial pause.
  (closes issue #13617)
   Reported by: alecdavis
   Patches: 
         app_sms.13oct.diff.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 18:59:43 +00:00
Tilghman Lesher
99b53314ad Merged revisions 148917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r148917 | tilghman | 2008-10-14 12:46:48 -0500 (Tue, 14 Oct 2008) | 11 lines
  
  Merged revisions 148916 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148916 | tilghman | 2008-10-14 12:41:08 -0500 (Tue, 14 Oct 2008) | 4 lines
    
    Ensure that mail headers are 7-bit clean, even when UTF-8 characters are used
    in headers like 'Subject' and 'To'.
    Closes AST-107.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 17:49:00 +00:00