[svn-commits] branch jcollie/bug6082 r35532 - in
/team/jcollie/bug6082: ./ agi/ apps/ cdr/ ...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Jun 22 09:23:35 MST 2006
Author: jcollie
Date: Thu Jun 22 11:23:35 2006
New Revision: 35532
URL: http://svn.digium.com/view/asterisk?rev=35532&view=rev
Log:
Merged revisions 35501-35504,35506,35510 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r35501 | russell | 2006-06-22 10:08:08 -0500 (Thu, 22 Jun 2006) | 4 lines
- specify that 'depend' is a .PHONY target
- use separate targets instead of a for loop for doing 'make depend' for
each sub directory
........
r35502 | oej | 2006-06-22 10:34:20 -0500 (Thu, 22 Jun 2006) | 2 lines
Formatting fixes
........
r35503 | russell | 2006-06-22 10:38:13 -0500 (Thu, 22 Jun 2006) | 7 lines
- convert the 'uninstall' target to use separate targets to process each
subdirectory instead of a for loop
- remove the FORCE target from the main Makefile and add the couple places
I used it to the .PHONY target. .PHONY does the same thing and is a built-in
more efficient way of doing it.
- add a bunch more targets to .PHONY ...
........
r35504 | tilghman | 2006-06-22 10:43:02 -0500 (Thu, 22 Jun 2006) | 2 lines
Bug 6589 - option to display channel variables in queue events
........
r35506 | russell | 2006-06-22 10:45:32 -0500 (Thu, 22 Jun 2006) | 2 lines
add a couple more targets to .PHONY
........
r35510 | russell | 2006-06-22 10:55:13 -0500 (Thu, 22 Jun 2006) | 2 lines
use .PHONY instead of FORCE
........
Modified:
team/jcollie/bug6082/ (props changed)
team/jcollie/bug6082/Makefile
team/jcollie/bug6082/agi/Makefile
team/jcollie/bug6082/apps/Makefile
team/jcollie/bug6082/apps/app_queue.c
team/jcollie/bug6082/cdr/Makefile
team/jcollie/bug6082/channels/Makefile
team/jcollie/bug6082/channels/h323/Makefile
team/jcollie/bug6082/codecs/Makefile
team/jcollie/bug6082/configs/queues.conf.sample
team/jcollie/bug6082/formats/Makefile
team/jcollie/bug6082/funcs/Makefile
team/jcollie/bug6082/manager.c
team/jcollie/bug6082/pbx/Makefile
team/jcollie/bug6082/res/Makefile
team/jcollie/bug6082/sounds/Makefile
team/jcollie/bug6082/utils/Makefile
Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
autoconf = *
Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 22 11:23:35 2006
@@ -1,1 +1,1 @@
-/trunk:1-35483
+/trunk:1-35531
Modified: team/jcollie/bug6082/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/Makefile (original)
+++ team/jcollie/bug6082/Makefile Thu Jun 22 11:23:35 2006
@@ -12,8 +12,6 @@
#
.EXPORT_ALL_VARIABLES:
-
-.PHONY: sounds clean clean-depend dist-clean all
# Create OPTIONS variable
OPTIONS=
@@ -264,12 +262,16 @@
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
-OTHER_SUBDIRS=utils agi
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
+MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
+OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
+SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
+SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
@@ -368,10 +370,10 @@
all: cleantest config.status menuselect.makeopts depend asterisk $(SUBDIRS)
-$(MOD_SUBDIRS): FORCE
+$(MOD_SUBDIRS):
@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
-$(OTHER_SUBDIRS): FORCE
+$(OTHER_SUBDIRS):
@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
config.status: configure
@@ -775,9 +777,13 @@
valgrind: dont-optimize
-depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h
- @for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
- @for x in $(OTHER_SUBDIRS); do CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
+$(MOD_SUBDIRS_DEPEND):
+ @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+
+$(OTHER_SUBDIRS_DEPEND):
+ @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+
+depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h $(SUBDIRS_DEPEND)
.depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h
build_tools/mkdep $(CFLAGS) $(wildcard *.c)
@@ -809,8 +815,6 @@
etags: TAGS
-FORCE:
-
%_env:
$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
@@ -830,7 +834,10 @@
$(MAKE) defaults.h;\
fi
-_uninstall:
+$(SUBDIRS_UNINSTALL):
+ @$(MAKE) -C $(@:-uninstall=) uninstall
+
+_uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/*
rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
@@ -838,7 +845,6 @@
rm -rf $(DESTDIR)$(ASTHEADERDIR)
rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
rm -rf $(DESTDIR)$(ASTMANDIR)/man8
- for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
$(MAKE) -C sounds uninstall
uninstall: _uninstall
@@ -876,3 +882,5 @@
makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
@echo "Generating list of available modules ..."
@build_tools/prep_moduledeps > $@
+
+.PHONY: sounds clean clean-depend dist-clean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize valgrind $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) sounds
Modified: team/jcollie/bug6082/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/agi/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/agi/Makefile (original)
+++ team/jcollie/bug6082/agi/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
Modified: team/jcollie/bug6082/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/apps/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/apps/Makefile (original)
+++ team/jcollie/bug6082/apps/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/apps/app_queue.c?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/apps/app_queue.c (original)
+++ team/jcollie/bug6082/apps/app_queue.c Thu Jun 22 11:23:35 2006
@@ -330,6 +330,7 @@
#define QUEUE_EMPTY_STRICT 2
#define ANNOUNCEHOLDTIME_ALWAYS 1
#define ANNOUNCEHOLDTIME_ONCE 2
+#define QUEUE_EVENT_VARIABLES 3
struct call_queue {
ast_mutex_t lock;
@@ -340,7 +341,7 @@
unsigned int monjoin:1;
unsigned int dead:1;
unsigned int joinempty:2;
- unsigned int eventwhencalled:1;
+ unsigned int eventwhencalled:2;
unsigned int leavewhenempty:2;
unsigned int ringinuse:1;
unsigned int setinterfacevar:1;
@@ -874,7 +875,11 @@
} else if (!strcasecmp(param, "eventmemberstatus")) {
q->maskmemberstatus = !ast_true(val);
} else if (!strcasecmp(param, "eventwhencalled")) {
- q->eventwhencalled = ast_true(val);
+ if (strcasecmp(val, "vars")) {
+ q->eventwhencalled = QUEUE_EVENT_VARIABLES;
+ } else {
+ q->eventwhencalled = ast_true(val);
+ }
} else if (!strcasecmp(param, "reportholdtime")) {
q->reportholdtime = ast_true(val);
} else if (!strcasecmp(param, "memberdelay")) {
@@ -1496,6 +1501,41 @@
o->stillgoing = 0;
ast_hangup(o->chan);
o->chan = NULL;
+}
+
+static char *vars2manager(struct ast_channel *chan, char *vars, size_t len)
+{
+ char *tmp = alloca(len);
+
+ if (pbx_builtin_serialize_variables(chan, tmp, len)) {
+ int i, j;
+
+ /* convert "\n" to "\nVariable: " */
+ strcpy(vars, "Variable: ");
+
+ for (i = 0, j = 10; (i < len - 1) && (j < len - 1); i++, j++) {
+ vars[j] = tmp[i];
+
+ if (tmp[i + 1] == '\0')
+ break;
+ if (tmp[i] == '\n') {
+ vars[j] = '\r';
+ vars[++j] = '\n';
+
+ ast_copy_string(&(vars[j]), "Variable: ", len - j);
+ j += 9;
+ }
+ }
+ if (j > len - 1)
+ j = len - 1;
+ vars[j - 2] = '\r';
+ vars[j - 1] = '\n';
+ vars[j] = '\0';
+ } else {
+ /* there are no channel variables; leave it blank */
+ *vars = '\0';
+ }
+ return vars;
}
static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies)
@@ -1589,21 +1629,23 @@
do_hang(tmp);
(*busies)++;
return 0;
- } else {
- if (qe->parent->eventwhencalled) {
- manager_event(EVENT_FLAG_AGENT, "AgentCalled",
- "AgentCalled: %s\r\n"
- "ChannelCalling: %s\r\n"
- "CallerID: %s\r\n"
- "CallerIDName: %s\r\n"
- "Context: %s\r\n"
- "Extension: %s\r\n"
- "Priority: %d\r\n",
- tmp->interface, qe->chan->name,
- S_OR(tmp->chan->cid.cid_num, "unknown"),
- S_OR(tmp->chan->cid.cid_name, "unknown"),
- qe->chan->context, qe->chan->exten, qe->chan->priority);
- }
+ } else if (qe->parent->eventwhencalled) {
+ char vars[2048];
+
+ manager_event(EVENT_FLAG_AGENT, "AgentCalled",
+ "AgentCalled: %s\r\n"
+ "ChannelCalling: %s\r\n"
+ "CallerID: %s\r\n"
+ "CallerIDName: %s\r\n"
+ "Context: %s\r\n"
+ "Extension: %s\r\n"
+ "Priority: %d\r\n"
+ "%s",
+ tmp->interface, qe->chan->name,
+ tmp->chan->cid.cid_num ? tmp->chan->cid.cid_num : "unknown",
+ tmp->chan->cid.cid_name ? tmp->chan->cid.cid_name : "unknown",
+ qe->chan->context, qe->chan->exten, qe->chan->priority,
+ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", tmp->interface);
}
@@ -2233,6 +2275,7 @@
char mixmonargs[1512];
struct ast_app *mixmonapp = NULL;
char *p;
+ char vars[2048];
memset(&bridge_config, 0, sizeof(bridge_config));
time(&now);
@@ -2381,14 +2424,15 @@
ast_log(LOG_WARNING, "Agent on %s hungup on the customer. They're going to be pissed.\n", peer->name);
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "AGENTDUMP", "%s", "");
record_abandoned(qe);
- if (qe->parent->eventwhencalled) {
+ if (qe->parent->eventwhencalled)
manager_event(EVENT_FLAG_AGENT, "AgentDump",
- "Queue: %s\r\n"
- "Uniqueid: %s\r\n"
- "Channel: %s\r\n"
- "Member: %s\r\n",
- queuename, qe->chan->uniqueid, peer->name, member->interface);
- }
+ "Queue: %s\r\n"
+ "Uniqueid: %s\r\n"
+ "Channel: %s\r\n"
+ "Member: %s\r\n"
+ "%s",
+ queuename, qe->chan->uniqueid, peer->name, member->interface,
+ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_hangup(peer);
goto out;
} else if (res2) {
@@ -2526,14 +2570,16 @@
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "CONNECT", "%ld|%s", (long)time(NULL) - qe->start, peer->uniqueid);
if (qe->parent->eventwhencalled)
manager_event(EVENT_FLAG_AGENT, "AgentConnect",
- "Queue: %s\r\n"
- "Uniqueid: %s\r\n"
- "Channel: %s\r\n"
- "Member: %s\r\n"
- "Holdtime: %ld\r\n"
- "BridgedChannel: %s\r\n",
- queuename, qe->chan->uniqueid, peer->name, member->interface,
- (long) time(NULL) - qe->start,peer->uniqueid);
+ "Queue: %s\r\n"
+ "Uniqueid: %s\r\n"
+ "Channel: %s\r\n"
+ "Member: %s\r\n"
+ "Holdtime: %ld\r\n"
+ "BridgedChannel: %s\r\n"
+ "%s",
+ queuename, qe->chan->uniqueid, peer->name, member->interface,
+ (long)time(NULL) - qe->start, peer->uniqueid,
+ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
time(&callstart);
@@ -2549,28 +2595,32 @@
(long) (callstart - qe->start), (long) (time(NULL) - callstart));
if (qe->parent->eventwhencalled)
manager_event(EVENT_FLAG_AGENT, "AgentComplete",
- "Queue: %s\r\n"
- "Uniqueid: %s\r\n"
- "Channel: %s\r\n"
- "Member: %s\r\n"
- "HoldTime: %ld\r\n"
- "TalkTime: %ld\r\n"
- "Reason: caller\r\n",
- queuename, qe->chan->uniqueid, peer->name, member->interface,
- (long) (callstart - qe->start), (long) (time(NULL) - callstart));
+ "Queue: %s\r\n"
+ "Uniqueid: %s\r\n"
+ "Channel: %s\r\n"
+ "Member: %s\r\n"
+ "HoldTime: %ld\r\n"
+ "TalkTime: %ld\r\n"
+ "Reason: caller\r\n"
+ "%s",
+ queuename, qe->chan->uniqueid, peer->name, member->interface,
+ (long)(callstart - qe->start), (long)(time(NULL) - callstart),
+ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
} else {
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "COMPLETEAGENT", "%ld|%ld",
(long) (callstart - qe->start), (long) (time(NULL) - callstart));
if (qe->parent->eventwhencalled)
manager_event(EVENT_FLAG_AGENT, "AgentComplete",
- "Queue: %s\r\n"
- "Uniqueid: %s\r\n"
- "Channel: %s\r\n"
- "HoldTime: %ld\r\n"
- "TalkTime: %ld\r\n"
- "Reason: agent\r\n",
- queuename, qe->chan->uniqueid, peer->name, (long)(callstart - qe->start),
- (long) (time(NULL) - callstart));
+ "Queue: %s\r\n"
+ "Uniqueid: %s\r\n"
+ "Channel: %s\r\n"
+ "HoldTime: %ld\r\n"
+ "TalkTime: %ld\r\n"
+ "Reason: agent\r\n"
+ "%s",
+ queuename, qe->chan->uniqueid, peer->name, (long)(callstart - qe->start),
+ (long)(time(NULL) - callstart),
+ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
}
if (bridge != AST_PBX_NO_HANGUP_PEER)
Modified: team/jcollie/bug6082/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/cdr/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/cdr/Makefile (original)
+++ team/jcollie/bug6082/cdr/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/channels/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/channels/Makefile (original)
+++ team/jcollie/bug6082/channels/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/channels/h323/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/channels/h323/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/channels/h323/Makefile (original)
+++ team/jcollie/bug6082/channels/h323/Makefile Thu Jun 22 11:23:35 2006
@@ -3,6 +3,8 @@
#
# Make file for OpenH323 support layer
#
+
+.PHONY: Makefile.ast
# Verify those options with main Makefile
STDCCFLAGS += -DNDEBUG
@@ -31,7 +33,7 @@
libchanh323.a: $(OBJS)
ar crv $@ $(OBJS)
-Makefile.ast: FORCE
+Makefile.ast:
@echo H323CFLAGS = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp
@echo H323LDFLAGS = $(CFLAGS) $(LDFLAGS) >>$@.tmp
@echo H323LDLIBS = $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) >>$@.tmp
@@ -39,5 +41,3 @@
clean::
rm -f ast_h323.cxx libchanh323.a Makefile.ast *.dep
-
-FORCE:
Modified: team/jcollie/bug6082/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/codecs/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/codecs/Makefile (original)
+++ team/jcollie/bug6082/codecs/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/configs/queues.conf.sample
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/configs/queues.conf.sample?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/configs/queues.conf.sample (original)
+++ team/jcollie/bug6082/configs/queues.conf.sample Thu Jun 22 11:23:35 2006
@@ -250,10 +250,11 @@
;
;
; If this is set to yes, the following manager events will be generated:
-; AgentCalled, AgentDump, AgentConnect, AgentComplete
+; AgentCalled, AgentDump, AgentConnect, AgentComplete; setting this to
+; vars also sends all channel variables with the event.
; (may generate some extra manager events, but probably ones you want)
;
-; eventwhencalled = yes
+; eventwhencalled = yes|no|vars
;
; If this is set to no, the following manager events will be generated:
; QueueMemberStatus
Modified: team/jcollie/bug6082/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/formats/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/formats/Makefile (original)
+++ team/jcollie/bug6082/formats/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/funcs/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/funcs/Makefile (original)
+++ team/jcollie/bug6082/funcs/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/manager.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/manager.c?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/manager.c (original)
+++ team/jcollie/bug6082/manager.c Thu Jun 22 11:23:35 2006
@@ -187,7 +187,7 @@
static struct manager_action *first_action = NULL;
AST_MUTEX_DEFINE_STATIC(actionlock);
-/*! authority_to_str: Convert authority code to string with serveral options */
+/*! \brief Convert authority code to string with serveral options */
static char *authority_to_str(int authority, char *res, int reslen)
{
int running_total = 0, i;
@@ -436,8 +436,8 @@
return RESULT_SUCCESS;
}
-/*! \brief handle_showmancmds: CLI command */
-/* Should change to "manager show commands" */
+/*! \brief CLI command
+ Should change to "manager show commands" */
static int handle_showmancmds(int fd, int argc, char *argv[])
{
struct manager_action *cur = first_action;
@@ -456,7 +456,7 @@
return RESULT_SUCCESS;
}
-/*! \brief handle_showmanconn: CLI command show manager connected */
+/*! \brief CLI command show manager connected */
/* Should change to "manager show connected" */
static int handle_showmanconn(int fd, int argc, char *argv[])
{
@@ -475,7 +475,7 @@
return RESULT_SUCCESS;
}
-/*! \brief handle_showmanconn: CLI command show manager connected */
+/*! \brief CLI command show manager connected */
/* Should change to "manager show connected" */
static int handle_showmaneventq(int fd, int argc, char *argv[])
{
@@ -631,7 +631,7 @@
return head;
}
-/*! NOTE:
+/*! \note NOTE:
Callers of astman_send_error(), astman_send_response() or astman_send_ack() must EITHER
hold the session lock _or_ be running in an action callback (in which case s->busy will
be non-zero). In either of these cases, there is no need to lock-protect the session's
@@ -748,11 +748,10 @@
return ret;
}
-/*!
+/*! \brief
Rather than braindead on,off this now can also accept a specific int mask value
or a ',' delim list of mask strings (the same as manager.conf) -anthm
*/
-
static int set_eventmask(struct mansession *s, char *eventmask)
{
int maskint = ast_strings_to_mask(eventmask);
@@ -865,7 +864,7 @@
return -1;
}
-/*! \brief PING: Manager PING */
+/*! \brief Manager PING */
static char mandescr_ping[] =
"Description: A 'Ping' action will ellicit a 'Pong' response. Used to keep the\n"
" manager connection open.\n"
@@ -877,7 +876,7 @@
return 0;
}
-/*! \brief WAITEVENT: Manager WAITEVENT */
+/*! \brief Manager WAITEVENT */
static char mandescr_waitevent[] =
"Description: A 'WaitEvent' action will ellicit a 'Success' response. Whenever\n"
"a manager event is queued. Once WaitEvent has been called on an HTTP manager\n"
@@ -1141,7 +1140,7 @@
}
-/*! \brief action_status: Manager "status" command to show channels */
+/*! \brief Manager "status" command to show channels */
/* Needs documentation... */
static int action_status(struct mansession *s, struct message *m)
{
@@ -1483,7 +1482,7 @@
return 0;
}
-/*! \brief Help text for manager command mailboxstatus
+/*! \brief Help text for manager command mailboxstatus
*/
static char mandescr_mailboxstatus[] =
"Description: Checks a voicemail account for status.\n"
@@ -2455,7 +2454,6 @@
/* If not enabled, do nothing */
if (!ast_test_flag(&global_options, MANAGER_FLAG_ENABLED)) {
return 0;
- }
if (asock < 0) {
asock = socket(AF_INET, SOCK_STREAM, 0);
Modified: team/jcollie/bug6082/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/pbx/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/pbx/Makefile (original)
+++ team/jcollie/bug6082/pbx/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/res/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/res/Makefile (original)
+++ team/jcollie/bug6082/res/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/sounds/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/sounds/Makefile (original)
+++ team/jcollie/bug6082/sounds/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: dist-clean all
+.PHONY: dist-clean all uninstall
ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
Modified: team/jcollie/bug6082/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/utils/Makefile?rev=35532&r1=35531&r2=35532&view=diff
==============================================================================
--- team/jcollie/bug6082/utils/Makefile (original)
+++ team/jcollie/bug6082/utils/Makefile Thu Jun 22 11:23:35 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend uninstall
UTILS:=astman smsq stereorize streamplayer aelparse
More information about the svn-commits
mailing list