Commit Graph

234 Commits

Author SHA1 Message Date
Russell Bryant
9d3ff33b25 Merge changes from svn/asterisk/team/russell/sla_updates
* Add support for the "barge=no" option for trunks.  If this option is set,
  then stations will not be able to join in on a call that is on progress
  on this trunk.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@57144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 19:56:20 +00:00
Russell Bryant
9021d3c3b2 Merge current set of changes from svn/asterisk/team/russell/sla_updates
* Add support for station ring delays.  Ring delays can be set globally for a
  station or for specific trunks on the station.
* Fix a few bugs in existing code.
* Restructure and Reorganize code to improve readability and maintainability.
* Improve formatting of the "sla show (trunks|stations)" CLI commands.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@57089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 18:20:05 +00:00
Joshua Colp
53b014b81a Picky compiler...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@57055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 17:55:03 +00:00
Russell Bryant
11e4c71bc0 Move a comment to be in the correct struct.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@56740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-26 01:04:40 +00:00
Russell Bryant
f314685447 Merge changes from team/russell/sla_updates.
This batch of changes to the SLA code does a few different things.

* I made the SLA code event driven instead of having to act in a lot of busy
  loops while dialing things to wait for state changes.  This makes the code
  more efficient and readable at the same time.

* I have implemented a couple of new features.  The first is inbound trunk
  ringing timeouts.  This is an option that defines how long to let an incoming
  call on a trunk to ring.

* I have also implemented ring timeouts for stations.  They may be specified
  for the entire station, meaning it is how long to let the station ring before
  giving up.  You can also specify a ring timeout for a specific trunk on a
  station.  So, you can say that you only want a specific station to ring 5
  seconds if it is line1 ringing, but otherwise, there is no timeout.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@56277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-22 23:08:36 +00:00
Joshua Colp
fee3b74617 Merged revisions 55956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r55956 | file | 2007-02-21 15:32:16 -0500 (Wed, 21 Feb 2007) | 2 lines

