aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
AgeCommit message (Collapse)AuthorFilesLines
2007-03-14By default, don't attempt to do any CallerID handling at all with SLA becauserussell1-4/+11
it is known to not work properly in some situations. However, add an option to enable it for those that would like to use it anyway. The short story behind this is that to properly handle CallerID with SLA, we need the ability to change the CallerID on an existing call, and we are not ready to handle that. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58894 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-13Ensure that the blinky lights show that the trunk stopped ringing when therussell1-0/+3
trunk hangs up before a station has answered it. (issue #9234, reported by francesco_r) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58872 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-10Make the compiler happy and initialize a variable.russell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58669 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-08Hang up the channel that put the call on hold in the event processing thread torussell1-6/+5
avoid a race condition. Also, if the station originated the call that it is putting on hold, don't hang up the trunk if it was the only station on the call and it is hanging up due to hold and not a normal hangup. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58512 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-08Refactor hold handling a bit so that it does not require keeping the call uprussell1-38/+41
when a call is put on hold. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58474 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-08fix a compiler warning, and overwriting 'res' valuekpfleming1-6/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58352 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-05Don't create a listen channel and record the conference unless the option is ↵file1-17/+16
turned on. (issue #9204 reported by francesco_r) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@57872 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-01Merge changes from svn/asterisk/team/russell/sla_updatesrussell1-25/+16
* Originally, I put in the documentation that only Zap interfaces would be supported on the trunk side. However, after a discussion with Qwell, we came up with a way to make IP trunks work as well, using some things already in Asterisk. So, here it is, this now officially supports IP trunks. * Update the SLA documentation to reflect how to setup IP trunks. * Add a section in sla.txt that describes how to set up an SLA system with voicemail. * Simplify the way DTMF passthrough is handled in MeetMe. * Fix a bug that exposed itself when using a Local channel on the trunk side in SLA. The station's channel needs to be passed to the dial API when dialing the trunk. * Change a WARNING message to DEBUG in channel.h. This message is of no use to users. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@57364 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-28Merge more changes from svn/asterisk/team/russell/sla_updatesrussell1-13/+99
* Add support for private hold. By setting "hold=private" for a trunk, only the station that put the call on hold will be able to retrieve it from hold. Also, by setting "hold=private" for a station, any call that station puts on hold can only be retrieved by that station. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@57203 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-28Minor formatting changerussell1-7/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@57146 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-28Merge changes from svn/asterisk/team/russell/sla_updatesrussell1-9/+26
* 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: http://svn.digium.com/svn/asterisk/branches/1.4@57144 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-28Merge current set of changes from svn/asterisk/team/russell/sla_updatesrussell1-149/+457
* 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: http://svn.digium.com/svn/asterisk/branches/1.4@57089 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-28Picky compiler...file1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@57055 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-26Move a comment to be in the correct struct.russell1-3/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@56740 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-22Merge changes from team/russell/sla_updates.russell1-285/+664
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: http://svn.digium.com/svn/asterisk/branches/1.4@56277 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-21Merged revisions 55956 via svnmerge from file1-2/+2
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: http://svn.digium.com/svn/asterisk/branches/1.4@55957 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-21Simplify the last change to app_meetme, and move the call to dispose_conf()russell1-2/+0
up into the block where we know a conf exists. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@55951 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-21Only dispose of the conference if one was created.file1-2/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@55949 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-21Improve the reference counting to fix bugs where people report seeingrussell1-43/+53
conferences listed that have no members. (issue #9073) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@55758 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-16Merged revisions 55005 via svnmerge from russell1-56/+37
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: http://svn.digium.com/svn/asterisk/branches/1.4@55006 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-16Merged revisions 54955 via svnmerge from russell1-37/+56
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: http://svn.digium.com/svn/asterisk/branches/1.4@54969 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-12- Add the ability to register a callback to monitor state changes in anrussell1-2/+2
asynchronous dial operation. - Rename the various references to "status" to "state" in the dial API git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@54066 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-10Add some output for "show application SLAStation/SLATrunk"russell1-2/+13
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@53821 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-10Merge team/russell/sla_rewriterussell1-514/+1329
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: http://svn.digium.com/svn/asterisk/branches/1.4@53810 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-31Merged revisions 53045 via svnmerge from russell1-0/+1
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: http://svn.digium.com/svn/asterisk/branches/1.4@53046 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-20Remove an unused instance of an unnamed enum.russell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51343 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-19Remove another duplicated definitionrussell1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51341 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-19Remove a variable that was declared twice.russell1-3/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51339 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-05reduce stack consumption for AMI and AMI/HTTP requests by nearly 20K in most ↵kpfleming1-5/+5
cases git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@49676 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-26Get rid of a needless memory allocation and only create a conference ↵file1-10/+6
structure in find_conf_realtime if data was read from realtime. (issue #8669 reported by robl) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48966 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-11Use the correct API call to say a device state changed. (Yes, I'm a nub.)file1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48379 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-11Don't access the conference structure after it has been freed.file1-6/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48377 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-16Don't unreference the SLA object if there is no SLA object in the ↵file1-0/+4
devicestate callback. (issue #8354 reported by loloski) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47748 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-24Fix the descriptions of some of the MeetMeAdmin options (issue #8098, mflorell)russell1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@46065 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-04update thread creation code a bitkpfleming1-1/+1
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: http://svn.digium.com/svn/asterisk/branches/1.4@44378 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-28Merged revisions 43891 via svnmerge from file1-1/+6
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: http://svn.digium.com/svn/asterisk/branches/1.4@43893 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-20Constify the result of a config retrieval function, to avoid mutilation ↵tilghman1-1/+1
(issue 7983). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43364 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-18merge qwell's CLI verbification workkpfleming1-38/+21
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43212 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-16Merged revisions 43003 via svnmerge from tilghman1-0/+2
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: http://svn.digium.com/svn/asterisk/trunk@43008 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-11Merged revisions 42783 via svnmerge from tilghman1-9/+29
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: http://svn.digium.com/svn/asterisk/trunk@42788 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-21merge new_loader_completion branch, including (at least):kpfleming1-37/+26
- 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: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-14- unregister SLA apps on module unload and add sample config (issue #7701, ↵russell1-6/+8
junky) - rename SLAS to SLAStation, and SLAT to SLATrunk git-svn-id: http://svn.digium.com/svn/asterisk/trunk@39637 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-19merge Russell's 'hold_handling' branch, finally implementing music-on-hold ↵kpfleming1-3/+3
handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37988 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-17Make app_meetme's do_invite more generic.markster1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37755 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-08Support hold/unhold in Zap, update IAX2 parser to know about modern ↵markster1-13/+150
commands, forward hold/unhold in dial, add hold device state and implement holding in the SLA. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37318 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-05prepare Asterisk for new zaptel.h/tonezone.h installation locationskpfleming1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37027 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-03Add some comments to the SLA codeoej1-8/+20
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36798 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-03reduce indentation a couple of levelsrussell1-119/+125
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36753 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-03- remove an unused variablerussell1-19/+16
- 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: http://svn.digium.com/svn/asterisk/trunk@36700 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-01First pass at SLA supportmarkster1-5/+344
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36582 f38db490-d61c-443f-a65b-d21fe96a405b
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 09:44:28 +0000