Commit Graph

409 Commits

Author SHA1 Message Date
Mark Michelson eb39b71fba Added the ability to pause and unpause members via the CLI
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 21:23:32 +00:00
Mark Michelson c04887e428 Merged revisions 82346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82346 | mmichelson | 2007-09-13 15:16:37 -0500 (Thu, 13 Sep 2007) | 4 lines

Preemptively fixing a possible segfault. It is possible that queuename is NULL 
(meaning pause ALL queues), so use q->name instead.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 20:17:41 +00:00
Mark Michelson 10d22b6e13 Merged revisions 82326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82326 | mmichelson | 2007-09-13 11:25:59 -0500 (Thu, 13 Sep 2007) | 7 lines

Added logic to handle the unlikely case that someone has two queues with the same name.
Asterisk will log a warning message letting the user know that one was already defined with that
name and is it skipping all further instances. This also will work for realtime queues but in order
for that to happen, the user would have to trigger a perfectly timed reload as a realtime queue is being
looked up, which is highly unlikely (but taken care of nonetheless).


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 16:27:42 +00:00
Russell Bryant a0e8ee0a3d Fix a missing unref of a member struct. This was pointed out by Marta. Thanks!
This function in 1.4 didn't have the problem.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 13:34:24 +00:00
Mark Michelson 25e4377167 Removed an unneeded ao2_ref. This was a problem because unless get_member_status returned QUEUE_NORMAL, a NULL member
would be unreferenced. While this didn't cause any crashes or anything terrible, it still is incorrect



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12 21:17:45 +00:00
Mark Michelson 8cd1f2effc Merged revisions 82274 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82274 | mmichelson | 2007-09-12 09:24:53 -0500 (Wed, 12 Sep 2007) | 6 lines

We should only initialize a realtime queue when it is allocated, not every time we access it. This prevents the members ao2_container
from being reallocated every time the queue is accessed.

I also removed a debug message I had accidentally left in on a previous commit.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12 14:29:15 +00:00
Russell Bryant 38c2cd05fa Merged revisions 82267 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82267 | russell | 2007-09-11 17:37:17 -0500 (Tue, 11 Sep 2007) | 3 lines

Fix incorrect uses of ao2_find().  Every one of these calls was reading bogus
memory ...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 22:38:02 +00:00
Russell Bryant c0bcb9f218 Merged revisions 82263 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82263 | russell | 2007-09-11 15:49:34 -0500 (Tue, 11 Sep 2007) | 5 lines

Fix another missing unref of member objects.  This one was pointed out by Marta.
When building the outgoing list in try_calling(), a member reference is stored
in each outgoing entry.  However, when this list got destroyed, the reference
was not released.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 20:50:42 +00:00
Mark Michelson 88a1ae75d5 Merged revisions 82252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82252 | mmichelson | 2007-09-11 11:05:56 -0500 (Tue, 11 Sep 2007) | 6 lines

All instances of ao2_iterators which were just named 'i' have been renamed
to 'mem_iter' so that when refcounted queues are merged into trunk, there will be
little confusion regarding iterator names, especially when a queue and member iterator
are used in the same function.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 16:12:09 +00:00
Russell Bryant 20288b58af Merged revisions 82240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82240 | russell | 2007-09-11 09:34:12 -0500 (Tue, 11 Sep 2007) | 2 lines

Add a couple more missing unrefs of queue member objects

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 14:35:06 +00:00
Russell Bryant 74044bbb88 Merged revisions 82238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82238 | russell | 2007-09-11 09:21:17 -0500 (Tue, 11 Sep 2007) | 2 lines

Add a missing unref of a queue member in an error handling block

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82239 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 14:25:20 +00:00
Russell Bryant 02c8ceb4e5 Merged revisions 82236 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82236 | russell | 2007-09-11 09:09:43 -0500 (Tue, 11 Sep 2007) | 2 lines

Document why membercount can not simply be replaced by ao2_container_count()

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 14:10:17 +00:00
Mark Michelson ef2856adf0 Fixing a problem where NULL channels would cause a crash when calling indisposed queue members (i.e. paused, wrapup time not completed, etc.)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82185 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-10 19:10:46 +00:00
Tilghman Lesher e558260746 Merged revisions 82155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82155 | tilghman | 2007-09-10 13:02:02 -0500 (Mon, 10 Sep 2007) | 2 lines

