Commit Graph

547 Commits

Author SHA1 Message Date
Mark Michelson
64174167cb Port revisions 124661 and 123650 from trunk to 1.6.0
Thanks to Atis Lezdins for pointing this out on the asterisk-dev
mailing list



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 21:00:47 +00:00
Mark Michelson
1fbfd723e8 Merged revisions 125855 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125855 | mmichelson | 2008-06-27 11:16:13 -0500 (Fri, 27 Jun 2008) | 5 lines

Ensure the thread-safety of the monexec variable in app_queue.

Thanks to Russell for pointing out the problem


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:19:16 +00:00
Mark Michelson
a8979176c1 SENTINEL is not defined in 1.6.0
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 01:09:04 +00:00
Mark Michelson
b43587a16e Merged revisions 125666 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125666 | mmichelson | 2008-06-26 19:22:03 -0500 (Thu, 26 Jun 2008) | 3 lines

Make this compile with dev-mode on


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 00:22:23 +00:00
Mark Michelson
6250e77c59 Merged revisions 125649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125649 | mmichelson | 2008-06-26 19:15:54 -0500 (Thu, 26 Jun 2008) | 15 lines

The monitor-join option for queues was deprecated in favor of using
MixMonitor to mix audio. However, it was pointed out to me that because
of this, the command set for the MONITOR_EXEC variable is ignored as well.
This means that people can't do their own custom mixing commands at the end
of recordings in order to make, for instance, stereo recordings of calls.

With this patch, app_queue will set the "joinfiles" variable for the channel's
monitor if MONITOR_EXEC is not zero-length. This means that for normal audio
mixing, MixMonitor is still the preferred choice, but we allow custom
mixing to be done with the two Monitor streams if desired.

