aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
AgeCommit message (Collapse)AuthorFilesLines
2008-11-13Introduce XML documentation for:eliel1-149/+365
- MeetMe() - MeetMeCount() - MeetMeChannelAdmin() - MeetMeAdmin() - SLAStation() - SLATrunk() - Add an attribute to optionlist 'hasparams' with the same functionality as the one we have in <parameter> and <argument> (the DTD was updated) - Fix a leak when getting an attribute while parsing an <optionlist>. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@156575 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156294 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156294 | tilghman | 2008-11-12 13:26:45 -0600 (Wed, 12 Nov 2008) | 6 lines If the SLA thread is not started, then reload causes a memory leak. (closes issue #13889) Reported by: eliel Patches: app_meetme.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@156295 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156289 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156289 | jpeeler | 2008-11-12 13:10:12 -0600 (Wed, 12 Nov 2008) | 3 lines For whatever reason, gcc only warned me about the possible use of an uninitialized variable when compiling 1.6.1. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@156290 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156178 via svnmerge from jpeeler1-24/+148
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156178 | jpeeler | 2008-11-12 11:53:44 -0600 (Wed, 12 Nov 2008) | 8 lines (closes issue #13173) Reported by: pep This change adds an announce_thread responsible for playing announcements to an existing conference. This allows all announcing to be immediately stopped if necessary but more importantly allows other threads that need to play something to not block. There are multiple benefits to this, but the actual bug is for solving the scenario for a channel to be unusable after hang up for the entire duration of the parting announcement. The parting announcement can be extremely long depending on what the user recorded upon joining the conference. Reviewed by Russell on Review Board: http://reviewboard.digium.com/r/25/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@156228 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-17Fix option handling code.tilghman1-13/+26
(closes issue #11040) Reported by: DEA Patches: rt-meetme-flag-fixes-v2.txt uploaded by DEA (license 3) with additional fixes by me git-svn-id: http://svn.digium.com/svn/asterisk/trunk@150384 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-17Initialize character arrays as they are not guaranteed to be set.jpeeler1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@150309 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-08Some small tweaks regarding realtime conference announcements.mmichelson1-3/+3
(closes issue #13522) Reported by: DEA Patches: meetme-rt-fixes.txt uploaded by DEA (license 3) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@147714 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-08Keep up with shadow warnings. One day I'll actually enable this in the ↵seanbright1-6/+6
Makefile. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@147457 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-02fix the 'meetme list', 'meetme list concise', 'meetme list $confno' and ↵mvanbaak1-70/+66
'meetme list $confno concise' CLI commands (closes issue #13586) Reported by: john8675309 Help and feedback from eliel, thanks! git-svn-id: http://svn.digium.com/svn/asterisk/trunk@145915 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-02make this compile under devmode againmvanbaak1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@145842 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-01Add schedule extensions to app_meetme. In addition, the reporter found atilghman1-129/+361
problem within strptime(3), which we are correcting here with ast_strptime(). (closes issue #11040) Reported by: DEA Patches: 20080910__bug11040.diff.txt uploaded by Corydon76 (license 14) Tested by: DEA git-svn-id: http://svn.digium.com/svn/asterisk/trunk@145649 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-28Merge the cli_cleanup branch.mvanbaak1-9/+54
This work is done by lmadsen, junky and mvanbaak during AstriDevCon. This is the second audit the CLI got, and this time lmadsen made sure he had _ALL_ modules loaded that have CLI commands in them. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@145121 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-12Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiatingtilghman1-4/+15
when a file is invalid from when a file is missing. This is most important when we have two configuration files. Consider the following example: Old system: sip.conf users.conf Old result New result ======== ========== ========== ========== Missing Missing SIP doesn't load SIP doesn't load Missing OK SIP doesn't load SIP doesn't load Missing Invalid SIP doesn't load SIP doesn't load OK Missing SIP loads SIP loads OK OK SIP loads SIP loads OK Invalid SIP loads incompletely SIP doesn't load Invalid Missing SIP doesn't load SIP doesn't load Invalid OK SIP doesn't load SIP doesn't load Invalid Invalid SIP doesn't load SIP doesn't load So in the case when users.conf doesn't load because there's a typo that disrupts the syntax, we may only partially load users, instead of failing with an error, which may cause some calls not to get processed. Worse yet, the old system would do this with no indication that anything was even wrong. (closes issue #10690) Reported by: dtyoo Patches: 20080716__bug10690.diff.txt uploaded by Corydon76 (license 14) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@142992 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-10More RSW merges. Everything from apps/ except for the big offendersseanbright1-29/+29
app_voicemail and app_queue. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137055 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-06Janitor ast_str projecttilghman1-47/+73
(closes issue #13058) Reported by: pputman Patches: app_meetme_aststr2.patch uploaded by pputman (license 81) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136141 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-29build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for ↵kpfleming1-1/+1
features that will always be present in DAHDI git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134260 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28merging the zap_and_dahdi_trunk branch up to trunkmmichelson1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134050 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Janitor project to convert sizeof to ARRAY_LEN macro.bbryant1-1/+1
(closes issue #13002) Reported by: caio1982 Patches: janitor_arraylen5.diff uploaded by caio1982 (license 22) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@129045 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-25Merged revisions 125132 via svnmerge from kpfleming1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it get app_rpt building again after the DAHDI changes (closes issue #12911) Reported by: tzafrir ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125138 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-12Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. ↵jpeeler1-93/+93
Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@122234 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-12Merged revisions 122137 via svnmerge from tilghman1-29/+28
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122137 | tilghman | 2008-06-12 10:18:39 -0500 (Thu, 12 Jun 2008) | 8 lines Flipflop the sections for two options, since the section for 'X' (exit context) may otherwise absorb keypresses meant for 's' (admin/user menu). (closes issue #12836) Reported by: blitzrage Patches: 20080611__bug12836.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@122174 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09Expand RQ_INTEGER type out to multiple types, one for each precisiontilghman1-3/+9
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121367 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05Merge the adaptive realtime branch, which will make adding new required fieldstilghman1-0/+5
to realtime less painful in the future. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120789 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-22- revert change to ast_queue_hangup and create ast_queue_hangup_with_causemvanbaak1-2/+2
- make data member of the ast_frame struct a named union instead of a void Recently the ast_queue_hangup function got a new parameter, the hangupcause Feedback came in that this is no good and that instead a new function should be created. This I did. The hangupcause was stored in the seqno member of the ast_frame struct. This is not very elegant, and since there's already a data member that one should be used. Problem is, this member was a void *. Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone wants to store another type in there in the future. This commit is so massive, because all ast_frame.data uses have to be altered to ast_frame.data.data Thanks russellb and kpfleming for the feedback. (closes issue #12674) Reported by: mvanbaak git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117802 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Lock around variables retrieved, and copy the values, if they stay persistent,tilghman1-24/+51
since another thread could remove them. (closes issue #12541) Reported by: snuffy Patches: bug_12156_apps.diff uploaded by snuffy (license 35) Several additional changes by me git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114904 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Fix DST calculation, and fix bug in calculation of whether conf has started ↵tilghman1-31/+39
yet or not (Closes issue #12292) Reported by: DEA Patches: app_meetme-rt-dst-sched-fix.txt uploaded by DEA (license 3) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114617 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-18Add MEETME_INFO dialplan function that allows querying various properties of ↵file1-0/+86
a Meetme conference. (closes issue #11691) Reported by: junky Patches: meetme_info.patch uploaded by jpeeler (license 325) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114261 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-13Use ast_mkdir instead of mkdirtilghman1-1/+1
(Closes issue #12430) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114096 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10Merged revisions 114029 via svnmerge from file1-1/+10
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114029 | file | 2008-04-10 12:09:04 -0300 (Thu, 10 Apr 2008) | 6 lines Create the directory where name recordings will go if it does not exist. (closes issue #12311) Reported by: rkeene Patches: 12311-mkdir.diff uploaded by qwell (license 4) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114030 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-20Remove astobj.h from some places where it wasn't neededrussell1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@110270 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-19Merged revisions 110163 via svnmerge from russell1-2/+3
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: http://svn.digium.com/svn/asterisk/trunk@110164 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-18Go through and fix a bunch of places where character strings were being ↵twilson1-4/+4
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: http://svn.digium.com/svn/asterisk/trunk@109447 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-11Merged revisions 107637 via svnmerge from file1-1/+1
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: http://svn.digium.com/svn/asterisk/trunk@107638 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-07Merged revisions 106895 via svnmerge from russell1-1/+1
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: http://svn.digium.com/svn/asterisk/trunk@106896 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-07(closes issue #6002)murf1-2/+2
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: http://svn.digium.com/svn/asterisk/trunk@106757 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-05Create a centralized configuration option for silencethresholdtilghman1-1/+1
(closes issue #11236) Reported by: philipps Patches: 20080218__bug11236.diff.txt uploaded by Corydon76 (license 14) Tested by: philipps git-svn-id: http://svn.digium.com/svn/asterisk/trunk@106072 f38db490-d61c-443f-a65b-d21fe96a405b
2008-02-11Merged revisions 103324 via svnmerge from file1-1/+3
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: http://svn.digium.com/svn/asterisk/trunk@103325 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-14Update documentation.file1-2/+2
(closes issue #11763) Reported by: IgorG Patches: docupd.v1.diff uploaded by IgorG (license 20) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98695 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-09Merged revisions 97450 via svnmerge from file1-3/+3
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: http://svn.digium.com/svn/asterisk/trunk@97451 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-02fix a spacing issue introduced in revision 95443.russell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95723 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-31Fix a compiler warningmmichelson1-1/+1
(closes issue #11658, reported and patched by eliel) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95443 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-14gcc 4.1.3 wants a union used here.tilghman1-6/+12
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93041 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-13When working with dates, use numeric form whenever possible, as it's faster.tilghman1-91/+82
Also, a bunch of coding guidelines fixes. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92855 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-12Merged revisions 92617 via svnmerge from qwell1-23/+32
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: http://svn.digium.com/svn/asterisk/trunk@92618 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-06Adding small missing but important comma...oej1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91406 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-06A big oops... oej1-4/+8
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91388 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-06The MeetmeJoin now has caller ID name and Caller ID number fields (like ↵oej1-8/+10
MeetMeLeave) (Moremanager) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91387 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-03Merged revisions 90696 via svnmerge from qwell1-1/+1
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: http://svn.digium.com/svn/asterisk/trunk@90697 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-26- Mark "concise" as deprecatedoej1-1/+1
- 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: http://svn.digium.com/svn/asterisk/trunk@89606 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-26Merged revisions 89571 via svnmerge from file1-0/+3
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: http://svn.digium.com/svn/asterisk/trunk@89572 f38db490-d61c-443f-a65b-d21fe96a405b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 11:53:36 +0000