Convert struct member to use refcounts (closes issue #10199)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-10 18:32:59 +00:00
Jason Parker ce12177952 Merged revisions 81923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10671)
........
r81923 | qwell | 2007-09-07 14:48:00 -0500 (Fri, 07 Sep 2007) | 5 lines

Allow the MEMBERINTERFACE variable to be used as the mixmonitor filename.
This moves the setting of the MEMBERINTERFACE variable to before mixmonitor.

Issue 10671, patch by sim.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-07 19:53:30 +00:00
Jason Parker 00da8c6dc7 Add an optional reason parameter to PauseQueueMember/UnpauseQueueMember applications and manager events.
Issue 8738, patch by rgollent


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-07 16:13:57 +00:00
Mark Michelson ba8c1b5243 Merged revisions 81713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81713 | mmichelson | 2007-09-06 11:25:40 -0500 (Thu, 06 Sep 2007) | 6 lines

Fixes an issue where valid DTMF had to be pressed twice to exit a queue if a member's phone
was ringing.

(closes issue #10655, reported by strider2k, patched by me)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06 16:31:30 +00:00
Mark Michelson e9548619cf Not having this epoll specific code in wait_for_answer was causing app_queue to infinitely loop.
This makes it so it doesn't. Thanks to file for pointing out where the problem was and showing
a similar function in app_dial as an example of how to fix it.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-05 21:59:52 +00:00
Mark Michelson 504f8a09af Weird. When I merged my changes from 1.4, they merged into the wrong function.
This should fix the build for trunk.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-05 15:32:58 +00:00
Mark Michelson 2b60033542 Merged revisions 81525 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81525 | mmichelson | 2007-09-05 10:19:47 -0500 (Wed, 05 Sep 2007) | 4 lines

Fixing the build...



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81526 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-05 15:23:57 +00:00
Mark Michelson 3d62457e96 Merged revisions 81520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81520 | mmichelson | 2007-09-05 10:03:22 -0500 (Wed, 05 Sep 2007) | 6 lines

Reverting behavior of QUEUE_MEMBER_COUNT to only count members who are logged in
and available.

(related to issue #10652, reported by wuwu)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-05 15:04:50 +00:00
Mark Michelson a748fc6647 Merged revisions 81416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81416 | mmichelson | 2007-08-31 14:48:55 -0500 (Fri, 31 Aug 2007) | 6 lines

Fixed broken behavior of a reload on realtime queues. Prior to this patch, if a reload was issued and
a realtime queue had callers waiting in it, then the queue would be removed from the queue list, but it would
not actually be freed (in fact, a debug message warning about a memory leak would come up). With this patch,
reloads do not touch realtime queues at all.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-31 19:50:26 +00:00
Mark Michelson ac9c53375f Merged revisions 81397 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81397 | mmichelson | 2007-08-30 17:05:56 -0500 (Thu, 30 Aug 2007) | 7 lines

Removing an extraneous (and possibly misleading) log message. Firstly, if the announce file isn't found, the 
streaming functions will report it. Secondly, not all non-zero returns from play_file mean that the announce file
wasn't found. Positive return values simply mean that a digit was pressed (most likely to skip through the announcement).

(closes issue #10612, reported and patched by dimas)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81398 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-30 22:08:51 +00:00
Mark Michelson 2d828f3308 Merged revisions 81381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81381 | mmichelson | 2007-08-30 10:35:51 -0500 (Thu, 30 Aug 2007) | 3 lines

Changed some manager event messages to reflect whether a queue member is a realtime member or not


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-30 15:36:43 +00:00
Mark Michelson 639b4aacce Added the MEMBERREALTIME variable when using setinterfacevar in queues.conf
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-29 22:05:37 +00:00
Mark Michelson faeaff33bb Merged revisions 81349 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81349 | mmichelson | 2007-08-29 11:35:29 -0500 (Wed, 29 Aug 2007) | 12 lines

This patch, in essence, will correctly pause a realtime queue member and reflect those
changes in the realtime engine.

(issue #10424, reported by irroot, patch by me)

This patch creates a new function called update_realtime_member_field, which is a generic
function which will allow any one field of a realtime queue member to be updated. This patch
only uses this function to update the paused status of a queue member, but it lays the foundation
for persisting the state of a realtime member the same way that static members' state is maintained
when using the persistentmembers setting


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-29 16:39:40 +00:00
Mark Michelson b823b635ac Merged revisions 81346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81346 | mmichelson | 2007-08-29 11:08:09 -0500 (Wed, 29 Aug 2007) | 3 lines

Changed some tabs to spaces


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-29 16:09:02 +00:00
Mark Michelson a9bec2f669 Merged revisions 81340 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81340 | mmichelson | 2007-08-29 10:52:42 -0500 (Wed, 29 Aug 2007) | 8 lines

This fix creates a more accurate way of detecting whether realtime members were deleted.
(closes issue 10541, reported by Alric, patched by me)

The REALLY nice things about this patch is that queue members now have a "realtime" field
which will be true if the member is a realtime member. This means we can check this value
prior to certain processing if it should ONLY be done for realtime members.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-29 15:57:27 +00:00
Mark Michelson 8176c0ee7c Merged revisions 81158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81158 | mmichelson | 2007-08-27 17:40:19 -0500 (Mon, 27 Aug 2007) | 5 lines

Resolve a potential deadlock. In this case, a single queue is locked, then the queue list. In changethread(), the queue list is
locked, and then each individual queue is locked. Under the right circumstances, this could deadlock. As such, I have unlocked
the individual queue before locking the queue list, and then locked the queue back after the queue list is unlocked.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-27 22:41:00 +00:00
Mark Michelson cea7b885d9 Merged revisions 81010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81010 | mmichelson | 2007-08-27 09:55:44 -0500 (Mon, 27 Aug 2007) | 3 lines

Found a case where the queue's membercount is off. It does not take into account dynamic members on a reload.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-27 14:56:50 +00:00
Russell Bryant e5b801c419 use ast_strlen_zero
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-25 17:49:04 +00:00
BJ Weschke eb0e0ec33f Merged revisions 80818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80818 | bweschke | 2007-08-24 15:52:06 -0400 (Fri, 24 Aug 2007) | 3 lines

 A minor correction to the available logic of autofill. If a queue member is paused, they're not really "available" so don't count them as such. Somewhat related to issue #10155 


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-24 20:21:17 +00:00
Mark Michelson e9a50d1f15 Merged revisions 80049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80049 | mmichelson | 2007-08-20 11:17:43 -0500 (Mon, 20 Aug 2007) | 4 lines

Found a pointless ternary if. member->dynamic was set to 1 and has no opportunity to change
between then and this line, so "dynamic" will ALWAYS be output.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 16:18:55 +00:00
Tilghman Lesher 56b9568164 Don't reload a configuration file if nothing has changed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 21:09:46 +00:00
Mark Michelson 8d929d7afd Allow non-realtime queues to have realtime members
(issue #10424, reported and patched by irroot)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13 15:39:48 +00:00
Mark Michelson 2f88ff4599 Merged revisions 78575 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78575 | mmichelson | 2007-08-08 09:26:36 -0500 (Wed, 08 Aug 2007) | 4 lines

Changing a bit of logic so that someone will NEVER exit the queue on timeout unless they have enabled the 'n' option.
This commit relates to issue #10320. Thanks to jfitzgibbon for detailing the idea behind this code change.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-08 14:34:10 +00:00
Jason Parker 1bf5335f00 Add the Ring time in the CONNECT on the queue_log and on the Manager event AgentConnect
Closes issue #10349, patch by eliel


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-01 20:05:13 +00:00
Russell Bryant 4e0947c5f1 Convert code that checks the _softhangup member of ast_channel directory to use
the ast_check_hangup() funciton.  This function takes scheduled hangups into
account.
(closes issue #10230, patch by Juggie)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-01 15:39:54 +00:00
Mark Michelson 04ca0b9728 Merged revisions 77854 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77854 | mmichelson | 2007-08-01 09:08:57 -0500 (Wed, 01 Aug 2007) | 8 lines

Fixes an issue I introduced to queues wherein a queue with joinempty=yes would kick people out of the queue because of erroneously
thinking the 'n' option was in use.

(closes issue #10320, reported by jfitzgibbon, patched by me, tested by blitzrage and me)

Thank you blitzrage for all the testing you've done lately with queues! It's much appreciated!


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-01 14:09:45 +00:00
Mark Michelson 9aee2bf6c7 Merged revisions 77852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77852 | mmichelson | 2007-08-01 08:59:59 -0500 (Wed, 01 Aug 2007) | 7 lines

If a queue uses dynamic realtime members, then the member list should be updated after each attempt to call the queue.
This fixes an issue where if a caller calls into a queue where no one is logged in, they would wait forever even if a member
logged in at some point.

(closes issue #10346, reported by and tested by blitzrage, patched by me)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-01 14:02:19 +00:00
Tilghman Lesher 20bbd09de3 Mostly cleanup of documentation to substitute the pipe with the comma, but a few other formatting cleanups, too.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-31 01:10:47 +00:00
Russell Bryant f8483a0d04 Do a massive conversion for using the ast_verb() macro
(closes issue #10277, patches by mvanbaak)

Basically, this changes ...

if (option_verbose > 2)
   ast_verbose(VERBOSE_PREFIX_3, "Something\n");

to ...

ast_verb(3, "Something\n");


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-26 15:49:18 +00:00
Mark Michelson c3a92f402f Merged revisions 76801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r76801 | mmichelson | 2007-07-24 11:26:58 -0500 (Tue, 24 Jul 2007) | 13 lines

Added a membercount variable to call_queue struct which keeps track of the number of logged in members in a particular queue.
This makes it so that the 'n' option for Queue() can act properly depending on which strategy is used. If the strategy is
roundrobin, rrmemory, or ringall, we want to ring each phone once before moving on in the dialplan. However, if any other strategy is
used, we will only ring one phone since it cannot be guaranteed that a different phone will ring on subsequent attempts to ring a phone.

As a side effect of this, the QUEUE_MEMBER_COUNT dialplan function now just reads the membercount variable instead of traversing through
the member list to figure out how many members there are.

Special thanks to blitzrage for helping to test this out.

(closes issue #10127, reported by bcnit, patched by me, tested by blitzrage)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-24 16:42:36 +00:00
Tilghman Lesher 55b1ee298e Merge the dialplan_aesthetics branch. Most of this patch simply converts applications
using old methods of parsing arguments to using the standard macros.  However, the big
change is that the really old way of specifying application and arguments separated by
a comma will no longer work (e.g. NoOp,foo|bar).  Instead, the way that has been
recommended since long before 1.0 will become the only method available (e.g. NoOp(foo,bar).


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-23 19:51:41 +00:00
Steve Murphy ffd49bc066 One small documentation update made to accompany 10154, the upgrading of the queue ringing to allow periodic announcments
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-21 01:08:46 +00:00
Steve Murphy 5c6d509591 This update was supplied in 10154; to allow announcemnts if the 'r' option (ringing) is provided.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-21 00:57:00 +00:00
Steve Murphy 7756ba6619 This repairs a 'warning: ISO C90 forbids mixed declarations and code' message that cripples my dev-mode enabled build
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 22:00:59 +00:00
Mark Michelson 51fa94c6f5 Merged revisions 75978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75978 | mmichelson | 2007-07-19 13:59:30 -0500 (Thu, 19 Jul 2007) | 3 lines

The diff on this looks pretty big but all I did was remove a pointless if statement (always evaluates true).


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 19:02:38 +00:00
Mark Michelson 3dcce46f69 Merged revisions 75969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75969 | mmichelson | 2007-07-19 11:26:10 -0500 (Thu, 19 Jul 2007) | 10 lines

Changes in handling return values of several functions in app_queue. This all started as a fix for issue #10008
but now includes all of the following changes:

1. Simplifying the code to handle positive return values from ast API calls.
2. Removing the background_file function.
3. The fix for issue #10008

(closes issue #10008, reported and patched by dimas)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 16:29:51 +00:00
Dwayne M. Hubbard b96fde308c Merged revisions 75658 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75658 | dhubbard | 2007-07-18 12:56:30 -0500 (Wed, 18 Jul 2007) | 9 lines

Merged revisions 75657 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r75657 | dhubbard | 2007-07-18 12:48:33 -0500 (Wed, 18 Jul 2007) | 1 line

removed the word 'pissed' from ast_log(...) function call for BE-90
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 17:59:56 +00:00