Commit Graph

16275 Commits

Author SHA1 Message Date
Russell Bryant
9c22591766 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.1@140568 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:13:10 +00:00
Russell Bryant
a4eea7702d Merged revisions 140563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140563 | russell | 2008-09-02 10:09:20 -0500 (Tue, 02 Sep 2008) | 3 lines

I'm not sure how these files got to trunk (probably my fault), but they
should not be here

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:10:04 +00:00
Sean Bright
ff8668fdbc Blocked revisions 140559 via svnmerge
........
r140559 | seanbright | 2008-09-02 10:41:41 -0400 (Tue, 02 Sep 2008) | 4 lines

When a call is rejected because of call-limit, the channel driver is behaving
as expected, so we shouldn't report it as an error.  Change to LOG_NOTICE
instead.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 14:43:01 +00:00
Jeff Peeler
f86752e905 Merged revisions 140491 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140491 | jpeeler | 2008-08-29 12:53:32 -0500 (Fri, 29 Aug 2008) | 2 lines

Added the option s to the Park application which will silence the announcement of the parking space number. Also, fixes the bug of just clearing the flags instead of actually parsing the arguments to Park.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140492 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 17:55:14 +00:00
Mark Michelson
6ed6a5ae29 Merged revisions 140489 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140489 | mmichelson | 2008-08-29 12:47:17 -0500 (Fri, 29 Aug 2008) | 30 lines

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

........
r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines

After working on the ao2_containers branch, I noticed
something a bit strange. In all cases where we provide
a callback function to ao2_container_alloc, the callback
function would only return 0 or CMP_MATCH. After inspecting
the ao2_callback() code carefully, I found that if you're
only looking for one specific item, then you should return
CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue
traversing the current bucket until the end searching for
more matches.

In cases like chan_iax2 where in 1.4, all the peers are
shoved into a single bucket, this makes for potentially
terrible performance since the entire bucket will be
traversed even if the peer is one of the first ones come
across in the bucket.

All the changes I have made were for cases where the 
callback function defined was passed to ao2_container_alloc
so that calls to ao2_find could find a unique instance
of whatever object was being stored in the container.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 17:48:07 +00:00
Mark Michelson
5b5666c301 Merged revisions 140433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140433 | mmichelson | 2008-08-29 11:24:37 -0500 (Fri, 29 Aug 2008) | 10 lines

Allow for video files to be opened as well as
audio files.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 16:25:46 +00:00
Mark Michelson
b8520de916 Merged revisions 140422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140422 | mmichelson | 2008-08-29 11:06:09 -0500 (Fri, 29 Aug 2008) | 20 lines

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

........
r140421 | mmichelson | 2008-08-29 11:01:07 -0500 (Fri, 29 Aug 2008) | 12 lines

Add context checking when retrieving a vm_state.
This was causing a problem for people who had identically
named mailboxes in separate voicemail contexts.
This commit affects IMAP storage only.