(closes issue #12923)
Reported by: snyfer


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 00:17:39 +00:00
Mark Michelson
74e07ac0aa Merged revisions 125591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125591 | mmichelson | 2008-06-26 18:06:18 -0500 (Thu, 26 Jun 2008) | 3 lines

Fix a really stupid mistake


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:06:47 +00:00
Mark Michelson
9152577c24 Merged revisions 125586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125586 | mmichelson | 2008-06-26 18:01:02 -0500 (Thu, 26 Jun 2008) | 19 lines

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

........
r125585 | mmichelson | 2008-06-26 17:52:39 -0500 (Thu, 26 Jun 2008) | 11 lines

Add the interface of a queue member to the output of the "queue show" command
so that it can easily be associated with a queue member's name. This helps
so that the appropriate queue member can be removed or paused since the 
interface is required, not the member's name.

(closes issue #12783)
Reported by: davevg
Patches:
      app_queue.diff uploaded by davevg (license 209) with small mod from me


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:04:12 +00:00
Mark Michelson
6d89f9ac86 Merged revisions 125531 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125531 | mmichelson | 2008-06-26 17:03:54 -0500 (Thu, 26 Jun 2008) | 17 lines

Blocked revisions 125530 via svnmerge

........
r125530 | mmichelson | 2008-06-26 17:02:55 -0500 (Thu, 26 Jun 2008) | 10 lines

Backport of attended transfer queue_log patch from trunk.

This patch allows for attended transfers to be logged in the
queue_log the same way that blind transfers have always been.

It was decided by popular opinion on the asterisk-dev mailing
list that this should be backported to 1.4. Thanks to everyone
who gave an opinion.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 22:06:20 +00:00
Mark Michelson
3f71d4600e Merged revisions 125477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125477 | mmichelson | 2008-06-26 15:57:41 -0500 (Thu, 26 Jun 2008) | 19 lines

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

........
r125476 | mmichelson | 2008-06-26 15:56:01 -0500 (Thu, 26 Jun 2008) | 11 lines

Prior to this patch, the "queue show" command used cached
information for realtime queues instead of giving up-to-date
info. Now realtime is queried for the latest and greatest in
queue info.

(closes issue #12858)
Reported by: bcnit
Patches:
      queue_show.patch uploaded by putnopvut (license 60)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 20:58:48 +00:00
Mark Michelson
c0c3e2cde9 Merged revisions 123652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r123652 | mmichelson | 2008-06-18 10:08:56 -0500 (Wed, 18 Jun 2008) | 7 lines

A portion of the code which handled the 'c' queue option had been
removed. No telling when it happened. Anyway, it's back in now
and works properly.

(Based on issue reported on mailing list)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-18 15:09:19 +00:00
Jeff Peeler
f089bbf663 Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-17 18:08:09 +00:00
Mark Michelson
8c4f56f424 Merged revisions 123275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r123275 | mmichelson | 2008-06-17 10:57:43 -0500 (Tue, 17 Jun 2008) | 20 lines

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

........
r123274 | mmichelson | 2008-06-17 10:56:55 -0500 (Tue, 17 Jun 2008) | 12 lines

davidw pointed out that the holdtime calculation used by
app_queue does not use "boxcar" filtering as the comments
say. The term "boxcar" means that the number of samples used
to calculate stays constant, with new samples replacing the
oldest ones. The queue holdtime calculation uses all holdtime
samples collected since the queue was loaded, so the comment
has been changed to be accurate.

(closes issue #12781)
Reported by: davidw


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-17 15:58:21 +00:00
Steve Murphy
3a1b062a16 Merged revisions 123165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r123165 | murf | 2008-06-16 14:43:46 -0600 (Mon, 16 Jun 2008) | 19 lines

(closes issue #12689)
Reported by: ys

Many thanks to ys for doing the research on this problem.
I didn't think it would be best to unlock the contexts
and then relock them after the remove_extension2() call,
so I added an extra arg to remove_extension2() and set it
appropriately in each call. There were not that many.

I considered forcing the code to lock the contexts before
the call to remove_extension2(), but that would require
a slightly greater degree of changes, especially since
the find_context_locked is local to pbx.c

I did a simple sanity test to make sure the code doesn't
mess things up in general.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-16 21:19:23 +00:00
Mark Michelson
d8873c2856 Merged revisions 122312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r122312 | mmichelson | 2008-06-12 13:53:17 -0500 (Thu, 12 Jun 2008) | 17 lines

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

........
r122311 | mmichelson | 2008-06-12 13:50:58 -0500 (Thu, 12 Jun 2008) | 9 lines

Properly play a holdtime message if the announce-holdtime option is
set to "once."

(closes issue #12842)
Reported by: ramonpeek
Patches:
      patch001.diff uploaded by ramonpeek (license 266)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@122313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-12 18:54:01 +00:00
Mark Michelson
a067ee471a Merged revisions 120514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r120514 | mmichelson | 2008-06-04 17:07:37 -0500 (Wed, 04 Jun 2008) | 14 lines

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

........
r120513 | mmichelson | 2008-06-04 17:05:33 -0500 (Wed, 04 Jun 2008) | 6 lines

Make sure that the string we set will survive the unref of
the queue member.

Thanks to Russell, who pointed this out.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@120515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-04 22:08:09 +00:00
Mark Michelson
d192aa7cca Merged revisions 120286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r120286 | mmichelson | 2008-06-04 09:12:45 -0500 (Wed, 04 Jun 2008) | 15 lines

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

........
r120285 | mmichelson | 2008-06-04 09:11:12 -0500 (Wed, 04 Jun 2008) | 7 lines

Tab completion when removing a member should give the member's interface,
not the name, since the interface is what is expected for the command.

(closes issue #12783)
Reported by: davevg


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@120287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-04 14:13:23 +00:00
Tilghman Lesher
1db927c186 Merged revisions 119419 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r119419 | tilghman | 2008-05-30 16:23:14 -0500 (Fri, 30 May 2008) | 14 lines

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

........
r119404 | tilghman | 2008-05-30 16:17:45 -0500 (Fri, 30 May 2008) | 6 lines

When joinempty=strict, it only failed on join if there were busy members.  If
all members were logged out OR paused, then it (incorrectly) let callers join
the queue.
(closes issue #12451)
 Reported by: davidw

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@119420 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-30 21:24:01 +00:00
Jason Parker
fc07d2e1b7 Merged revisions 115705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r115705 | qwell | 2008-05-12 11:35:50 -0500 (Mon, 12 May 2008) | 1 line

Correctly document state interface for AddQueueMember.  Discovered while looking at issue #12626.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-12 16:36:24 +00:00
Mark Michelson
cb62c9cba8 Merged revisions 115321 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r115321 | mmichelson | 2008-05-05 16:43:21 -0500 (Mon, 05 May 2008) | 21 lines

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

........
r115320 | mmichelson | 2008-05-05 16:41:34 -0500 (Mon, 05 May 2008) | 13 lines

Don't consider a caller "handled" until the caller is bridged with
a queue member. There was too much of an opportunity for the member
to hang up (either during a delay, announcement, or overly long
agi) between the time that he answered the phone and the time when
he actually was bridged with the caller. The consequence of this
was that if the member hung up in that interval, then proper
abandonment details would not be noted in the queue log if the caller
were to hang up at any point after the member hangup.

(closes issue #12561)
Reported by: ablackthorn


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-05 21:44:04 +00:00
Mark Michelson
ec4819f368 Merged revisions 114849 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114849 | mmichelson | 2008-04-29 14:42:04 -0500 (Tue, 29 Apr 2008) | 22 lines

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

........
r114848 | mmichelson | 2008-04-29 14:40:06 -0500 (Tue, 29 Apr 2008) | 14 lines

Use the MACRO_CONTEXT and MACRO_EXTEN channel variables instead of the channel's macrocontext
and macroexten fields. This is needed because if macros are daisy-chained, the incorrect 
context and extension are placed on the new channel. I also added locking to the channel prior
to accessing these variables as noted in trunk's janitor project file.


(closes issue #12549)
Reported by: darren1713
Patches:
      app_queue.c.macroextenpatch uploaded by darren1713 (license 116)
	       (with modifications from me)
Tested by: putnopvut


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 19:42:43 +00:00
Mark Michelson
9ebf88ab3d Merged revisions 114629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114629 | mmichelson | 2008-04-24 15:43:52 -0500 (Thu, 24 Apr 2008) | 16 lines

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

........
r114628 | mmichelson | 2008-04-24 15:43:03 -0500 (Thu, 24 Apr 2008) | 8 lines

Output of channel variables when eventwhencalled=vars was set
was being truncated two characters. This patch corrects the
problem.

(closes issue #12493)
Reported by: davidw


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 20:44:37 +00:00
Jason Parker
8ec76fdc91 Merged revisions 114540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r114540 | qwell | 2008-04-22 13:14:09 -0500 (Tue, 22 Apr 2008) | 8 lines

Allow setqueuevar=yes (et al) to work, after changes to pbx_builtin_setvar()

(closes issue #12490)
Reported by: bcnit
Patches:
      12490-queuevars-3.diff uploaded by qwell (license 4)
Tested by: qwell

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-22 18:14:44 +00:00
Jason Parker
d98b6009ce Merged revisions 114134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114134 | qwell | 2008-04-15 11:18:38 -0500 (Tue, 15 Apr 2008) | 16 lines

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

........
r114133 | qwell | 2008-04-15 11:18:08 -0500 (Tue, 15 Apr 2008) | 8 lines

Allow autofill to work in the general section of queues.conf.
Additionally, don't try to (re)set options when they have empty values in realtime (all unset columns would have an empty value).

(closes issue #12445)
Reported by: atis
Patches:
      12445-autofill.diff uploaded by qwell (license 4)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-15 16:19:06 +00:00
Mark Michelson
96e74f94f0 Merged revisions 114113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114113 | mmichelson | 2008-04-14 11:25:09 -0500 (Mon, 14 Apr 2008) | 17 lines

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

........
r114112 | mmichelson | 2008-04-14 11:24:22 -0500 (Mon, 14 Apr 2008) | 9 lines

If the datastore has been moved to another channel due to a masquerade, then
freeing the datastore here causes an eventual double free when the new channel
hangs up. We should only free the datastore if we were able to successfully remove
it from the channel we are referencing (i.e. the datastore was not moved).

(closes issue #12359)
Reported by: pguido


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-14 16:25:57 +00:00
Mark Michelson
3dd87d6d77 Merged revisions 113980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r113980 | mmichelson | 2008-04-09 17:32:32 -0500 (Wed, 09 Apr 2008) | 8 lines

Fix a crash that happened due to accessing free'd memory

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@113982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-09 22:34:04 +00:00
Mark Michelson
bb75d40666 Merged revisions 112394 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r112394 | mmichelson | 2008-04-02 09:32:43 -0500 (Wed, 02 Apr 2008) | 14 lines

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

........
r112393 | mmichelson | 2008-04-02 09:32:00 -0500 (Wed, 02 Apr 2008) | 6 lines

Ensure that there is no timeout if none is specified.

(closes issue #12349)
Reported by: johnlange


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-02 14:33:33 +00:00
Joshua Colp
0ee953a249 Merged revisions 111565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r111565 | file | 2008-03-27 21:55:47 -0300 (Thu, 27 Mar 2008) | 2 lines

Forgetting to unregister a manager action is bad, mmmk?

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@111566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-28 00:56:44 +00:00
Mark Michelson
ec8ef5229c Merged revisions 111533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r111533 | mmichelson | 2008-03-27 19:12:52 -0500 (Thu, 27 Mar 2008) | 10 lines

Fix a crash that would happen when attempting to unload the app_queue module.

The problem was that when the refcount on the queue hit 0, the destructor was
called, and inside the destructor, another function was called which would increase
the refcount back to 1 again and then decrease it again back to 0 for every member
in the queue. This meant that the destructor was being recursively called, leading
to a double free of the queue. This is now fixed by making sure to unlink the
queue from the queues container prior to the final unref of the queue.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@111534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-28 00:17:17 +00:00
Mark Michelson
3431f1483a Merged revisions 109714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109714 | mmichelson | 2008-03-18 15:59:02 -0500 (Tue, 18 Mar 2008) | 20 lines

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

........
r109713 | mmichelson | 2008-03-18 15:52:15 -0500 (Tue, 18 Mar 2008) | 12 lines

This patch makes it so that all queue member status changes are handled through device state
code. This removes several problems people were seeing where their queue members would get into
an "unknown" state. Huge props go to atis on this one since he was the one who found the code
section that was causing the problem and proposed the solution. I just wrote what he suggested :)

(closes issue #12127)
Reported by: atis
Patches:
      12127v3.patch uploaded by putnopvut (license 60)
Tested by: atis, jvandal


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 21:03:52 +00:00
Russell Bryant
4af367c3a9 Merged revisions 109447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r109447 | twilson | 2008-03-18 10:43:34 -0500 (Tue, 18 Mar 2008) | 3 lines

Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not
actual problems, per se.  I also added format attributes to any printf wrapper functions I found that didn't have them.  -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 15:58:50 +00:00
Mark Michelson
1036d0869d Merged revisions 107068 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107068 | mmichelson | 2008-03-10 10:45:13 -0500 (Mon, 10 Mar 2008) | 10 lines

app_queue has now been doxygenified thanks to snuffy! The ony thing I changed
was the way that locks are referenced, since the old 1.2 names were still used
in the comments.

(closes issue #11997)
Reported by: snuffy
Patches:
      bug_11997_queue_doxy.diff uploaded by snuffy (license 35)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-10 15:46:39 +00:00
Russell Bryant
e09e677a81 Merged revisions 105841 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105841 | tilghman | 2008-03-04 17:10:45 -0600 (Tue, 04 Mar 2008) | 2 lines

Fix minor misuses of snprintf

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:15:02 +00:00
Mark Michelson
f0379886c5 Merged revisions 105059 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r105059 | mmichelson | 2008-02-28 14:11:57 -0600 (Thu, 28 Feb 2008) | 6 lines

When using autofill, members who are in use should be counted towards the 
number of available members to call if ringinuse is set to yes.

Thanks to jmls who brought this issue up on IRC


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-28 20:14:38 +00:00
Mark Michelson
caeb435271 Merged revisions 103956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103956 | mmichelson | 2008-02-20 16:32:22 -0600 (Wed, 20 Feb 2008) | 8 lines

Clear up confusion when viewing the QUEUE_WAITING_COUNT of a 
"dead" realtime queue. Since from the user's perspective, the queue
does exist, we shouldn't tell them we couldn't find the queue. Instead
since it is a dead queue, report a 0 waiting count

This issue was brought up on IRC by jmls


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-20 22:34:12 +00:00
Jason Parker
72bc8a7c7d Fix up some doxygen issues.
(closes issue #11996)
Patches:
      bug_11996_doxygen.diff uploaded by snuffy (license 35)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-15 17:29:08 +00:00
Mark Michelson
44810652d6 Change the queue holdtime announcement to happen at any interval (not just greater than two minutes). Remove
the saying of less-than for holdtime announcements since it can lead to awkward holdtime announcements. Using
'1' as a queue-round-seconds value is no longer valid.

(closes issue #9736)
Reported by: caio1982
Patches:
      queue_announce5.diff uploaded by caio1982 (license 22)
	  Tested by: caio1982, putnopvut


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-14 20:46:00 +00:00
Mark Michelson
84ecef76b8 Fix improper indentation. Thanks again to snuffy for pointing it out.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-11 03:03:58 +00:00
Mark Michelson
cd02fd2763 Add a couple of comments to clarify the unreffing of queues.
Thanks to snuffy for the idea.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-11 02:59:14 +00:00
Mark Michelson
52595c5d30 Forgot that AST_LIST_REMOVE_CURRENT takes different arguments in trunk than 1.4.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-08 18:58:25 +00:00
Mark Michelson
ba003e415b Merged revisions 103120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103120 | mmichelson | 2008-02-08 12:48:17 -0600 (Fri, 08 Feb 2008) | 10 lines

Prevent a potential three-thread deadlock. Also added a comment block
to explicitly state the locking order necessary inside app_queue.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-08 18:54:53 +00:00
Mark Michelson
f26fd8dac4 Add the channel's unique id to the AgentCalled manager event to make it more consistent
with other manager events.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-06 20:12:43 +00:00
Mark Michelson
267220d043 Remove an extra debug message I left in
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-06 00:08:58 +00:00
Mark Michelson
b0999f3bfa Forgot an !
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-31 22:12:50 +00:00
Mark Michelson
19d8ce4033 A change I made to accommodate the "linear" strategy in trunk caused queue strategies to
not be loaded from realtime queues. This commit fixes that.

Thanks to jmls for pointing this problem out to me on IRC.

This also contains some changes to S_OR where it should be used. Thanks to Qwell for pointing
these out.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-31 22:04:52 +00:00
Mark Michelson
815658d35e Handle the case of a NULL state_interface when checking a realtime member.
Thanks to jmls for finding this issue.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-31 21:31:15 +00:00
Mark Michelson
28b48d2214 Merged revisions 101216 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r101216 | mmichelson | 2008-01-30 09:23:00 -0600 (Wed, 30 Jan 2008) | 5 lines

Fix a logic error with regards to autofill. Prior to this change, it was possible
for a caller to go out of turn if autofill were enabled and callers ahead in the queue were attempting
to call a member. This change fixes this.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-30 15:27:14 +00:00
Mark Michelson
b719c2e5d2 Merged revisions 101035 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r101035 | mmichelson | 2008-01-29 17:02:03 -0600 (Tue, 29 Jan 2008) | 3 lines

Remove a memory leak from updating realtime queues


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-29 23:02:48 +00:00
Mark Michelson
105e0f6cf8 Merged revisions 100973 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r100973 | mmichelson | 2008-01-29 13:39:00 -0600 (Tue, 29 Jan 2008) | 6 lines

Fixing an erroneous return value returned when attempting to pause or unpause a queue member
fails.

Fixes BE-366, thanks to John Bigelow for writing the patch.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-29 19:41:42 +00:00
Mark Michelson
81fb790419 Insure that we are not going to pass a NULL pointer to add_to_interfaces.
(closes issue #11840)
Reported by: junky



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-25 14:53:09 +00:00
Mark Michelson
6d57a8c873 Adding the QUEUENAME variable to the variables set using the setqueuevar option
in queues.conf.

Suggestion comes from Shaun2222 on IRC.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-21 22:32:13 +00:00