aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
AgeCommit message (Collapse)AuthorFilesLines
2007-09-19More conversions to NEW_CLIqwell1-146/+158
(issue #10724) Patches: chan_zap.c.patch uploaded by moy (license 222) app_queue.c.patch uploaded by eliel (license 64) app_voicemail.c.patch uploaded by eliel (license 64) app_meetme.c.patch uploaded by eliel (license 64) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83213 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-17Make the MALLOC_DEBUG output for free() useful again. After changing calls torussell1-3/+3
free to be ast_free, astmm said all calls to free were coming from utils.h git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82628 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-12Merged revisions 82286 via svnmerge from dhubbard1-2/+11
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82286 | dhubbard | 2007-09-12 15:24:24 -0500 (Wed, 12 Sep 2007) | 1 line remove a race condition for the creation of recordthread's, and fix a small memory leak. This closes issue# 10636 ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82287 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-11(closes issue #10560)file1-4/+4
Reported by: ruffle Patches: rb uploaded by ruffle (license 201) Show whether the conference is locked or not on the CLI. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82242 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-10(closes issue #10686)file1-1/+1
Reported by: junky Patches: meet.diff uploaded by junky (license 177) Change NOTICE message to DEBUG. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82062 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06Merged revisions 81776 via svnmerge from file1-7/+0
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81776 | file | 2007-09-06 16:40:37 -0300 (Thu, 06 Sep 2007) | 7 lines (closes issue #10122) Reported by: stevefeinstein Patches: meetme-unmute-manager.diff uploaded by qwell (license 4) Tested by: stevefeinstein After looking over the code I agree with Qwell. Setting the file descriptor to conference each time just causes a fight back and forth. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81777 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-29Changing a NOTICE to a DEBUG.mmichelson1-2/+2
(closes issue #10591, reported and patched by junky, with small modification by me) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81333 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-16Don't reload a configuration file if nothing has changed.tilghman1-5/+10
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79747 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-10Merge a set of device state improvements from team/russell/events.russell1-20/+25
The way a device state change propagates is kind of silly, in my opinion. A device state provider calls a function that indicates that the state of a device has changed. Then, another thread goes back and calls a callback for the device state provider to find out what the new state is before it can go send it off to whoever cares. I have changed it so that you can include the state that the device has changed to in the first function call from the device state provider. This removes the need to have to call the callback, which locks up critical containers to go find out what the state changed to. This change set changes the "simple" device state providers to use the new method. This includes parking, meetme, and SLA. I have also mostly converted chan_agent in my branch, but still have some more things to think through before presenting the plan for converting channel drivers to ensure all of the right events get generated ... git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79027 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-09Merged revisions 78717 via svnmerge from russell1-2/+8
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78717 | russell | 2007-08-09 11:12:57 -0500 (Thu, 09 Aug 2007) | 7 lines Fix a problem with the combination of the 'F' option to pass DTMF through a conference and options that use DTMF to activate various features. The problem was that the BEGIN frame would be passed through, but the END frame would get intercepted to activate a feature. Then, the other conference members would hear DTMF for forever, which they didn't seem to like very much. (closes issue #10400, reported by stevefeinstein, fixed by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@78718 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-01Convert code that checks the _softhangup member of ast_channel directory to userussell1-1/+1
the ast_check_hangup() funciton. This function takes scheduled hangups into account. (closes issue #10230, patch by Juggie) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77858 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-31Mostly cleanup of documentation to substitute the pipe with the comma, but a ↵tilghman1-16/+16
few other formatting cleanups, too. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77808 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-26Do a massive conversion for using the ast_verb() macrorussell1-3/+2
(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: http://svn.digium.com/svn/asterisk/trunk@77299 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-26Merged revisions 77191 via svnmerge from murf1-21/+31
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r77191 | murf | 2007-07-25 16:39:27 -0600 (Wed, 25 Jul 2007) | 1 line This fix solves problem with intense squelch noise when someone joins conf in bug 9430; We repro'd the problem with meetme opts of 'CciMo'; Josh Colp supplied this patch, and I'm applying it. It looks like playing the recorded username will louse up the next thing played into the channel. Josh rearranged the code so as to start things over before playing data directly into the conference. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77217 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-18Merged revisions 75529 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r75529 | tilghman | 2007-07-18 07:29:41 -0500 (Wed, 18 Jul 2007) | 2 lines Using a freed frame causes crashes (closes issue #9317) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75530 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-16Applications no longer need to call ast_module_user_add and ↵file1-27/+1
ast_module_user_remove. This is now taken care of in the pbx_exec function outside of the application. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75200 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-16It is no longer required for each module that deals with a channel to call ↵file1-2/+0
ast_module_user_hangup_all in it's unload function. The loader will automatically perform this action for it. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75183 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-03Fix a build warning, and potential issue if option p is not set at all.qwell1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@73174 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-03Add support for changing the exit key from # to any DTMF.qwell1-7/+27
This does not break existing configs - the arguments to p are optional. Issue 8827, initial patch by junky, mostly rewritten by fw to re-use option p, further modified by me. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@73144 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-24Conversions to ast_debug()russell1-2/+2
(issue #9984, patches from eliel and dimas) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@71338 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-21Merge changes from team/russell/sla_reloadrussell1-9/+103
* Add support for the reload of sla.conf (closes issue #9481, patch by me) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@70783 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-21Merged revisions 70726 via svnmerge from russell1-2/+0
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r70726 | russell | 2007-06-21 10:21:16 -0500 (Thu, 21 Jun 2007) | 2 lines Remove a couple of duplicate unlocks ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@70728 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-19Merged revisions 69895 via svnmerge from file1-2/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r69895 | file | 2007-06-19 09:55:25 -0400 (Tue, 19 Jun 2007) | 10 lines Merged revisions 69894 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r69894 | file | 2007-06-19 09:54:03 -0400 (Tue, 19 Jun 2007) | 2 lines Perform an extra hangup check just in case. (issue #9589 reported by bcnit) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69896 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-15Merged revisions 69518 via svnmerge from russell1-4/+23
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r69518 | russell | 2007-06-15 10:27:34 -0500 (Fri, 15 Jun 2007) | 5 lines The SLATRUNK_STATUS variable indicated "SUCCESS" for both an answer of the incoming call on the trunk, or if the trunk reached its ring timeout. This patch changes the variable to say "RINGTIMEOUT" in that case. (issue #9973, reported by n00dle, patch by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69519 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-14Convert uses of strdup() to ast_strdup()russell1-3/+3
(issue #9983, eliel) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69436 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-14Add a massive set of changes for converting to use the ast_debug() macro.russell1-19/+13
(issue #9957, patches from mvanbaak, caio1982, critch, and dimas) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69327 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-13Merged revisions 69144 via svnmerge from file1-0/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r69144 | file | 2007-06-13 15:08:24 -0400 (Wed, 13 Jun 2007) | 2 lines Really ignore NULL frames and check whether the channel hungup or not. (issue #9912 reported by junky) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69147 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-06Issue 9869 - replace malloc and memset with ast_calloc, and other coding ↵tilghman1-26/+26
guidelines changes git-svn-id: http://svn.digium.com/svn/asterisk/trunk@67864 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-05Merged revisions 67558 via svnmerge from russell1-2/+7
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r67558 | russell | 2007-06-05 18:01:44 -0500 (Tue, 05 Jun 2007) | 5 lines Fix some crashes related to the use of the "meetme" CLI command. The code for this command was not locking the conference list at all. (issue #9351, reported by and patch submitted by Junk-Y, committed patch is different and by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@67560 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-31Issue #9842 - Doxygen updates by snuffy. Thanks!oej1-1/+2
(Committed from Media Plaza in Utrecht, Netherlands - Open Source VoIP conference) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66705 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-26Since this code now uses the API call for creating a detached thread, thererussell1-2/+1
is no reason to keep a thread attribute structure on the conference structure. (Pointed out by Tony Mountifield on the asterisk-dev list) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66208 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-24Add a new API call for creating detached threads. Then, go replace all of therussell1-14/+3
places in the code where the same block of code for creating detached threads was replicated. (patch from bbryant) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@65968 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-07Make a minor tweak to admin_exec() - don't lock the conference list until itrussell1-4/+3
is actually necessary. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@63326 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-07Add a new application, MeetMeChannelAdmin, which is similar to MeetMeAdmin,russell1-0/+84
except it lets you operate on a channel by name instead of conference member number. It is very useful in combination with the 'X' option to ChanSpy. (issue #9671, patch by mnicholson, with some small modifications by me) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@63319 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-02When a conference is created, the UNIQUEID of the channel that caused it to berussell1-9/+14
created will now be stored. Then, every channel that joins the conference will have the MEETMEUNIQUEID channel variable set with this ID. This can be used to relate callers that come and go from long standing conferences. (issue #7295, patch by softins) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@62794 f38db490-d61c-443f-a65b-d21fe96a405b
2007-04-28Enable the functionality of the 'o' option to "optimize talker" by default.russell1-9/+5
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@62297 f38db490-d61c-443f-a65b-d21fe96a405b
2007-04-06Merged revisions 60565 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60565 | russell | 2007-04-06 14:50:52 -0500 (Fri, 06 Apr 2007) | 3 lines When a station picks up a trunk that was on hold, make the hints reflect that nobody has the trunk on hold anymore. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@60566 f38db490-d61c-443f-a65b-d21fe96a405b
2007-04-06Merged revisions 60521 via svnmerge from russell1-6/+27
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60521 | russell | 2007-04-06 13:58:46 -0500 (Fri, 06 Apr 2007) | 16 lines Fix a few problems with SLA. (issue #9459, reported by francesco_r, fixed by me) * The original behavior was that if one station put a call on hold, another one picked it up, and then hung up, the code would still consider the call on hold by the first station, so the trunk would not be hung up. However, to better comply with what most people seem to expect it to behave, it will now hang up the trunk. * Fix a problem with "barge=no". This was only intended to prevent people from joining calls that are in progress. However, it also prevented other people from picking up a call that was on hold. This has been fixed. * When there are no active stations on a trunk and it is on hold, the code now indicates the HOLD and UNHOLD conditions to the trunk channel. This allows music on hold to be played to the trunk when it is on hold. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@60522 f38db490-d61c-443f-a65b-d21fe96a405b
2007-04-04Merged revisions 60069 via svnmerge from russell1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60069 | russell | 2007-04-04 11:26:23 -0500 (Wed, 04 Apr 2007) | 4 lines Fix a problem where if a trunk was hung up while it was on hold, all of the hints would reflect the line still on hold, even though it should reflect that it is back to not in use. (issue #9459, reported by francesco_r, fixed by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@60070 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-29Merged revisions 59361 via svnmerge from file1-20/+17
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59361 | file | 2007-03-29 13:38:55 -0400 (Thu, 29 Mar 2007) | 10 lines Merged revisions 59360 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r59360 | file | 2007-03-29 13:33:58 -0400 (Thu, 29 Mar 2007) | 2 lines Keep a global array of variables indicating whether certain conference rooms are in use. This ensures that two people going into a new dynamic conference when the 'e' option is set don't go into the same conference room. (issue #8835 reported by eliel) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59362 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-26Merged revisions 59215 via svnmerge from russell1-3/+40
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r59215 | russell | 2007-03-26 13:28:29 -0500 (Mon, 26 Mar 2007) | 3 lines Fix some codec negotiation problems when CallerID support is not enabled in SLA. (issue #9308, reported by twilson) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59216 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-14Merged revisions 58894 via svnmerge from russell1-4/+11
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58894 | russell | 2007-03-14 11:33:01 -0500 (Wed, 14 Mar 2007) | 8 lines By default, don't attempt to do any CallerID handling at all with SLA because 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/trunk@58895 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-13Merged revisions 58872 via svnmerge from russell1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58872 | russell | 2007-03-13 18:19:51 -0500 (Tue, 13 Mar 2007) | 4 lines Ensure that the blinky lights show that the trunk stopped ringing when the trunk hangs up before a station has answered it. (issue #9234, reported by francesco_r) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58873 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-10Merged revisions 58669 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58669 | russell | 2007-03-09 21:58:27 -0600 (Fri, 09 Mar 2007) | 2 lines Make the compiler happy and initialize a variable. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58670 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-08Merged revisions 58512 via svnmerge from russell1-6/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58512 | russell | 2007-03-08 16:15:15 -0600 (Thu, 08 Mar 2007) | 5 lines Hang up the channel that put the call on hold in the event processing thread to 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/trunk@58541 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-08Merged revisions 58474 via svnmerge from russell1-38/+41
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58474 | russell | 2007-03-08 14:54:56 -0600 (Thu, 08 Mar 2007) | 3 lines Refactor hold handling a bit so that it does not require keeping the call up when a call is put on hold. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58475 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-08Merged revisions 58351-58352 via svnmerge from kpfleming1-5/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58351 | kpfleming | 2007-03-08 08:17:17 -0500 (Thu, 08 Mar 2007) | 2 lines fix two cases where HTTP session file descriptors would not be closed ........ r58352 | kpfleming | 2007-03-08 08:17:42 -0500 (Thu, 08 Mar 2007) | 2 lines fix a compiler warning, and overwriting 'res' value ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58353 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-06remove duplicate constrizzo1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@57979 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-05Merged revisions 57872 via svnmerge from file1-17/+16
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r57872 | file | 2007-03-05 13:39:28 -0500 (Mon, 05 Mar 2007) | 2 lines Don't create a listen channel and record the conference unless the option is turned on. (issue #9204 reported by francesco_r) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@57875 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-05I like it when app_meetme builds under dev mode, don't you?file1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@57873 f38db490-d61c-443f-a65b-d21fe96a405b