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.0@140302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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.0@140170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
................
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.0@140062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
........
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.0@140058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
................
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.0@140054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
........
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.0@139833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
................
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.0@139772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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.0@139671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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
........
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.0@139564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
................
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.0@139528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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
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.0@139104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
................
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.0@138889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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.0@138846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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.0@138781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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
https://origsvn.digium.com/svn/asterisk/trunk
........
r138482 | seanbright | 2008-08-17 10:12:11 -0400 (Sun, 17 Aug 2008) | 6 lines
Move Uniqueid to the end of the event for those that rely on the position
of the name/value pairs, pointed out by snuffy-home on #asterisk-commits.
For those of you who rely on the position of name/value pairs in manager
events... stop... that is why associative arrays were invented.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