(closes issue #13194)
Reported by: moliveras
Patches:
      13194.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 16:11:50 +00:00
Mark Michelson
41b37a348f Merged revisions 140418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140418 | mmichelson | 2008-08-29 10:32:02 -0500 (Fri, 29 Aug 2008) | 18 lines

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

........
r140417 | mmichelson | 2008-08-29 10:26:52 -0500 (Fri, 29 Aug 2008) | 10 lines

Fix SIP's parsing so that if a port is specified
in a string to Dial(), it is not ignored.

(closes issue #13355)
Reported by: acunningham
Patches:
      13355v2.patch uploaded by putnopvut (license 60)
Tested by: acunningham


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140420 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 15:33:49 +00:00
Tilghman Lesher
9a53ace006 Blocked revisions 140355 via svnmerge
........
r140355 | tilghman | 2008-08-27 18:23:56 -0500 (Wed, 27 Aug 2008) | 2 lines

Oops

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140357 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 23:25:23 +00:00
Mark Michelson
22ca4c9392 Merged revisions 140301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140301 | mmichelson | 2008-08-27 15:11:22 -0500 (Wed, 27 Aug 2008) | 19 lines

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

........
r140299 | mmichelson | 2008-08-27 14:49:20 -0500 (Wed, 27 Aug 2008) | 11 lines

Fix tag checking in get_sip_pvt_byid_locked when
in pedantic mode. The problem was that the wrong
tags would be compared depending on the direction
of the call.

(closes issue #13353)
Reported by: flefoll
Patches:
      chan_sip.c.br14.139015.patch-refer-pedantic uploaded by flefoll (license 244)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 20:14:24 +00:00
Jeff Peeler
d0f43c3266 Merged revisions 140205 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140205 | jpeeler | 2008-08-26 13:48:55 -0500 (Tue, 26 Aug 2008) | 17 lines

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

........
r140056 | jpeeler | 2008-08-26 10:57:02 -0500 (Tue, 26 Aug 2008) | 9 lines

(closes issue #12071)
Reported by: tzafrir
Patches:
      dahdi_close.diff uploaded by tzafrir (license 46)
Tested by: tzafrir, jpeeler

This patch fixes closing open file descriptors in the case of an error.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:50:47 +00:00
Tilghman Lesher
e866ee840f Blocked revisions 140201 via svnmerge
........
r140201 | tilghman | 2008-08-26 13:46:07 -0500 (Tue, 26 Aug 2008) | 2 lines

OpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:47:51 +00:00
Tilghman Lesher
7ea8a1943e Blocked revisions 140201 via svnmerge
........
r140201 | tilghman | 2008-08-26 13:46:07 -0500 (Tue, 26 Aug 2008) | 2 lines

OpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:47:27 +00:00
Russell Bryant
0721736fb8 Merged revisions 140169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140169 | russell | 2008-08-26 13:11:49 -0500 (Tue, 26 Aug 2008) | 4 lines

Fix building menuselect-tree with PRINT_DIR set.  We _must_ use the --quiet
flag here, or else some arbitrary text will end up in the resulting
menuselect-tree file and things will explode.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:12:24 +00:00
Russell Bryant
b2039fd988 Merged revisions 140061 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140061 | russell | 2008-08-26 11:10:06 -0500 (Tue, 26 Aug 2008) | 14 lines

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

........
r140060 | russell | 2008-08-26 11:07:58 -0500 (Tue, 26 Aug 2008) | 6 lines

Fix some bogus scheduler usage in chan_sip.  This code used the return value
of a completely unrelated function to determine whether the scheduler should
be run or not.  This would have caused the scheduler to not run in cases where
it should have.  Also, leave a note about another scheduler issue that needs
to be addressed at some point.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 16:11:23 +00:00
Steve Murphy
d3110eacca Blocked revisions 140057 via svnmerge
........
r140057 | murf | 2008-08-26 09:57:49 -0600 (Tue, 26 Aug 2008) | 21 lines

(closes issue #13366)
Reported by: erousseau

This was a reasonable enhancement request, which was
easy to implement. Since it's an enhancement, it 
could only be applied to trunk.

Basically, for accounting where "initiated" seconds
are billed for, if the microseconds field on the end
time is greater than the microseconds field for the
answer time, add one second to the billsec field.

The implementation was requested by erousseau, and
I've implemented it as requested. I've updated the
CHANGES, the cdr.conf.sample, and the .h files
accordingly, to accept and set a flag for the
corresponding new option. cdr.c adds in the extra
second based on the usec fields if the option is
set. Tested, seems to be working fine.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 16:01:37 +00:00
Russell Bryant
192e6166df Merged revisions 140053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140053 | russell | 2008-08-26 10:29:25 -0500 (Tue, 26 Aug 2008) | 23 lines

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

........
r140051 | russell | 2008-08-26 10:27:23 -0500 (Tue, 26 Aug 2008) | 15 lines

Fix a race condition with the IAX scheduler thread.  A lock and condition are
used here to allow newly scheduled tasks to wake up the scheduler just in case
the new task needs to run sooner than the current wakeup time when the thread
is sleeping.  However, there was a race condition such that a newly scheduled
task would not properly wake up the scheduler or affect the wake up period.
The order of execution would have been:

  1) Scheduler thread determines wake up time of N ms.
  2) Another thread schedules a task and signals the condition, with an
     execution time of < N ms.
  3) Scheduler thread locks and goes to sleep for N ms.

By moving the sleep time determination to inside the critical section, this
possibility is avoided.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 15:31:13 +00:00
Tilghman Lesher
909fbe8947 Blocked revisions 139981 via svnmerge
........
r139981 | tilghman | 2008-08-25 18:13:32 -0500 (Mon, 25 Aug 2008) | 7 lines

Optional light colored background, for those who use black on white terminals.
(closes issue #13306)
 Reported by: Corydon76
 Patches: 
       20080814__bug13306__3.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76, pkempgen

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 23:14:44 +00:00
Jeff Peeler
f7d3198c30 Merged revisions 139928 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139928 | jpeeler | 2008-08-25 16:48:51 -0500 (Mon, 25 Aug 2008) | 11 lines

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

........
r139927 | jpeeler | 2008-08-25 16:47:33 -0500 (Mon, 25 Aug 2008) | 3 lines

Fix a typo I made. Lesson learned, apply the patch if one exists.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:49:34 +00:00
Sean Bright
9285cf8c21 Merged revisions 139915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139915 | seanbright | 2008-08-25 17:32:10 -0400 (Mon, 25 Aug 2008) | 17 lines

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

........
r139909 | seanbright | 2008-08-25 17:31:03 -0400 (Mon, 25 Aug 2008) | 9 lines

Some versions of awk (nawk, for example) don't like empty regular expressions
so be slightly more verbose.

(closes issue #13374)
Reported by: dougm
Patches:
      13374.diff uploaded by seanbright (license 71)
Tested by: dougm

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:34:23 +00:00
Terry Wilson
02c6a57fdc Merged revisions 139870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139870 | twilson | 2008-08-25 15:59:58 -0500 (Mon, 25 Aug 2008) | 10 lines

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

........
r139869 | twilson | 2008-08-25 15:46:10 -0500 (Mon, 25 Aug 2008) | 2 lines

Make SIPADDHEADER() propagate indefinitely

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139874 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:13:22 +00:00
Mark Michelson
7ac4804866 Blocked revisions 139832 via svnmerge
........
r139832 | mmichelson | 2008-08-25 12:24:02 -0500 (Mon, 25 Aug 2008) | 10 lines

Add output of variables to AgentRingNoAnswer manager
event if eventwhencalled is set to "vars" in 
queues.conf. Yay for consistency.

(closes issue #13369)
Reported by: srt
Patches:
      13369_agentringnoanswer_variables.diff uploaded by srt (license 378)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 17:25:09 +00:00
Steve Murphy
dfe7bf451a Merged revisions 139770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139770 | murf | 2008-08-25 09:54:18 -0600 (Mon, 25 Aug 2008) | 17 lines

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

........
r139764 | murf | 2008-08-25 09:33:14 -0600 (Mon, 25 Aug 2008) | 9 lines

This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference. 

I will un-close 13251.

Back to the drawing board/ concept/ beginning/ whatever!



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 16:05:30 +00:00
Tilghman Lesher
ae7db3f23d Blocked revisions 139775 via svnmerge
........
r139775 | tilghman | 2008-08-25 11:02:56 -0500 (Mon, 25 Aug 2008) | 7 lines

Realtime capabilities for the Find-Me-Follow-Me application.
(closes issue #13295)
 Reported by: Corydon76
 Patches: 
       20080813__followme_realtime_enabled.diff.txt uploaded by Corydon76 (license 14)
 Tested by: dferrer

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 16:04:06 +00:00
Mark Michelson
1dd5db618b Blocked revisions 139771 via svnmerge
................
r139771 | mmichelson | 2008-08-25 10:55:10 -0500 (Mon, 25 Aug 2008) | 19 lines

Blocked revisions 139769 via svnmerge

........
r139769 | mmichelson | 2008-08-25 10:52:59 -0500 (Mon, 25 Aug 2008) | 12 lines

Fix the logic in config_text_file_save so that if an
UpdateConfig manager action is issued and the
file specified in DstFileName does not yet exist,
an error is not returned.

(closes issue #13341)
Reported by: vadim
Patches:
      13341.patch uploaded by putnopvut (license 60)
	  (with small modification from seanbright)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 15:55:56 +00:00
Tilghman Lesher
829eca6a49 Merged revisions 139707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139707 | tilghman | 2008-08-24 11:26:48 -0500 (Sun, 24 Aug 2008) | 2 lines

Memory leak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-24 16:36:09 +00:00
Tilghman Lesher
964eb15bbe Blocked revisions 139704 via svnmerge
........
r139704 | tilghman | 2008-08-24 11:23:15 -0500 (Sun, 24 Aug 2008) | 2 lines

Eliminate open coding of ast_str

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-24 16:24:35 +00:00
Steve Murphy
37d5dcdfa9 Merged revisions 139662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139662 | murf | 2008-08-22 16:32:35 -0600 (Fri, 22 Aug 2008) | 14 lines

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

........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines

I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:37:08 +00:00
Steve Murphy
41138ad333 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.1@139629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:15:36 +00:00
Jeff Peeler
2090a58d2e Merged revisions 139624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139624 | jpeeler | 2008-08-22 16:57:32 -0500 (Fri, 22 Aug 2008) | 13 lines

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

........
r139621 | jpeeler | 2008-08-22 16:36:13 -0500 (Fri, 22 Aug 2008) | 5 lines

(closes issue #13359)
Reported by: Laureano
Patches:
      originate_channel_check.patch uploaded by Laureano (license 265)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 21:58:38 +00:00
Jeff Peeler
13a4d48c7c Merged revisions 139622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139622 | jpeeler | 2008-08-22 16:52:20 -0500 (Fri, 22 Aug 2008) | 1 line

remove extra comma typo
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 21:53:57 +00:00
Mark Michelson
769e874125 Merged revisions 139563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139563 | mmichelson | 2008-08-22 15:20:58 -0500 (Fri, 22 Aug 2008) | 15 lines

The -1 return value from incomplete or improper
headers for the SipNotify manager command was
causing the current manager session to become
disconnected. Change the return value to 0 for
these cases.

Also change a test for a NULL pointer to be
ast_strlen_zero instead.

(closes issue #13351)
Reported by: Laureano
Patches:
      sipnotify_action_fix.patch uploaded by Laureano (license 265)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:21:49 +00:00
Mark Michelson
bb9dfd155c Merged revisions 139558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139558 | mmichelson | 2008-08-22 15:02:35 -0500 (Fri, 22 Aug 2008) | 9 lines

Add missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
manager events

(closes issue #13358)
Reported by: srt
Patches:
      13358_parking_events.diff uploaded by srt (license 378)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:03:55 +00:00
Mark Michelson
8fedd0288d Merged revisions 139554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139554 | mmichelson | 2008-08-22 14:45:41 -0500 (Fri, 22 Aug 2008) | 16 lines

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

........
r139553 | mmichelson | 2008-08-22 14:45:19 -0500 (Fri, 22 Aug 2008) | 8 lines

Fix compilation when DEBUG_THREAD_LOCALS is selected

(closes issue #13298)
Reported by: snuffy
Patches:
      bug13298_20080822.diff uploaded by snuffy (license 35)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 19:46:33 +00:00
Mark Michelson
b814413ab3 Blocked revisions 139525 via svnmerge
................
r139525 | mmichelson | 2008-08-22 14:24:26 -0500 (Fri, 22 Aug 2008) | 15 lines

Blocked revisions 139521 via svnmerge

........
r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines

Remove show_frame_stats_deprecated since it is not
used anywhere and causes build errors if building under
dev-mode with TRACE_FRAMES selected in menuselect.

(closes issue #13362)
Reported by: snuffy


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 19:25:31 +00:00
Mark Michelson
2b05a594fa Merged revisions 139469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139469 | mmichelson | 2008-08-22 12:25:12 -0500 (Fri, 22 Aug 2008) | 11 lines

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

........
r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines

Fix the build. Thanks, mvanbaak!


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 17:26:03 +00:00
Mark Michelson
9a3fe578f5 Merged revisions 139457 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139457 | mmichelson | 2008-08-22 11:58:21 -0500 (Fri, 22 Aug 2008) | 15 lines

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

........
r139456 | mmichelson | 2008-08-22 11:57:38 -0500 (Fri, 22 Aug 2008) | 7 lines

Prevent a deadlock in chan_iax2 resulting from
incorrect locking order between iax2_pvt and
ast_channel structures.

AST-13


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 16:59:30 +00:00
Jeff Peeler
bff052c3ea Merged revisions 139391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139391 | jpeeler | 2008-08-21 18:41:50 -0500 (Thu, 21 Aug 2008) | 11 lines

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

........
r139387 | jpeeler | 2008-08-21 18:39:31 -0500 (Thu, 21 Aug 2008) | 3 lines

Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart.
(closes issue #11017)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139399 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 23:44:18 +00:00
Russell Bryant
de5301d4f6 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.1@139217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:19:33 +00:00
Jason Parker
925be65d2e Merged revisions 139210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139210 | qwell | 2008-08-20 17:06:40 -0500 (Wed, 20 Aug 2008) | 7 lines

Fix output of sipshowpeer manager response.

(closes issue #13346)
Reported by: srt
Patches:
      13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:07:47 +00:00
Steve Murphy
7907def3f4 Merged revisions 139083 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139083 | murf | 2008-08-20 11:25:07 -0600 (Wed, 20 Aug 2008) | 20 lines

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

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines


(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 17:34:53 +00:00
Michiel van Baak
51f8cead0f Blocked revisions 139020 via svnmerge
........
r139020 | mvanbaak | 2008-08-20 18:16:53 +0200 (Wed, 20 Aug 2008) | 4 lines

fix unholding phones after hangup on older cisco phones.

Patch by wedhorn.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 16:19:49 +00:00
Mark Michelson
3c0fbfd326 Merged revisions 139016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139016 | mmichelson | 2008-08-20 10:38:47 -0500 (Wed, 20 Aug 2008) | 14 lines

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

........
r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines

sip_read should properly handle a NULL return from sip_rtp_read.

(closes issue #13257)
Reported by: travishein


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 15:39:39 +00:00
Mark Michelson
513a09dbcd Merged revisions 138943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138943 | mmichelson | 2008-08-19 18:19:40 -0500 (Tue, 19 Aug 2008) | 19 lines

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

........
r138942 | mmichelson | 2008-08-19 18:17:17 -0500 (Tue, 19 Aug 2008) | 11 lines

Reset agent_pvt variables back to the values in agents.conf
(from what the corresponding channel variables were set to)
when the agent logs out.

(closes issue #13098)
Reported by: davidw
Patches:
      20080731__issue13098_agent_ackcall_not_reset.diff uploaded by bbryant (license 36)
Tested by: davidw


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 23:21:20 +00:00
Mark Michelson
c4cd8ee947 Merged revisions 138887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138887 | mmichelson | 2008-08-19 13:52:04 -0500 (Tue, 19 Aug 2008) | 31 lines

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

........
r138886 | mmichelson | 2008-08-19 13:50:53 -0500 (Tue, 19 Aug 2008) | 23 lines

Add a lock and unlock prior to the destruction of the chanspy_ds
lock to ensure that no other threads still have it locked. While
this should not happen under normal circumstances, it appears that
if the spyer and spyee hang up at nearly the same time, the following
may occur.

1. ast_channel_free is called on the spyee's channel.
2. The chanspy datastore is removed from the spyee's channel in 
   ast_channel_free.
3. In the spyer's thread, the spyer attempts to remove and destroy the datastore
   from the spyee channel, but the datastore has already been removed in step 2, 
   so the spyer continues in the code.
4. The spyee's thread continues and calls the datastore's destroy callback, 
   chanspy_ds_destroy. This involves locking the chanspy_ds.
5. Now the spyer attempts to destroy the chanspy_ds lock. The problem is that in step 4, 
   the spyee has locked this lock, meaning that the spyer is attempting to destroy a lock 
   which is currently locked by another thread.

The backtrace provided in issue #12969 supports the idea that this is possible
(and has even occurred). This commit does not close the issue, but should help
in preventing one type of crash associated with the use of app_chanspy.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 18:53:22 +00:00
Steve Murphy
e5fa8246e7 Merged revisions 138845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138845 | murf | 2008-08-19 10:31:24 -0600 (Tue, 19 Aug 2008) | 1 line

Oops. put a decl in a generated file. My bad, but fixed now.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 17:01:43 +00:00
Michiel van Baak
fc3434d16d Blocked revisions 138851 via svnmerge
........
r138851 | mvanbaak | 2008-08-19 18:56:50 +0200 (Tue, 19 Aug 2008) | 8 lines

chan_skinny now respects callwaiting=no

(closes issue #12691)
Reported by: sbisker
Patches:
      callwaitingv1.diff uploaded by wedhorn (license 30)
Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 17:00:31 +00:00
Steve Murphy
7af40ac1a1 Merged revisions 138815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138815 | murf | 2008-08-19 09:59:12 -0600 (Tue, 19 Aug 2008) | 19 lines

These changes are in regards to bug 13249, where users are being surprised by the changes made
to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if
they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x 
installation where a "make samples" was executed, or where they hand-edited the 
asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher).

(this commit does not totally solve 13249, at least not yet)

The change involves issueing a single warning while the AEL file is loading, if:
 1. app_set is present in the config file, and set to 1.6 or higher.
 2. there are double quotes in an assignment statement (eg x = "hi there";)
 3. the warning was not already issued.

The standalone app, aelparse, does not (yet) issue this warning. I'd have to
have it read in the asterisk.conf file, and that's a bit of hassle. I'll add
it if users request it, tho.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:59:08 +00:00
Sean Bright
e68b9c8b56 Merged revisions 138778-138780 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138778 | seanbright | 2008-08-18 20:08:27 -0400 (Mon, 18 Aug 2008) | 1 line

While we're at it, make this machine parseable too.
........
r138779 | seanbright | 2008-08-18 20:09:38 -0400 (Mon, 18 Aug 2008) | 1 line

And remove code we don't need anymore.
........
r138780 | seanbright | 2008-08-18 20:10:56 -0400 (Mon, 18 Aug 2008) | 1 line

Let it compile now, too (woops)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:17:11 +00:00
Sean Bright
e1298fd126 Merged revisions 138775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138775 | seanbright | 2008-08-18 19:42:36 -0400 (Mon, 18 Aug 2008) | 3 lines

Change event header to RegistrationTime to be more consistent (and avoid
breaking existing frameworks).  Pointed out by Laureano on #asterisk-dev.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 23:44:38 +00:00