summaryrefslogtreecommitdiff
path: root/apps/app_meetme.c
AgeCommit message (Collapse)Author
2008-03-20Remove astobj.h from some places where it wasn't neededRussell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19Merged revisions 110163 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110163 | russell | 2008-03-19 17:57:59 -0500 (Wed, 19 Mar 2008) | 5 lines Fix a bug where when calls on the trunk side hang up while on hold, the state is not properly reflected. (closes issue #11990, reported by anakaoka, patched by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18Go through and fix a bunch of places where character strings were being ↵Terry Wilson
interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not actual problems, per se. I also added format attributes to any printf wrapper functions I found that didn't have them. -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11Merged revisions 107637 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r107637 | file | 2008-03-11 15:47:33 -0300 (Tue, 11 Mar 2008) | 4 lines Add an additional check for setting conference parameter when using the marked user options. It was possible for it to return to a no listen/no talk state if a masquerade happened. (closes issue #12136) Reported by: aragon ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07Merged revisions 106895 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r106895 | russell | 2008-03-07 16:51:23 -0600 (Fri, 07 Mar 2008) | 2 lines Only start the SLA thread if SLA has actually been configured. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07(closes issue #6002)Steve Murphy
Reported by: rizzo Tested by: murf Proposal of the changes to be made, and then an announcement of how they were accomplished: http://lists.digium.com/pipermail/asterisk-dev/2008-February/032065.html and: http://lists.digium.com/pipermail/asterisk-dev/2008-March/032124.html Here is a recap, file by file, of what I have done: pbx/pbx_config.c pbx/pbx_ael.c All funcs that were passed a ptr to the context list, now will ALSO be passed a hashtab ptr to the same set. Why? because (for the time being), the dialplan is stored in both, to facilitate a quick, low-cost move to hash-tables to speed up dialplan processing. If it was deemed necessary to pass the context LIST, well, it is just as necessary to have the TABLE available. This is because the list/table in question might not be the global one, but temporary ones we would use to stage the dialplan on, and then swap into the global position when things are ready. We now have one external function for apps to use, "ast_context_find_or_create()" instead of the pre-existing "find" and "create", as all existing usages used both in tandem anyway. pbx_config, and pbx_ael, will stage the reloaded dialplan into local lists and tables, and then call merge_contexts_and_delete, which will merge (now) existing contexts and priorities from other registrars into this local set by copying them. Then, merge_contexts_and_delete will lock down the contexts, swap the lists and tables, and unlock (real quick), and then destroy the old dialplan. chan_sip.c chan_iax.c chan_skinny.c All the channel drivers that would add regcontexts now use the ast_context_find_or_create now. chan_sip also includes a small fix to get rid of warnings about removing priorities that never got entered. apps/app_meetme.c apps/app_dial.c apps/app_queue.c All the apps that added a context/exten/priority were also modified to use ast_context_find_or_create instead. include/asterisk/pbx.h ast_context_create() is removed. Find_or_create_ is the new method. ast_context_find_or_create() interface gets the hashtab added. ast_merge_contexts_and_delete() gets the local hashtab arg added. ast_wrlock_contexts_version() is added so you can detect if someone else got a writelock between your readlocking and writelocking. ast_hashtab_compare_contexts was made public for use in pbx_config/pbx_ael ast_hashtab_hash_contexts was in like fashion make public. include/asterisk/pval.h ast_compile_ael2() interface changed to include the local hashtab table ptr. main/features.c For the sake of the parking context, we use ast_context_find_or_create(). main/pbx.c I changed all the "tree" names to "table" instead. That's because the original implementation was based on binary trees. (had a free library). Then I moved to hashtabs. Now, the names move forward too. refcount field added to contexts, so you can keep track of how many modules wanted this context to exist. Some log messages that are warnings were inflated from LOG_NOTICE to LOG_WARNING. Added some calls to ast_verb(3,...) for debug messages Lots of little mods to ast_context_remove_extension2, which is now excersized in ways it was not previously; one definite bug fixed. find_or_create was upgraded to handle both local lists/tables as well as the globals. context_merge() was added to do the per-context merging of the old/present contexts/extens/prios into the new/proposed local list/tables ast_merge_contexts_and_delete() was heavily modified. ast_add_extension2() was also upgraded to handle changes. the context_destroy() code was re-engineered to handle the new way of doing things, by exten/prio instead of by context. res/ael/pval.c res/ael/ael.tab.c res/ael/ael.tab.h res/ael/ael.y res/ael/ael_lex.c res/ael/ael.flex utils/ael_main.c utils/extconf.c utils/conf2ael.c utils/Makefile Had to change the interface to ast_compile_ael2(), to include the hashtab ptr. This ended up involving several external apps. The main gotcha was I had to include lock.h and hashtab.h in several places. As a side note, I tested this stuff pretty thoroughly, I replicated the problems originally reported by Luigi, and made triply sure that reloads worked, and everything worked thru "stop gracefully". I found a and fixed a few bugs as I was merging into trunk, that did not appear in my tests of bug6002. How's this for verbose commit messages? git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106757 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-05Create a centralized configuration option for silencethresholdTilghman Lesher
(closes issue #11236) Reported by: philipps Patches: 20080218__bug11236.diff.txt uploaded by Corydon76 (license 14) Tested by: philipps git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106072 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-11Merged revisions 103324 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r103324 | file | 2008-02-11 18:09:07 -0400 (Mon, 11 Feb 2008) | 4 lines If entering a conference with the 'w' option ensure that we can't listen or speak until the marked user appears. (closes issue #11835) Reported by: alanmcmillan ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-14Update documentation.Joshua Colp
(closes issue #11763) Reported by: IgorG Patches: docupd.v1.diff uploaded by IgorG (license 20) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-09Merged revisions 97450 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r97450 | file | 2008-01-09 12:11:17 -0400 (Wed, 09 Jan 2008) | 6 lines Don't do conferencing totally in Zaptel if Monitor is running on the channel. (closes issue #11709) Reported by: BigJimmy Patches: patch-meetmerec uploaded by BigJimmy (license 371) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-02fix a spacing issue introduced in revision 95443.Russell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-31Fix a compiler warningMark Michelson
(closes issue #11658, reported and patched by eliel) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95443 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-14gcc 4.1.3 wants a union used here.Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-13When working with dates, use numeric form whenever possible, as it's faster.Tilghman Lesher
Also, a bunch of coding guidelines fixes. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-12Merged revisions 92617 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #11048) ........ r92617 | qwell | 2007-12-12 15:15:45 -0600 (Wed, 12 Dec 2007) | 4 lines Don't increment user count until after name has been recorded (if enabled). Issue 11048, tested by pep. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92618 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-06Adding small missing but important comma...Olle Johansson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-06A big oops... Olle Johansson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-06The MeetmeJoin now has caller ID name and Caller ID number fields (like ↵Olle Johansson
MeetMeLeave) (Moremanager) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-03Merged revisions 90696 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 (Closes issue #11383) ........ r90696 | qwell | 2007-12-03 16:06:36 -0600 (Mon, 03 Dec 2007) | 4 lines Make sure we always close the conference fd if we have an open one. Issue 11383, reported by markmhy, patch by eliel. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-26- Mark "concise" as deprecatedOlle Johansson
- Restructure other changes to UPGRADE.txt and CHANGES We're still looking for scripts that replace asterisk -rx "show shannels concise" by using the manager interface, but still produces the same output. Anyone? git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-26Merged revisions 89571 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r89571 | file | 2007-11-26 10:41:03 -0400 (Mon, 26 Nov 2007) | 4 lines When unloading app_meetme destroy any auto created contexts created by SLA. (closes issue #11367) Reported by: eliel ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-21remove another set of redundant #include "asterisk/options.h"Luigi Rizzo
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-21Merge changes from team/russell/sla_trunk_moh ...Russell Bryant
* Added the ability to specify the music on hold class used to play into the conference when there is only one member and the M option is used. * Added the ability to specify a music on hold class to play instead of ringing for the SLATrunk application. (patched by me, and tested internally) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-20Make trunk build againTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-19more errno.h removalLuigi Rizzo
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-19include "logger.h" and errno.h from asterisk.h - usage shows that theyLuigi Rizzo
were included almost everywhere. Remove some of the instances. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-16Start untangling header inclusion in a way that does not affectLuigi Rizzo
build times - tested, there is no measureable difference before and after this commit. In this change: use asterisk/compat.h to include a small set of system headers: inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h, stdlib.h, alloca.h, stdio.h Where available, the inclusion is conditional on HAVE_FOO_H as determined by autoconf. Normally, source files should not include any of the above system headers, and instead use either "asterisk.h" or "asterisk/compat.h" which does it better. For the time being I have left alone second-level directories (main/db1-ast, etc.). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-15Merged revisions 89296 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r89296 | russell | 2007-11-15 11:19:28 -0600 (Thu, 15 Nov 2007) | 8 lines Update the SLAStation application to account for the case where the SLA thread has a call out to the station, but the user has pressed a line button to answer the call instead of picking up the handset. If they do, the phone sends out a new INVITE. So, the SLAStation app must check to see if it is picking up a ringing trunk, and ensure that the other stations stop ringing. (reported internally, patched by me, tested by mogorman) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08improve linked-list macros in two ways:Kevin P. Fleming
- the *_CURRENT macros no longer need the list head pointer argument - add AST_LIST_MOVE_CURRENT to encapsulate the remove/add operation when moving entries between lists git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06Added the ability to do "meetme concise" with the "meetme" CLI command.Russell Bryant
This extends the concise capabilities of this CLI command to include listing all conferences, instead of an addition to the other sub commands for the "meetme" command. (closes issue #11078) Reported by: jthomas Patches: meetme-concise.patch uploaded by jthomas (license 293) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06Added the S() and L() options to the MeetMe application. These are prettyRussell Bryant
much identical to the S() and L() options to Dial(). They let you set timeouts for the conference, as well as have warning sounds played to let the caller know how much time is left, and when it is running out. (closes issue #8030) Reported by: areski Patches: meetme_timeout_timelimit_v2.patch uploaded by areski (license 29) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-04Simplify the implementation and the API for stringfields;Luigi Rizzo
details and examples are in include/asterisk/stringfields.h. Not applicable to older branches except for 1.4 which will receive a fix for the routines that free memory pools. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01Merged revisions 88026 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r88026 | file | 2007-11-01 10:27:37 -0300 (Thu, 01 Nov 2007) | 2 lines Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01Janitor: use ast_free to pair calls of ast_malloc and ast_callocTilghman Lesher
Reported by: eliel Patch by: eliel Closes issue #11135 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01Merged revisions 87970 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87970 | file | 2007-10-31 22:53:55 -0300 (Wed, 31 Oct 2007) | 4 lines If a Zap channel contains a spy or a spy is added take it out of the conference in kernel space and make it go through Asterisk so the spy gets audio from both sides. (closes issue #10060) Reported by: mparker ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29If a caller is listen-only, then don't bother with doing talker detection.Russell Bryant
(closes issue #10911, reported by junky, patched by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-25Add support for a muted user to request to talk. The '2' option in the userRussell Bryant
menu will adjust this status if a user is muted. The talk request status will be reflected in the CLI commands as well as the manager interface. (closes issue #9418) Reported by: imesper Patches: app_meetme_v2.patch uploaded by imesper (license 275) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-22Switch from AST_CLI (formerly NEW_CLI) to AST_CLI_DEFINE, since the former ↵Jason Parker
didn't make much sense git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-19Convert NEW_CLI to AST_CLI.Jason Parker
Closes issue #11039, as suggested by seanbright. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-17Enhancements to realtime (closes issue #9609)Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-01Corydon posted this janitor project to the bug tracker and mvanbaak providedRussell Bryant
a patch for it. It replaces a bunch of simple calls to snprintf with ast_copy_string (closes issue #10843) Reported by: Corydon76 Patches: 2007092900_10843.diff uploaded by mvanbaak (license 7) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-22Add the MeetmeList and Reload manager commands, which supplement the need to ↵Tilghman Lesher
have Command privilege. (closes issue #10736) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-19More conversions to NEW_CLIJason Parker
(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: https://origsvn.digium.com/svn/asterisk/trunk@83213 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17Make the MALLOC_DEBUG output for free() useful again. After changing calls toRussell Bryant
free to be ast_free, astmm said all calls to free were coming from utils.h git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12Merged revisions 82286 via svnmerge from Dwayne M. Hubbard
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: https://origsvn.digium.com/svn/asterisk/trunk@82287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11(closes issue #10560)Joshua Colp
Reported by: ruffle Patches: rb uploaded by ruffle (license 201) Show whether the conference is locked or not on the CLI. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-10(closes issue #10686)Joshua Colp
Reported by: junky Patches: meet.diff uploaded by junky (license 177) Change NOTICE message to DEBUG. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06Merged revisions 81776 via svnmerge from Joshua Colp
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: https://origsvn.digium.com/svn/asterisk/trunk@81777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-29Changing a NOTICE to a DEBUG.Mark Michelson
(closes issue #10591, reported and patched by junky, with small modification by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16Don't reload a configuration file if nothing has changed.Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 13:33:28 +0000