summaryrefslogtreecommitdiff
path: root/apps/app_meetme.c
AgeCommit message (Collapse)Author
2007-02-22Merged revisions 56277 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r56277 | russell | 2007-02-22 17:08:36 -0600 (Thu, 22 Feb 2007) | 18 lines 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/trunk@56278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21Merged revisions 55957 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r55957 | file | 2007-02-21 15:35:40 -0500 (Wed, 21 Feb 2007) | 10 lines 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/trunk@55958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21Merged revisions 55951 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r55951 | russell | 2007-02-21 14:22:33 -0600 (Wed, 21 Feb 2007) | 3 lines 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/trunk@55952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21Merged revisions 55949 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r55949 | file | 2007-02-21 15:16:34 -0500 (Wed, 21 Feb 2007) | 2 lines Only dispose of the conference if one was created. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21Merged revisions 55758 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r55758 | russell | 2007-02-20 19:03:25 -0600 (Tue, 20 Feb 2007) | 4 lines 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/trunk@55762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16Merged revisions 55006 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r55006 | russell | 2007-02-16 16:49:42 -0600 (Fri, 16 Feb 2007) | 17 lines 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/trunk@55007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16Merged revisions 54969 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r54969 | russell | 2007-02-16 15:12:18 -0600 (Fri, 16 Feb 2007) | 13 lines 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/trunk@54970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-13This introduces a new dialplan function, DEVSTATE, which allows you to do someRussell Bryant
pretty cool things. First, you can get the device state of anything in the dialplan: NoOp(SIP/mypeer has state ${DEVSTATE(SIP/mypeer)}) NoOp(The conference room 1234 has state ${DEVSTATE(MeetMe:1234)}) Most importantly, this allows you to create custom device states so you can control phone lamps directly from the dialplan. Set(DEVSTATE(Custom:mycustomlamp)=BUSY) ... exten => mycustomlamp,hint,Custom:mycustomlamp git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-12Merged revisions 54066 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r54066 | russell | 2007-02-12 11:58:43 -0600 (Mon, 12 Feb 2007) | 4 lines - 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/trunk@54067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-10Merged revisions 53810 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r53810 | russell | 2007-02-09 18:35:09 -0600 (Fri, 09 Feb 2007) | 24 lines 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/trunk@53817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-31Merged revisions 53046 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r53046 | russell | 2007-01-31 15:32:08 -0600 (Wed, 31 Jan 2007) | 11 lines 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/trunk@53047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-20Merged revisions 51343 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51343 | russell | 2007-01-19 18:13:06 -0600 (Fri, 19 Jan 2007) | 2 lines Remove an unused instance of an unnamed enum. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19Merged revisions 51341 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51341 | russell | 2007-01-19 16:19:10 -0600 (Fri, 19 Jan 2007) | 2 lines Remove another duplicated definition ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51342 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19Merged revisions 51339 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51339 | russell | 2007-01-19 15:20:20 -0600 (Fri, 19 Jan 2007) | 2 lines Remove a variable that was declared twice. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19include "asterisk/zapata.h" instead of testing forLuigi Rizzo
the location of the header files. On passing, add a cast to insure -Werror clean compilation on FreeBSD 6.x, where time_t does not match %ld git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-05Merged revisions 49676 via svnmerge from Kevin P. Fleming
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r49676 | kpfleming | 2007-01-05 16:16:33 -0600 (Fri, 05 Jan 2007) | 2 lines reduce stack consumption for AMI and AMI/HTTP requests by nearly 20K in most cases ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-26Merged revisions 48966 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r48966 | file | 2006-12-26 00:20:08 -0500 (Tue, 26 Dec 2006) | 2 lines 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/trunk@48967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-21a quick fix to app_sms.c to get rid of cursed compiler warnings so I can ↵Steve Murphy
compile under --enable-dev-mode git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11Merged revisions 48379 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r48379 | file | 2006-12-11 00:30:01 -0500 (Mon, 11 Dec 2006) | 2 lines 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/trunk@48380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11Merged revisions 48377 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r48377 | file | 2006-12-10 23:57:38 -0500 (Sun, 10 Dec 2006) | 2 lines Don't access the conference structure after it has been freed. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-06Resolve some pointer signedness compiler warnings in app_osplookup, andRussell Bryant
constify a bunch of usage strings for CLI commands. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-16Merged revisions 47748 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47748 | file | 2006-11-16 12:52:48 -0500 (Thu, 16 Nov 2006) | 2 lines 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/trunk@47749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13Don't play the "entering conference number <insert number here>" prompts if ↵Joshua Colp
the 'q' option is used. If others believe this should be in 1.2/1.4 then we can put it in, but I'm uncomfortable doing so right now as it is a change of behavior. (issue #8138 reported by tmancill) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-26fix various spelling mistakes in comments (issue #8237, jmls)Russell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-24Merged revisions 46065 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r46065 | russell | 2006-10-23 21:04:14 -0400 (Mon, 23 Oct 2006) | 2 lines Fix the descriptions of some of the MeetMeAdmin options (issue #8098, mflorell) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-18Just for Nicholson - here's an option, C, to Meetme that will allow it to ↵Joshua Colp
continue in the dialplan if the person is kicked out. (issue #7994 reported by mnicholson with mods by myself) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04Merged revisions 44378 via svnmerge from Kevin P. Fleming
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r44378 | kpfleming | 2006-10-04 14:47:22 -0500 (Wed, 04 Oct 2006) | 4 lines 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/trunk@44379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-03bug #8076 check option_debug before printing to debug channel.Matt O'Gorman
patch provided in bugnote, with minor changes. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02Make callerid fields in Manager events more consistent. CallerIDNum for ↵Joshua Colp
number and CallerIDName for name. (issue #7976 reported by suhler) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28Merged revisions 43893 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r43893 | file | 2006-09-28 12:17:36 -0400 (Thu, 28 Sep 2006) | 10 lines 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/trunk@43894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-26Fire a manager event when a meetme is started/stopped.Jason Parker
Issue #7891, patch by suhler. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-20Constify the result of a config retrieval function, to avoid mutilation ↵Tilghman Lesher
(issue 7983). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18merge qwell's CLI verbification workKevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16Merged revisions 43003 via svnmerge from Tilghman Lesher
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-11Merged revisions 42783 via svnmerge from Tilghman Lesher
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-08-21merge new_loader_completion branch, including (at least):Kevin P. Fleming
- 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-14- unregister SLA apps on module unload and add sample config (issue #7701, ↵Russell Bryant
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-07-19merge Russell's 'hold_handling' branch, finally implementing music-on-hold ↵Kevin P. Fleming
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-17Make app_meetme's do_invite more generic.Mark Spencer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-08Support hold/unhold in Zap, update IAX2 parser to know about modern ↵Mark Spencer
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-05prepare Asterisk for new zaptel.h/tonezone.h installation locationsKevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03Add some comments to the SLA codeOlle Johansson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03reduce indentation a couple of levelsRussell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03- remove an unused variableRussell Bryant
- 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-01First pass at SLA supportMark Spencer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26METERMAIDS:Olle Johansson
----------- - 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-24The Eurostar Commit! (it's amazing how much work you can get done on a 150 ↵Kevin P. Fleming
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-11fix up some places where frames are not free'd and remove an unnecessaryRussell Bryant
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-09Don't double check existence of a variable (issue #7300 reported by foamdino)Joshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-09Add more missing newlines (issue #7323 reported by darkskiez)Joshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 17:11:42 +0000