Commit Graph

3048 Commits

Author SHA1 Message Date
Terry Wilson
fbcd6b9595 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.0@159094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 16:21:25 +00:00
Kevin P. Fleming
ac0c9bbc4d 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.0@157738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-19 13:19:49 +00:00
Mark Michelson
35a7e1deca 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.0@157307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 18:32:18 +00:00
Mark Michelson
4fbe80cc63 This is the 1.6.0 version of revision 156883 of trunk.
This is different in that it preserves the case-sensitiveness
of processing queues from configuration.

closes issue #13703



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 16:55:53 +00:00
Mark Michelson
bd31630ab0 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.0@156818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 15:22:06 +00:00
Mark Michelson
221444dd9c 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.0@156170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 17:47:55 +00:00
Russell Bryant
62eefbec73 Don't blow up if we get NULL when trying to parse out the full name field
(fixed for Jared in the training room)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-11 21:28:57 +00:00
Sean Bright
0591cc3029 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.0@155555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-09 01:34:59 +00:00
Kevin P. Fleming
ede179faec Merge 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.0@153745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:52:05 +00:00
Kevin P. Fleming
fa635ea4b0 port gcc 4.3.x warning fixes from trunk to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:39:04 +00:00
Terry Wilson
e23be17786 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.0@153265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 21:49:23 +00:00
Mark Michelson
84dcf8e6b1 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.0@152647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:54:49 +00:00
Terry Wilson
969bef1dea 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.0@152644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:13:22 +00:00
Tilghman Lesher
8bcea43631 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.0@152157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:33:16 +00:00
Sean Bright
eb87d6dac7 Merged revisions 148200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r148200 | seanbright | 2008-10-09 20:42:13 -0400 (Thu, 09 Oct 2008) | 12 lines

Don't include logger.h in asterisk.h by default as it is causing problems building
app_voicemail.  Instead, include it where it is needed.  This turned out to be a
relatively minor issue because other headers include logger.h as well.

Need to test -addons before merging this back to 1.6.0.