Change naughty warning message to provide useful information. If a write now fails on a channel in meetme it will tell you the channel name instead of spitting out the wrong error message.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 20:35:40 +00:00
Russell Bryant
bb3aa2ee41 Simplify the last change to app_meetme, and move the call to dispose_conf()
up into the block where we know a conf exists.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 20:22:33 +00:00
Joshua Colp
54f59f4dad Only dispose of the conference if one was created.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 20:16:34 +00:00
Russell Bryant
39026c9f96 Improve the reference counting to fix bugs where people report seeing
conferences listed that have no members.
(issue #9073)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 01:03:25 +00:00
Russell Bryant
960b4de2de Merged revisions 55005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r55005 | russell | 2007-02-16 16:48:22 -0600 (Fri, 16 Feb 2007) | 9 lines

Revert the change I did in revisions 54955, 54969, and 54970, in 1.2, 1.4, 
and trunk.  I decided that once a conference is created from meetme.conf,
it is acceptable behavior that the pin can not be changed until the
conference goes away.  I also added a note in meetme.conf to describe this
behavior.

We still have another issue in 1.4 and trunk where some conferences with no
users don't go away.  That is the real bug that needs to be addressed here.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 22:49:42 +00:00
Russell Bryant
cad10249de Merged revisions 54955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r54955 | russell | 2007-02-16 14:56:58 -0600 (Fri, 16 Feb 2007) | 5 lines

For conferences that are configured in meetme.conf, check the configuration
file every time someone joins the conference instead of only when the
conference is first created.  This is to ensure that changes to the pin
numbers in the config file are always honored.  (issue #9073)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@54969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 21:12:18 +00:00
Russell Bryant
5bc6ee1714 - Add the ability to register a callback to monitor state changes in an
asynchronous dial operation.
- Rename the various references to "status" to "state" in the dial API


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@54066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-12 17:58:43 +00:00
Russell Bryant
c16059235e Add some output for "show application SLAStation/SLATrunk"
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-10 01:02:00 +00:00
Russell Bryant
7ee02f585d Merge team/russell/sla_rewrite
This is a completely new implementation of the SLA functionality introduced in
Asterisk 1.4.  It is now functional and ready for testing.  However, I will be
adding some additional features over the next week, as well.

For information on how to set this up, see configs/sla.conf.sample 
and doc/sla.txt.

In addition to the changes in app_meetme.c for the SLA implementation itself,
this merge brings in various other changes:

chan_sip:
 - Add the ability to indicate HOLD state in NOTIFY messages.
 - Queue HOLD and UNHOLD control frames even if the channel is not bridged to
   another channel.

linkedlists.h:
 - Add support for rwlock based linked lists.

dial.c:
 - Add the ability to run ast_dial_start() without a reference channel to
   inherit information from.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-10 00:35:09 +00:00
Russell Bryant
9aab046002 Merged revisions 53045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines

Fix a bunch of places where pthread_attr_init() was called, but
pthread_attr_destroy() was not.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-31 21:32:08 +00:00
Russell Bryant
c41964cd78 Remove an unused instance of an unnamed enum.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-20 00:13:06 +00:00
Russell Bryant
c94df4db51 Remove another duplicated definition
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 22:19:10 +00:00
Russell Bryant
89285ade68 Remove a variable that was declared twice.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 21:20:20 +00:00
Kevin P. Fleming
444adcb477 reduce stack consumption for AMI and AMI/HTTP requests by nearly 20K in most cases
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-05 22:16:33 +00:00
Joshua Colp
c4bde5b40a Get rid of a needless memory allocation and only create a conference structure in find_conf_realtime if data was read from realtime. (issue #8669 reported by robl)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-26 05:20:08 +00:00
Joshua Colp
50ee01ccda Use the correct API call to say a device state changed. (Yes, I'm a nub.)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11 05:30:01 +00:00
Joshua Colp
08ab40c1bf Don't access the conference structure after it has been freed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11 04:57:38 +00:00
Joshua Colp
ee182a4b02 Don't unreference the SLA object if there is no SLA object in the devicestate callback. (issue #8354 reported by loloski)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-16 17:52:48 +00:00
Russell Bryant
6a74bc409c Fix the descriptions of some of the MeetMeAdmin options (issue #8098, mflorell)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-24 01:04:14 +00:00
Kevin P. Fleming
ff05bf15c8 update thread creation code a bit
reduce standard thread stack size slightly to allow the pthreads library to allocate the stack+data and not overflow a power-of-2 allocation in the kernel and waste memory/address space
add a new stack size for 'background' threads (those that don't handle PBX calls) when LOW_MEMORY is defined


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 19:47:22 +00:00
Joshua Colp
a30a5f2f09 Merged revisions 43891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43891 | file | 2006-09-28 12:13:55 -0400 (Thu, 28 Sep 2006) | 2 lines

Stop the stream after waitstream returns so that our formats get restored. (issue #7370 reported by kryptolus)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 16:17:36 +00:00
Tilghman Lesher
70af28270d Constify the result of a config retrieval function, to avoid mutilation (issue 7983).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-20 20:40:39 +00:00
Kevin P. Fleming
fcb999c01c merge qwell's CLI verbification work
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 19:54:18 +00:00
Tilghman Lesher
e16104185a Merged revisions 43003 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43003 | tilghman | 2006-09-15 23:44:02 -0500 (Fri, 15 Sep 2006) | 2 lines

When the marked user enters the conference, we should no longer timeout

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16 05:43:54 +00:00
Tilghman Lesher
979ef8d2ed Merged revisions 42783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42783 | tilghman | 2006-09-11 16:47:23 -0500 (Mon, 11 Sep 2006) | 4 lines

When paging, only wait 5 seconds for the marked user to enter the conference.
After that, assume the paging already completed by the time the channel entered
the conference and drop back out.  (Issue 7275)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 22:17:46 +00:00
Kevin P. Fleming
0a27d8bfe5 merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
  - support for embedded modules
  - support for static builds
  - simpler cross-compilation support
  - simpler module/loader interface (no exported symbols)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 02:11:39 +00:00
Russell Bryant
87ac16847e - unregister SLA apps on module unload and add sample config (issue #7701, junky)
- rename SLAS to SLAStation, and SLAT to SLATrunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-14 01:32:46 +00:00
Kevin P. Fleming
6d0742fc16 merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19 20:44:39 +00:00
Mark Spencer
f6d03e822a Make app_meetme's do_invite more generic.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-17 02:17:38 +00:00
Mark Spencer
4c90cf59b7 Support hold/unhold in Zap, update IAX2 parser to know about modern commands, forward hold/unhold in dial, add hold device state
and implement holding in the SLA.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-08 02:24:07 +00:00
Kevin P. Fleming
f761d2f6f0 prepare Asterisk for new zaptel.h/tonezone.h installation locations
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-05 16:44:41 +00:00
Olle Johansson
fea7dd0b31 Add some comments to the SLA code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03 07:40:08 +00:00
Russell Bryant
a4c7a1c97c reduce indentation a couple of levels
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03 05:32:08 +00:00
Russell Bryant
03a277c5cc - remove an unused variable
- use ast_calloc instead of malloc + memset
- return immediately on ast_calloc failure instead of indenting the whole func
- remove a duplicate ast_strdupa


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03 03:39:37 +00:00
Mark Spencer
79221df76c First pass at SLA support
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 23:54:43 +00:00
Olle Johansson
f8311adcda METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
  device state information, like parking lots, queues, meetmes, vending machines
  and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
  parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
  ( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
  call Park() and you will be parked on that space. If it's occupied, dialplan
  execution will continue.

This work was sponsored by Voop A/S - www.voop.com


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
Kevin P. Fleming
e61d3d91f3 The Eurostar Commit! (it's amazing how much work you can get done on a 150 minute train ride from Paris to London <G>)
support the new location for zaptel.h and tonezone.h
use the dependency information output by menuselect to build Makefile rules for each module for header files and libraries
combine the common rules into a top-level Makefile.rules file
remove all (now) unnecessary stuff from subdir Makefiles
change translator API so that the newpvt() callback returns an int instead of a pointer (it no longer allocates memory)
alphabetize --with-<foo> options in configure script
enhance Net-SNMP support in configure script to provide a --with-netsnmp option
fix support for --with-pq so that if pg-config is not found when --with-pq is specified, an error will be generated
add 'optional package' usage to modules now that menuselect can output it
allow res_snmp to build by default, since the new loader changes coming soon will solve the function naming problem (and users can disable it via menuselect anyway)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-24 19:43:31 +00:00
Russell Bryant
4cef7b714e fix up some places where frames are not free'd and remove an unnecessary
unlock of the confs list where it is not possible for it to be locked


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-11 21:12:56 +00:00
Joshua Colp
dcab298cfc Don't double check existence of a variable (issue #7300 reported by foamdino)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-09 19:05:30 +00:00
Joshua Colp
e3fe7e1c08 Add more missing newlines (issue #7323 reported by darkskiez)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-09 16:36:54 +00:00
Kevin P. Fleming
472c1ca282 simplify autoconfig include mechanism (make tholo happy he can use lint again :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 18:54:56 +00:00
Joshua Colp
e5753b49ad Documentation changes for Qwell
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31193 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-31 23:10:56 +00:00
Joshua Colp
a69e488812 Fix up meetme some more (thanks TonyM!!!)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-31 22:54:58 +00:00
Joshua Colp
a74ebe5933 Make the user menu unmute/mute work again, including in combination with the 'l' option.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-31 17:21:12 +00:00
Joshua Colp
f35b95e516 Remove ourselves from the userlist a little bit earlier
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-30 17:33:37 +00:00