(closes issue #13605)
Reported by: tomo1657
Patches: 
      13605_seanbright.diff uploaded by seanbright (license 71)
Tested by: mmichelson

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@148204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-10 01:25:31 +00:00
Sean Bright
2b03afb74b Somehow we got conflict markers checked in! Might need a 1.6.0.1 sooner than we'd like.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@148201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-10 01:21:47 +00:00
Mark Michelson
60399ff4ac Merged revisions 148144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r148144 | mmichelson | 2008-10-09 18:30:47 -0500 (Thu, 09 Oct 2008) | 10 lines

Read the callerid in the correct order and make sure to
read the Urgent flag value from the IMAP headers.

(closes issue #13652)
Reported by: jaroth
Patches:
      imapheaders.patch uploaded by jaroth (license 50)



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@148147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-09 23:31:27 +00:00
Sean Bright
d3edd930a9 Merged revisions 147194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r147194 | seanbright | 2008-10-07 12:52:02 -0400 (Tue, 07 Oct 2008) | 10 lines

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

........
r147193 | seanbright | 2008-10-07 12:48:30 -0400 (Tue, 07 Oct 2008) | 2 lines

Make 'imapsecret' an alias to 'imappassword' in voicemail.conf.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@147195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-07 16:53:40 +00:00
Sean Bright
4d5405c74d Merged revisions 147050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r147050 | seanbright | 2008-10-07 08:01:36 -0400 (Tue, 07 Oct 2008) | 8 lines

Make sure to compare the correct number of characters when special-casing
our DAHDI operator mode stuff.  Technically, it would work fine, as 'DAH'
is currently unique amongst our channel technologies, but as Jared points
out:

  <@jsmith> Sure... as long as the technology starts whith DAH.... but
            it could be DAHDOO!

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@147051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-07 12:03:07 +00:00
Tilghman Lesher
9f9e461e48 Merged revisions 145428 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r145428 | tilghman | 2008-10-01 10:44:06 -0500 (Wed, 01 Oct 2008) | 7 lines
  
  Initializing buffer prevents a segfault when arguments are incomplete.
  (closes issue #13471)
   Reported by: alecdavis
   Patches: 
         20080916__bug13471.diff.txt uploaded by Corydon76 (license 14)
   Tested by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@145429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-01 15:44:59 +00:00
Steve Murphy
561fd11a1f Merged revisions 144569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144569 | murf | 2008-09-25 16:21:28 -0600 (Thu, 25 Sep 2008) | 14 lines

(closes issue #13557)
Reported by: nickpeirson

The user attached a patch, but the license is not yet
recorded. I took the liberty of finding and replacing
ALL index() calls with strchr() calls, and that
involves more than just main/pbx.c;

chan_oss, app_playback, func_cut also had calls
to index(), and I changed them out. 1.4 had no
references to index() at all.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-25 22:23:21 +00:00
Tilghman Lesher
73e498b461 Merged revisions 143405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r143405 | tilghman | 2008-09-17 15:57:58 -0500 (Wed, 17 Sep 2008) | 13 lines
  
  Merged revisions 143404 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r143404 | tilghman | 2008-09-17 15:55:47 -0500 (Wed, 17 Sep 2008) | 6 lines
    
    When callerid is blank, we want to use "unknown caller" in those cases, too.
    (closes issue #13486)
     Reported by: tomo1657
     Patches: 
           20080917__bug13486.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-17 20:58:54 +00:00
Tilghman Lesher
5302fa36b8 Recorded merge of revisions 143031 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r143031 | tilghman | 2008-09-13 08:54:15 -0500 (Sat, 13 Sep 2008) | 8 lines
  
  Repair IAXVAR implementation so that it works again (regression?)
  (closes issue #13354)
   Reported by: adomjan
   Patches: 
         20080828__bug13354.diff.txt uploaded by Corydon76 (license 14)
         20080829__bug13354__1.6.0.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76, adomjan
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-13 13:57:05 +00:00
Tilghman Lesher
1b94ff5b0e Merged revisions 142745 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142745 | tilghman | 2008-09-12 11:38:55 -0500 (Fri, 12 Sep 2008) | 12 lines

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

........
r142744 | tilghman | 2008-09-12 11:38:02 -0500 (Fri, 12 Sep 2008) | 4 lines

Missing merge from 1.2 fixes errant exit on DTMF, only when language is Italian
(cf commit 34242)
(Closes issue #7353)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 16:39:37 +00:00
Steve Murphy
3c1c24500b Merged revisions 142676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142676 | murf | 2008-09-11 22:50:48 -0600 (Thu, 11 Sep 2008) | 40 lines

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

........
r142675 | murf | 2008-09-11 22:29:34 -0600 (Thu, 11 Sep 2008) | 29 lines

Tested by: sergee, murf, chris-mac, andrew, KNK

This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from 
the ground up!

This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.

Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.

While I dearly hope that this patch overcomes all problems, and 
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.

** trunk note: some code to suppress the h exten being run 
from app_queue was added; for the 'continue' option available
only in trunk/1.6.x.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:58:38 +00:00
Mark Michelson
fac93e8478 Fix app_queue's device state callback so that it
can correctly parse custom device states (and any
other device which does not contain a '/').

1.6.1 will be getting this patch as well, but trunk
is going to get a much more massive patch by bbryant
which does some very nice overhauling of some
structures in app_queue.

(closes issue #12979)
Reported by: sigxcpu
Patches:
      12979.patch uploaded by putnopvut (license 60)
Tested by: sigxcpu



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 16:26:56 +00:00
Mark Michelson
dc4224c694 Merged revisions 140975 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140975 | mmichelson | 2008-09-03 15:16:12 -0500 (Wed, 03 Sep 2008) | 4 lines

Fix some locking order issues in app_queue. This was
brought up by atis on IRC a while ago.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 20:18:14 +00:00
Russell Bryant
08966a95de Merged revisions 140566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140566 | russell | 2008-09-02 10:11:53 -0500 (Tue, 02 Sep 2008) | 2 lines

Update instructions for getting libresample

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:12:24 +00:00
Steve Murphy
ee980c4a33 Merged revisions 139627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139627 | murf | 2008-08-22 16:03:13 -0600 (Fri, 22 Aug 2008) | 59 lines

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

........
r139347 | murf | 2008-08-21 17:03:50 -0600 (Thu, 21 Aug 2008) | 47 lines


(closes issue #13251)
Reported by: sergee
Tested by: murf



THis is a bold move for a static release fix, but I wouldn't have
made it if I didn't feel confident (at least a *bit* confident)
that it wouldn't mess everyone up.

The reasoning goes something like this:

1. We simply cannot do anything with CDR's at the current point
(in pbx.c, after the __ast_pbx_run loop). It's way too late to
have any affect on the CDRs. The CDR is already posted and gone,
and the remnants have been cleared.

2. I was very much afraid that moving the running of the 'h'
extension down into the bridge code (where it would be now
practical to do it), would result in a lot more calls to the
'h' exten, so I implemented it as another exten under another
name, but found, to my pleasant surprise, that there was a 
1:1 correspondence to the running of the 'h' exten in the
pbx_run loop, and the new spot at the end of the bridge.
So, I ifdef'd out the current 'h' loop, and moved it into
the bridge code. The only difference I can see is the stuff
about the AST_PBX_KEEPALIVE, and hopefully, if this 
is still an important decision point, I can replicate it
if there are complaints. To be perfectly honest,
the KEEPALIVE situation is not totally clear to me,
and how it relates to a post-bridge situation is less
clear. I suspect the users will point out everything
in total clarity if this steps on anyone's toes!

3. I temporarily swap the bridge_cdr into the channel
before running the 'h' exten, which makes it possible
for users to edit the cdr before it goes out the door.
And, of course, with the endbeforehexten config var set,
the users can also get at the billsec/duration vals.
After the h exten finishes, the cdr is swapped back
and processing continues as normal.

Please, all who deal with CDR's, please test this version
of Asterisk, and file bug reports as appropriate!


........

I also made a little fix to the app_dial's 'e' option,
that is related to my updates.


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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@139628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:09:31 +00:00
Russell Bryant
7d1bda1c07 Merged revisions 139215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139215 | russell | 2008-08-20 17:16:36 -0500 (Wed, 20 Aug 2008) | 19 lines

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

........
r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines

Fix a crash in the ChanSpy application.  The issue here is that if you call
ChanSpy and specify a spy group, and sit in the application long enough looping
through the channel list, you will eventually run out of stack space and the
application with exit with a seg fault.  The backtrace was always inside of
a harmless snprintf() call, so it was tricky to track down.  However, it turned
out that the call to snprintf() was just the biggest stack consumer in this
code path, so it would always be the first one to hit the boundary.

(closes issue #13338)
Reported by: ruddy

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@139216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:17:44 +00:00
Mark Michelson
a63274bf29 Manually add revision 138887 from trunk to the 1.6.0
branch. I had misunderstood the policy for when to merge
to 1.6.0 since it moved to rc status.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 19:08:51 +00:00
Mark Michelson
ac72baa7b5 Merged revisions 138687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138687 | mmichelson | 2008-08-18 15:04:10 -0500 (Mon, 18 Aug 2008) | 18 lines

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

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:05:09 +00:00
Jason Parker
84d0f2de87 Merged revisions 137496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137496 | qwell | 2008-08-13 15:05:50 -0500 (Wed, 13 Aug 2008) | 6 lines

Add FAXMODE variable with what fax transport was used.

(closes issue #13252)
Patches:
      v1-13252.patch uploaded by dimas (license 88)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 20:06:33 +00:00
Mark Michelson
a6df06e84e Merged revisions 136784 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r136784 | mmichelson | 2008-08-08 10:31:31 -0500 (Fri, 08 Aug 2008) | 3 lines

Fix compilation for ODBC voicemail


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136785 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-08 15:33:47 +00:00
Mark Michelson
4a5ac6487f This is weird. Either SVN or vim tabbed
a bunch of functions over one level during
a merge.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 23:42:34 +00:00
Mark Michelson
745f28879f Merged revisions 136722 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r136722 | mmichelson | 2008-08-07 18:39:50 -0500 (Thu, 07 Aug 2008) | 3 lines

Remove one last batch of debug messages


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 23:40:47 +00:00
Mark Michelson
5567deefc9 Merged revisions 136715 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r136715 | mmichelson | 2008-08-07 17:25:50 -0500 (Thu, 07 Aug 2008) | 18 lines

Merging the imap_consistency_trunk branch to
trunk.

For an explanation of what "imap_consistency" is,
please see svn revision 134223 to the 1.4 branch.

Coincidentally, this also fixes a recent bug report
regarding the inability to save messages to the new
folder when using IMAP storage since they will would
be flagged as "seen" and not be recognized as new
messages.


(closes issue #13234)
Reported by: jaroth



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 23:26:24 +00:00
Tilghman Lesher
f67e68de8e Merged revisions 136489 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r136489 | tilghman | 2008-08-07 11:55:57 -0500 (Thu, 07 Aug 2008) | 15 lines

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

........
r136488 | tilghman | 2008-08-07 11:50:47 -0500 (Thu, 07 Aug 2008) | 7 lines

Update persistent state on all exit conditions.
(closes issue #12916)
 Reported by: sgenyuk
 Patches: 
       app_queue.patch.txt uploaded by neutrino88 (license 297)
 Tested by: sgenyuk, aragon

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 16:57:53 +00:00
Steve Murphy
638711f573 Merged revisions 135821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135821 | murf | 2008-08-05 17:45:32 -0600 (Tue, 05 Aug 2008) | 42 lines

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

........
r135799 | murf | 2008-08-05 17:13:20 -0600 (Tue, 05 Aug 2008) | 34 lines

(closes issue #12982)
Reported by: bcnit
Tested by: murf

I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.

And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first 
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).

I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.

To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.

I also corrected one small mention of the Zap device
to equally consider the dahdi device.

I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135822 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:52:14 +00:00
Tilghman Lesher
5cf295c4de Merged revisions 135480 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135480 | tilghman | 2008-08-04 11:58:29 -0500 (Mon, 04 Aug 2008) | 14 lines

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

........
r135479 | tilghman | 2008-08-04 11:56:19 -0500 (Mon, 04 Aug 2008) | 6 lines

Memory leak on unload
(closes issue #13231)
 Reported by: eliel
 Patches: 
       app_voicemail.leak.patch uploaded by eliel (license 64)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 17:03:46 +00:00
Mark Michelson
52f334eacf Merged revisions 135067-135068 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135067 | mmichelson | 2008-08-01 09:29:48 -0500 (Fri, 01 Aug 2008) | 13 lines

IMAP storage functioned under the assumption that folders
such as "Work" and "Family" would be subfolders of the
INBOX. This is an invalid assumption to make, but it could
be desirable to set up folders in this manner, so a new
option for voicemail.conf, "imapparentfolder" has been
added to allow for this.

(closes issue #13142)
Reported by: jaroth
Patches:
      parentfolder.patch uploaded by jaroth (license 50)


........
r135068 | mmichelson | 2008-08-01 09:42:24 -0500 (Fri, 01 Aug 2008) | 3 lines

IMAP-specific items must go in IMAP_STORAGE defines...


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 14:43:19 +00:00
Michiel van Baak
f138b46450 Merged revisions 135059 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135059 | mvanbaak | 2008-08-01 13:47:34 +0200 (Fri, 01 Aug 2008) | 10 lines

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

........
r135058 | mvanbaak | 2008-08-01 13:43:46 +0200 (Fri, 01 Aug 2008) | 2 lines

make app_ices compile on OpenBSD.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:57:38 +00:00
Russell Bryant
a6439b01e2 Merged revisions 134917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134917 | russell | 2008-07-31 14:39:50 -0500 (Thu, 31 Jul 2008) | 17 lines

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

........
r134915 | russell | 2008-07-31 14:37:26 -0500 (Thu, 31 Jul 2008) | 9 lines

Get app_ices working again

(closes issue #12981)
Reported by: dlogan
Patches:
      20080709__app_ices_v2_update_trunk.diff uploaded by bbryant (license 36)
      20080709__app_ices_v2_update_14.diff uploaded by bbryant (license 36)
Tested by: bbryant

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:41:11 +00:00
Mark Michelson
a97827b540 Merged revisions 134759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134759 | mmichelson | 2008-07-31 11:05:12 -0500 (Thu, 31 Jul 2008) | 24 lines

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

........
r134758 | mmichelson | 2008-07-31 10:56:18 -0500 (Thu, 31 Jul 2008) | 16 lines

Add more timeout checks into app_queue, specifically
targeting areas where an unknown and potentially
long time has just elapsed. Also added a check
to try_calling() to return early if the timeout
has elapsed instead of potentially setting a negative
timeout for the call (thus making it have *no* timeout
at all).


(closes issue #13186)
Reported by: miquel_cabrespina
Patches:
      13186.diff uploaded by putnopvut (license 60)
Tested by: miquel_cabrespina


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:07:14 +00:00
Mark Michelson
8feaba9ab0 Merged revisions 134598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134598 | mmichelson | 2008-07-30 16:05:37 -0500 (Wed, 30 Jul 2008) | 15 lines

Merged revisions 134556 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines

Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 21:06:12 +00:00
Tilghman Lesher
232ab001d2 Merged revisions 134483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134483 | tilghman | 2008-07-30 14:17:38 -0500 (Wed, 30 Jul 2008) | 4 lines

Let "roundrobin" also reference rrmemory, for the 1.6 release (as described in
UPGRADE-1.4.txt)
(Closes issue #13181)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:18:12 +00:00
Kevin P. Fleming
25fe3c40f1 Merged revisions 134260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134260 | kpfleming | 2008-07-29 17:22:13 -0500 (Tue, 29 Jul 2008) | 2 lines

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 22:29:11 +00:00
Tilghman Lesher
2e8d6fc9b8 Merged revisions 134163 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134163 | tilghman | 2008-07-28 17:07:12 -0500 (Mon, 28 Jul 2008) | 15 lines

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

........
r134161 | tilghman | 2008-07-28 16:50:50 -0500 (Mon, 28 Jul 2008) | 7 lines

Detect when sox fails to raise the volume, because sox can't read the file.
(closes issue #12939)
 Reported by: rickbradley
 Patches: 
       20080728__bug12939.diff.txt uploaded by Corydon76 (license 14)
 Tested by: rickbradley

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 22:16:39 +00:00
Kevin P. Fleming
261a4972f6 Merged revisions 134086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines

remove remaining Zaptel references in various places


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:49:18 +00:00
Mark Michelson
7eb4b5bf5b Merged revisions 134050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines

merging the zap_and_dahdi_trunk branch up to trunk


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:13:34 +00:00