[asterisk-commits] branch mogorman/asterisk-xmpp r23982 - in
/team/mogorman/asterisk-xmpp: ./ ap...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon May 1 11:29:39 MST 2006
Author: mogorman
Date: Mon May 1 13:29:38 2006
New Revision: 23982
URL: http://svn.digium.com/view/asterisk?rev=23982&view=rev
Log:
updating to trunk still has a break in ael.
Removed:
team/mogorman/asterisk-xmpp/mxml/.cvsignore
team/mogorman/asterisk-xmpp/mxml/configure.in
Modified:
team/mogorman/asterisk-xmpp/ (props changed)
team/mogorman/asterisk-xmpp/Makefile
team/mogorman/asterisk-xmpp/UPGRADE.txt
team/mogorman/asterisk-xmpp/acinclude.m4
team/mogorman/asterisk-xmpp/app.c
team/mogorman/asterisk-xmpp/apps/Makefile
team/mogorman/asterisk-xmpp/apps/app_chanspy.c
team/mogorman/asterisk-xmpp/apps/app_directory.c
team/mogorman/asterisk-xmpp/apps/app_meetme.c
team/mogorman/asterisk-xmpp/apps/app_speech_utils.c
team/mogorman/asterisk-xmpp/apps/app_voicemail.c
team/mogorman/asterisk-xmpp/ast_expr2.fl
team/mogorman/asterisk-xmpp/ast_expr2f.c
team/mogorman/asterisk-xmpp/asterisk.c
team/mogorman/asterisk-xmpp/build_tools/cflags.xml
team/mogorman/asterisk-xmpp/build_tools/menuselect-deps.in
team/mogorman/asterisk-xmpp/build_tools/prep_moduledeps
team/mogorman/asterisk-xmpp/cdr.c
team/mogorman/asterisk-xmpp/cdr/Makefile
team/mogorman/asterisk-xmpp/channel.c
team/mogorman/asterisk-xmpp/channels/Makefile
team/mogorman/asterisk-xmpp/channels/chan_h323.c
team/mogorman/asterisk-xmpp/channels/chan_iax2.c
team/mogorman/asterisk-xmpp/channels/chan_misdn.c
team/mogorman/asterisk-xmpp/channels/chan_oss.c
team/mogorman/asterisk-xmpp/channels/chan_sip.c
team/mogorman/asterisk-xmpp/channels/chan_zap.c
team/mogorman/asterisk-xmpp/channels/misdn/isdn_lib.c
team/mogorman/asterisk-xmpp/channels/misdn/isdn_lib_intern.h
team/mogorman/asterisk-xmpp/cli.c
team/mogorman/asterisk-xmpp/configs/mgcp.conf.sample
team/mogorman/asterisk-xmpp/configs/misdn.conf.sample
team/mogorman/asterisk-xmpp/configs/sip.conf.sample
team/mogorman/asterisk-xmpp/configs/zapata.conf.sample
team/mogorman/asterisk-xmpp/configure.ac
team/mogorman/asterisk-xmpp/db1-ast/Makefile
team/mogorman/asterisk-xmpp/devicestate.c
team/mogorman/asterisk-xmpp/doc/asterisk-conf.txt
team/mogorman/asterisk-xmpp/editline/configure
team/mogorman/asterisk-xmpp/editline/makelist
team/mogorman/asterisk-xmpp/http.c
team/mogorman/asterisk-xmpp/include/asterisk/frame.h
team/mogorman/asterisk-xmpp/include/asterisk/options.h
team/mogorman/asterisk-xmpp/include/asterisk/pbx.h
team/mogorman/asterisk-xmpp/makeopts.in
team/mogorman/asterisk-xmpp/manager.c
team/mogorman/asterisk-xmpp/mxml/Makefile.in
team/mogorman/asterisk-xmpp/pbx.c
team/mogorman/asterisk-xmpp/pbx/Makefile
team/mogorman/asterisk-xmpp/pbx/ael/ael-test/runtests
team/mogorman/asterisk-xmpp/pbx/ael/ael.flex
team/mogorman/asterisk-xmpp/pbx/ael/ael.tab.c
team/mogorman/asterisk-xmpp/pbx/ael/ael.tab.h
team/mogorman/asterisk-xmpp/pbx/ael/ael.y
team/mogorman/asterisk-xmpp/pbx/ael/ael_lex.c
team/mogorman/asterisk-xmpp/pbx/pbx_ael.c
team/mogorman/asterisk-xmpp/pbx/pbx_dundi.c
team/mogorman/asterisk-xmpp/res/Makefile
team/mogorman/asterisk-xmpp/res/res_agi.c
team/mogorman/asterisk-xmpp/res/res_clioriginate.c
team/mogorman/asterisk-xmpp/res/res_config_pgsql.c
team/mogorman/asterisk-xmpp/res/res_features.c
team/mogorman/asterisk-xmpp/res/res_monitor.c
team/mogorman/asterisk-xmpp/res/res_musiconhold.c
team/mogorman/asterisk-xmpp/res/snmp/agent.c
team/mogorman/asterisk-xmpp/rtp.c
team/mogorman/asterisk-xmpp/udptl.c
team/mogorman/asterisk-xmpp/utils/ (props changed)
team/mogorman/asterisk-xmpp/utils/Makefile
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 1 13:29:38 2006
@@ -1,1 +1,1 @@
-/trunk:1-22873
+/trunk:1-23981
Modified: team/mogorman/asterisk-xmpp/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/Makefile?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/Makefile (original)
+++ team/mogorman/asterisk-xmpp/Makefile Mon May 1 13:29:38 2006
@@ -196,8 +196,9 @@
endif
ASTCFLAGS+=$(MENUSELECT_CFLAGS)
-TOPDIR_CFLAGS=-include include/autoconfig.h
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h
+TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
# *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename]
@@ -213,7 +214,6 @@
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
#PROC=athlon
- OPTIONS+=-m64
endif
ifeq ($(PROC),sparc64)
@@ -234,9 +234,9 @@
OPTIONS+=-fsigned-char -mcpu=ep9312
else
ifeq ($(SUB_PROC),xscale)
- OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+ OPTIONS+=-fsigned-char -mcpu=xscale
else
- OPTIONS+=-fsigned-char -msoft-float
+ OPTIONS+=-fsigned-char
endif
endif
endif
@@ -252,7 +252,6 @@
ID=/usr/xpg4/bin/id
endif
-INCLUDE+=-Iinclude -I../include
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE)
@@ -465,10 +464,10 @@
endif
editline/config.h:
- cd editline && unset CFLAGS LIBS && ./configure ; \
+ cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
editline/libedit.a:
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a:
@@ -545,8 +544,8 @@
subdirs:
for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
- CFLAGS="$(ASTCFLAGS)" $(MAKE) -C utils
- CFLAGS="$(ASTCFLAGS) -include ../include/autoconfig.h" $(MAKE) -C agi
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -564,6 +563,8 @@
$(MAKE) -C db1-ast clean
$(MAKE) -C stdtime clean
+distclean: dist-clean
+
dist-clean: clean
rm -f menuselect.makeopts makeopts makeopts.xml
rm -f config.log config.status
@@ -578,7 +579,7 @@
# improved a lot. I'll put it here for now.
mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
for x in static-http/*; do \
- install -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
@@ -681,7 +682,6 @@
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
@@ -706,28 +706,9 @@
echo "You need to do cvs update -d not just cvs update" ; \
fi
if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
- @echo " +---- Asterisk Installation Complete -------+"
- @echo " + +"
- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
- @echo " + +"
- @echo " + Asterisk has successfully been installed. +"
- @echo " + If you would like to install the sample +"
- @echo " + configuration files (overwriting any +"
- @echo " + existing config files), run: +"
- @echo " + +"
- @echo " + $(MAKE) samples +"
- @echo " + +"
- @echo " +----------------- or ---------------------+"
- @echo " + +"
- @echo " + You can go ahead and install the asterisk +"
- @echo " + program documentation now or later run: +"
- @echo " + +"
- @echo " + $(MAKE) progdocs +"
- @echo " + +"
- @echo " + **Note** This requires that you have +"
- @echo " + doxygen installed on your local system +"
- @echo " +-------------------------------------------+"
- @$(MAKE) -s oldmodcheck
+
+install-subdirs:
+ for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
NEWMODS=$(notdir $(wildcard */*.so))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -750,10 +731,32 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: all datafiles bininstall
+install: all datafiles bininstall install-subdirs
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
+ @echo " +---- Asterisk Installation Complete -------+"
+ @echo " + +"
+ @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+ @echo " + +"
+ @echo " + Asterisk has successfully been installed. +"
+ @echo " + If you would like to install the sample +"
+ @echo " + configuration files (overwriting any +"
+ @echo " + existing config files), run: +"
+ @echo " + +"
+ @echo " + $(MAKE) samples +"
+ @echo " + +"
+ @echo " +----------------- or ---------------------+"
+ @echo " + +"
+ @echo " + You can go ahead and install the asterisk +"
+ @echo " + program documentation now or later run: +"
+ @echo " + +"
+ @echo " + $(MAKE) progdocs +"
+ @echo " + +"
+ @echo " + **Note** This requires that you have +"
+ @echo " + doxygen installed on your local system +"
+ @echo " +-------------------------------------------+"
+ @$(MAKE) -s oldmodcheck
upgrade: all bininstall
Modified: team/mogorman/asterisk-xmpp/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/UPGRADE.txt?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/UPGRADE.txt (original)
+++ team/mogorman/asterisk-xmpp/UPGRADE.txt Mon May 1 13:29:38 2006
@@ -122,6 +122,11 @@
option in sip.conf is removed to osp.conf as authpolicy. allowguest option
in sip.conf cannot be set as osp anymore.
+The Zap channel:
+
+* Support for MFC/R2 has been removed, as it has not been functional for some time
+ and it has no maintainer.
+
Installation:
* On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf
Modified: team/mogorman/asterisk-xmpp/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/acinclude.m4?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/acinclude.m4 (original)
+++ team/mogorman/asterisk-xmpp/acinclude.m4 Mon May 1 13:29:38 2006
@@ -19,14 +19,18 @@
PBX_LIB$1=0
-if test "${USE_$1}" != "no"; then
- AC_CHECK_LIB([$1], [$2], [], [], -L${$1_DIR}/lib $6)
+if test "${USE_$1}" != "no"; then
+ libdir=""
+ if test "x${$1_DIR}" != "x"; then
+ libdir="-L${$1_DIR}/lib"
+ fi
+ AC_CHECK_LIB([$1], [$2], [:], [], ${libdir} $6)
if test "${ac_cv_lib_$1_$2}" = "yes"; then
$1_LIB="-l$1 $6"
$4_HEADER_FOUND="1"
if test "x${$1_DIR}" != "x"; then
- $1_LIB="-L${$1_DIR}/lib ${$1_LIB}"
+ $1_LIB="${libdir} ${$1_LIB}"
$1_INCLUDE="-I${$1_DIR}/include"
if test "x$3" != "x" ; then
AC_CHECK_HEADER([${$1_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
@@ -68,7 +72,7 @@
AC_DEFUN(
-[AST_CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make, GNU_MAKE,
+[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
GNU_MAKE='Not Found' ;
for a in make gmake gnumake ; do
if test -z "$a" ; then continue ; fi ;
@@ -83,4 +87,4 @@
exit 1
fi
AC_SUBST([GNU_MAKE])
-] )
+])
Modified: team/mogorman/asterisk-xmpp/app.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/app.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/app.c (original)
+++ team/mogorman/asterisk-xmpp/app.c Mon May 1 13:29:38 2006
@@ -1042,7 +1042,7 @@
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !strcasecmp(test, group))
count++;
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(chan);
}
return count;
@@ -1072,7 +1072,7 @@
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !regexec(®exbuf, test, 0, NULL, 0))
count++;
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(chan);
}
regfree(®exbuf);
Modified: team/mogorman/asterisk-xmpp/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/Makefile?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/Makefile (original)
+++ team/mogorman/asterisk-xmpp/apps/Makefile Mon May 1 13:29:38 2006
@@ -41,7 +41,7 @@
$(CC) $(SOLINK) -o $@ $< $(ZAPTEL_LIB)
app_rpt.o: app_rpt.c
- $(CC) $(SOLINK) -o $@ $< $(ZAPTEL_INCLUDE)
+ $(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
Modified: team/mogorman/asterisk-xmpp/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_chanspy.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_chanspy.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_chanspy.c Mon May 1 13:29:38 2006
@@ -56,7 +56,7 @@
#define ALL_DONE(u, ret) LOCAL_USER_REMOVE(u); return ret;
#define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
-static const char *synopsis = "Listen to the audio of an active channel\n";
+static const char *synopsis = "Listen to the audio of an active channel";
static const char *app = "ChanSpy";
static const char *desc =
" ChanSpy([chanprefix][|options]): This application is used to listen to the\n"
Modified: team/mogorman/asterisk-xmpp/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_directory.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_directory.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_directory.c Mon May 1 13:29:38 2006
@@ -153,19 +153,22 @@
* '1' for selected entry from directory
* '*' for skipped entry from directory
*/
-static int play_mailbox_owner(struct ast_channel *chan, char *context, char *dialcontext, char *ext, char *name, int readext) {
+static int play_mailbox_owner(struct ast_channel *chan, char *context,
+ char *dialcontext, char *ext, char *name, int readext)
+{
int res = 0;
- int loop = 3;
+ int loop;
char fn[256];
- char fn2[256];
/* Check for the VoiceMail2 greeting first */
snprintf(fn, sizeof(fn), "%s/voicemail/%s/%s/greet",
- (char *)ast_config_AST_SPOOL_DIR, context, ext);
-
- /* Otherwise, check for an old-style Voicemail greeting */
- snprintf(fn2, sizeof(fn2), "%s/vm/%s/greet",
- (char *)ast_config_AST_SPOOL_DIR, ext);
+ ast_config_AST_SPOOL_DIR, context, ext);
+
+ if (ast_fileexists(fn, NULL, chan->language) <= 0) {
+ /* no file, check for an old-style Voicemail greeting */
+ snprintf(fn, sizeof(fn), "%s/vm/%s/greet",
+ ast_config_AST_SPOOL_DIR, ext);
+ }
if (ast_fileexists(fn, NULL, chan->language) > 0) {
res = ast_stream_and_wait(chan, fn, chan->language, AST_DIGIT_ANY);
@@ -175,14 +178,6 @@
ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
}
- } else if (ast_fileexists(fn2, NULL, chan->language) > 0) {
- res = ast_stream_and_wait(chan, fn2, chan->language, AST_DIGIT_ANY);
- ast_stopstream(chan);
- /* If Option 'e' was specified, also read the extension number with the name */
- if (readext) {
- ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
- res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
- }
} else {
res = ast_say_character_str(chan, S_OR(name, ext), AST_DIGIT_ANY, chan->language);
if (!ast_strlen_zero(name) && readext) {
@@ -191,44 +186,31 @@
}
}
- while (loop) {
+ for (loop = 3 ; loop > 0; loop--) {
if (!res)
res = ast_stream_and_wait(chan, "dir-instr", chan->language, AST_DIGIT_ANY);
if (!res)
res = ast_waitfordigit(chan, 3000);
ast_stopstream(chan);
- if (res > -1) {
- switch (res) {
- case '1':
- /* Name selected */
- loop = 0;
- if (ast_goto_if_exists(chan, dialcontext, ext, 1)) {
- ast_log(LOG_WARNING,
- "Can't find extension '%s' in context '%s'. "
- "Did you pass the wrong context to Directory?\n",
- ext, dialcontext);
- res = -1;
- }
- break;
-
- case '*':
- /* Skip to next match in list */
- loop = 0;
- break;
-
- default:
- /* Not '1', or '*', so decrement number of tries */
- res = 0;
- loop--;
- break;
- } /* end switch */
- } /* end if */
- else {
- /* User hungup, so jump out now */
- loop = 0;
- }
- } /* end while */
+ if (res < 0) /* User hungup, so jump out now */
+ break;
+ if (res == '1') { /* Name selected */
+ if (ast_goto_if_exists(chan, dialcontext, ext, 1)) {
+ ast_log(LOG_WARNING,
+ "Can't find extension '%s' in context '%s'. "
+ "Did you pass the wrong context to Directory?\n",
+ ext, dialcontext);
+ res = -1;
+ }
+ break;
+ }
+ if (res == '*') /* Skip to next match in list */
+ break;
+
+ /* Not '1', or '*', so decrement number of tries */
+ res = 0;
+ }
return(res);
}
Modified: team/mogorman/asterisk-xmpp/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_meetme.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_meetme.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_meetme.c Mon May 1 13:29:38 2006
@@ -92,7 +92,8 @@
" 'D' -- dynamically add conference, prompting for a PIN\n"
" 'e' -- select an empty conference\n"
" 'E' -- select an empty pinless conference\n"
-" 'i' -- announce user join/leave\n"
+" 'i' -- announce user join/leave with review\n"
+" 'I' -- announce user join/leave without review\n"
" 'm' -- set monitor only mode (Listen only, no talking)\n"
" 'M' -- enable music on hold when the conference has a single caller\n"
" 'o' -- set talker optimization - treats talkers who aren't speaking as\n"
@@ -253,7 +254,7 @@
#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 22) /* If set, when user joins the conference, they will be told the number of users that are already in */
#define CONFFLAG_OPTIMIZETALKER (1 << 23) /* If set, treats talking users as muted users */
#define CONFFLAG_NOONLYPERSON (1 << 24) /* If set, won't speak the extra prompt when the first person enters the conference */
-
+#define CONFFLAG_INTROUSERNOREVIEW (1 << 25) /* If set, user will be asked to record name on entry of conference without review */
AST_APP_OPTIONS(meetme_opts, {
AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
@@ -265,6 +266,7 @@
AST_APP_OPTION('E', CONFFLAG_EMPTYNOPIN ),
AST_APP_OPTION('e', CONFFLAG_EMPTY ),
AST_APP_OPTION('i', CONFFLAG_INTROUSER ),
+ AST_APP_OPTION('I', CONFFLAG_INTROUSERNOREVIEW ),
AST_APP_OPTION('M', CONFFLAG_MOH ),
AST_APP_OPTION('m', CONFFLAG_MONITOR ),
AST_APP_OPTION('o', CONFFLAG_OPTIMIZETALKER ),
@@ -951,11 +953,14 @@
ast_copy_string(exitcontext, chan->context, sizeof(exitcontext));
}
- if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER)) {
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
snprintf(user->namerecloc, sizeof(user->namerecloc),
"%s/meetme/meetme-username-%s-%d", ast_config_AST_SPOOL_DIR,
conf->confno, user->user_no);
- res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
+ if (confflags & CONFFLAG_INTROUSERNOREVIEW)
+ res = ast_play_and_record(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, 128, 0, NULL);
+ else
+ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
}
@@ -1088,7 +1093,7 @@
ast_mutex_lock(&conf->playlock);
- if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) {
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW)) && conf->users > 1) {
if (conf->chan && ast_fileexists(user->namerecloc, NULL, NULL)) {
if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
ast_waitstream(conf->chan, "");
@@ -1646,7 +1651,7 @@
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
conf_play(chan, conf, LEAVE);
- if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER)) {
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
if (ast_fileexists(user->namerecloc, NULL, NULL)) {
if ((conf->chan) && (conf->users > 1)) {
if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
Modified: team/mogorman/asterisk-xmpp/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_speech_utils.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_speech_utils.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_speech_utils.c Mon May 1 13:29:38 2006
@@ -168,7 +168,7 @@
static struct ast_custom_function speech_score_function = {
.name = "SPEECH_SCORE",
- .synopsis = "Gets the confidence score of a result.\n",
+ .synopsis = "Gets the confidence score of a result.",
.syntax = "SPEECH_SCORE(result number)",
.desc =
"Gets the confidence score of a result.\n",
@@ -194,7 +194,7 @@
static struct ast_custom_function speech_text_function = {
.name = "SPEECH_TEXT",
- .synopsis = "Gets the recognized text of a result.\n",
+ .synopsis = "Gets the recognized text of a result.",
.syntax = "SPEECH_TEXT(result number)",
.desc =
"Gets the recognized text of a result.\n",
Modified: team/mogorman/asterisk-xmpp/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_voicemail.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_voicemail.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_voicemail.c Mon May 1 13:29:38 2006
@@ -245,10 +245,10 @@
};
struct vm_zone {
+ AST_LIST_ENTRY(vm_zone) list;
char name[80];
char timezone[80];
char msg_format[512];
- struct vm_zone *next;
};
struct vm_state {
@@ -388,8 +388,7 @@
static char *app4 = "VMAuthenticate";
static AST_LIST_HEAD_STATIC(users, ast_vm_user);
-struct vm_zone *zones = NULL;
-struct vm_zone *zonesl = NULL;
+static AST_LIST_HEAD_STATIC(zones, vm_zone);
static int maxsilence;
static int maxmsg;
static int silencethreshold = 128;
@@ -1655,9 +1654,12 @@
/* Does this user have a timezone specified? */
if (!ast_strlen_zero(vmu->zonetag)) {
/* Find the zone in the list */
- for (z = zones; z ; z = z->next)
+ AST_LIST_LOCK(&zones);
+ AST_LIST_TRAVERSE(&zones, z, list) {
if (!strcmp(z->name, vmu->zonetag))
break;
+ }
+ AST_LIST_UNLOCK(&zones);
}
ast_localtime(&t, tm, z ? z->timezone : NULL);
return tm;
@@ -3592,12 +3594,14 @@
if (!ast_strlen_zero(vmu->zonetag)) {
/* Find the zone in the list */
struct vm_zone *z;
- for (z = zones; z; z = z->next) {
+ AST_LIST_LOCK(&zones);
+ AST_LIST_TRAVERSE(&zones, z, list) {
if (!strcmp(z->name, vmu->zonetag)) {
the_zone = z;
break;
}
}
+ AST_LIST_UNLOCK(&zones);
}
/* No internal variable parsing for now, so we'll comment it out for the time being */
@@ -5858,22 +5862,26 @@
static int handle_show_voicemail_zones(int fd, int argc, char *argv[])
{
- struct vm_zone *zone = zones;
+ struct vm_zone *zone;
char *output_format = "%-15s %-20s %-45s\n";
-
- if (argc != 3) return RESULT_SHOWUSAGE;
-
- if (zone) {
+ int res = RESULT_SUCCESS;
+
+ if (argc != 3)
+ return RESULT_SHOWUSAGE;
+
+ AST_LIST_LOCK(&zones);
+ if (!AST_LIST_EMPTY(&zones)) {
ast_cli(fd, output_format, "Zone", "Timezone", "Message Format");
- while (zone) {
+ AST_LIST_TRAVERSE(&zones, zone, list) {
ast_cli(fd, output_format, zone->name, zone->timezone, zone->msg_format);
- zone = zone->next;
}
} else {
ast_cli(fd, "There are no voicemail zones currently defined\n");
- return RESULT_FAILURE;
- }
- return RESULT_SUCCESS;
+ res = RESULT_FAILURE;
+ }
+ AST_LIST_UNLOCK(&zones);
+
+ return res;
}
static char *complete_show_voicemail_users(const char *line, const char *word, int pos, int state)
@@ -5913,7 +5921,7 @@
static int load_config(void)
{
struct ast_vm_user *cur;
- struct vm_zone *zcur, *zl;
+ struct vm_zone *zcur;
struct ast_config *cfg;
char *cat;
struct ast_variable *var;
@@ -5950,21 +5958,18 @@
int tmpadsi[4];
cfg = ast_config_load(VOICEMAIL_CONFIG);
+
AST_LIST_LOCK(&users);
- AST_LIST_TRAVERSE_SAFE_BEGIN(&users, cur, list) {
- AST_LIST_REMOVE_CURRENT(&users, list);
+ while ((cur = AST_LIST_REMOVE_HEAD(&users, list))) {
ast_set_flag(cur, VM_ALLOCED);
free_user(cur);
}
- AST_LIST_TRAVERSE_SAFE_END;
- zcur = zones;
- while (zcur) {
- zl = zcur;
- zcur = zcur->next;
- free_zone(zl);
- }
- zones = NULL;
- zonesl = NULL;
+
+ AST_LIST_LOCK(&zones);
+ while ((zcur = AST_LIST_REMOVE_HEAD(&zones, list)))
+ free_zone(zcur);
+ AST_LIST_UNLOCK(&zones);
+
memset(ext_pass_cmd, 0, sizeof(ext_pass_cmd));
if (cfg) {
@@ -6232,14 +6237,9 @@
ast_copy_string(z->name, var->name, sizeof(z->name));
ast_copy_string(z->timezone, timezone, sizeof(z->timezone));
ast_copy_string(z->msg_format, msg_format, sizeof(z->msg_format));
- z->next = NULL;
- if (zones) {
- zonesl->next = z;
- zonesl = z;
- } else {
- zones = z;
- zonesl = z;
- }
+ AST_LIST_LOCK(&zones);
+ AST_LIST_INSERT_HEAD(&zones, z, list);
+ AST_LIST_UNLOCK(&zones);
} else {
ast_log(LOG_WARNING, "Invalid timezone definition at line %d\n", var->lineno);
free(z);
Modified: team/mogorman/asterisk-xmpp/ast_expr2.fl
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/ast_expr2.fl?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/ast_expr2.fl (original)
+++ team/mogorman/asterisk-xmpp/ast_expr2.fl Mon May 1 13:29:38 2006
@@ -59,9 +59,23 @@
#include "ast_expr2.h" /* the o/p of the bison on ast_expr2.y */
-#define SET_COLUMNS yylloc_param->first_column = (int)(yyg->yytext_r - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);yylloc_param->last_column = yylloc_param->last_column + yyleng - 1; yylloc_param->first_line = yylloc_param->last_line = 1
-#define SET_STRING yylval_param->val = (struct val *)calloc(sizeof(struct val),1); yylval_param->val->type = AST_EXPR_string; yylval_param->val->u.s = strdup(yytext);
-#define SET_NUMERIC_STRING yylval_param->val = (struct val *)calloc(sizeof(struct val),1); yylval_param->val->type = AST_EXPR_numeric_string; yylval_param->val->u.s = strdup(yytext);
+#define SET_COLUMNS do { \
+ yylloc_param->first_column = (int)(yyg->yytext_r - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf); \
+ yylloc_param->last_column += yyleng - 1; \
+ yylloc_param->first_line = yylloc_param->last_line = 1; \
+ } while (0)
+
+#define SET_STRING do { \
+ yylval_param->val = calloc(1, sizeof(struct val)); \
+ yylval_param->val->type = AST_EXPR_string; \
+ yylval_param->val->u.s = strdup(yytext); \
+ } while (0)
+
+#define SET_NUMERIC_STRING do { \
+ yylval_param->val = calloc(1, sizeof(struct val)); \
+ yylval_param->val->type = AST_EXPR_numeric_string; \
+ yylval_param->val->u.s = strdup(yytext); \
+ } while (0)
struct parse_io
{
@@ -110,25 +124,81 @@
\:\: { SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;}
\( { SET_COLUMNS; SET_STRING; return TOK_LP;}
\) { SET_COLUMNS; SET_STRING; return TOK_RP;}
-\$\{ {/* gather the contents of ${} expressions, with trailing stuff, into a single TOKEN. They are much more complex now than they used to be */
- curlycount = 0; BEGIN(var); yymore();}
-
-[ \r] {}
-\"[^"]*\" {SET_COLUMNS; SET_STRING; return TOKEN;}
-
-[\n] {/* what to do with eol */}
-[0-9]+ { SET_COLUMNS; /* the original behavior of the expression parser was to bring in numbers as a numeric string */
- SET_NUMERIC_STRING;
- return TOKEN;}
-
-[a-zA-Z0-9,.';\\_^$#@]+ {SET_COLUMNS; SET_STRING; return TOKEN;}
-
-<var>[^{}]*\} {curlycount--; if(curlycount < 0){ BEGIN(trail); yymore();} else { yymore();}}
-<var>[^{}]*\{ {curlycount++; yymore(); }
-<trail>[^-\t\r \n$():?%/+=*<>!|&]* {BEGIN(0); SET_COLUMNS; SET_STRING; return TOKEN;}
-<trail>[-\t\r \n$():?%/+=*<>!|&] {char c = yytext[yyleng-1]; BEGIN(0); unput(c); SET_COLUMNS; SET_STRING; return TOKEN;}
-<trail>\$\{ {curlycount = 0; BEGIN(var); yymore(); }
-<trail><<EOF>> {BEGIN(0); SET_COLUMNS; SET_STRING; return TOKEN; /*actually, if an expr is only a variable ref, this could happen a LOT */}
+\$\{ {
+ /* gather the contents of ${} expressions, with trailing stuff,
+ * into a single TOKEN.
+ * They are much more complex now than they used to be
+ */
+ curlycount = 0;
+ BEGIN(var);
+ yymore();
+ }
+
+[ \t\r] {}
+\"[^"]*\" {SET_COLUMNS; SET_STRING; return TOKEN;}
+
+[\n] {/* what to do with eol */}
+[0-9]+ {
+ SET_COLUMNS;
+ /* the original behavior of the expression parser was
+ * to bring in numbers as a numeric string
+ */
+ SET_NUMERIC_STRING;
+ return TOKEN;
+ }
+
+[a-zA-Z0-9,.';\\_^$#@]+ {
+ SET_COLUMNS;
+ SET_STRING;
+ return TOKEN;
+ }
+
+
+<var>[^{}]*\} {
+ curlycount--;
+ if (curlycount < 0) {
+ BEGIN(trail);
+ yymore();
+ } else {
+ yymore();
+ }
+ }
+
+<var>[^{}]*\{ {
+ curlycount++;
+ yymore();
+ }
+
+
+<trail>[^-\t\r \n$():?%/+=*<>!|&]* {
+ BEGIN(0);
+ SET_COLUMNS;
+ SET_STRING;
+ return TOKEN;
+ }
+
+<trail>[-\t\r \n$():?%/+=*<>!|&] {
+ char c = yytext[yyleng-1];
+ BEGIN(0);
+ unput(c);
+ SET_COLUMNS;
+ SET_STRING;
+ return TOKEN;
+ }
+
+<trail>\$\{ {
+ curlycount = 0;
+ BEGIN(var);
+ yymore();
+ }
+
+<trail><<EOF>> {
+ BEGIN(0);
+ SET_COLUMNS;
+ SET_STRING;
+ return TOKEN;
+ /*actually, if an expr is only a variable ref, this could happen a LOT */
+ }
%%
Modified: team/mogorman/asterisk-xmpp/ast_expr2f.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/ast_expr2f.c?rev=23982&r1=23981&r2=23982&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/ast_expr2f.c (original)
+++ team/mogorman/asterisk-xmpp/ast_expr2f.c Mon May 1 13:29:38 2006
@@ -9,7 +9,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
+#define YY_FLEX_SUBMINOR_VERSION 33
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -31,7 +31,15 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types.
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
#include <inttypes.h>
typedef int8_t flex_int8_t;
typedef uint8_t flex_uint8_t;
@@ -153,6 +161,10 @@
#ifndef YY_BUF_SIZE
#define YY_BUF_SIZE 16384
#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
#define YY_TYPEDEF_YY_BUFFER_STATE
@@ -1379,9 +1391,23 @@
#include "ast_expr2.h" /* the o/p of the bison on ast_expr2.y */
-#define SET_COLUMNS yylloc_param->first_column = (int)(yyg->yytext_r - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);yylloc_param->last_column = yylloc_param->last_column + yyleng - 1; yylloc_param->first_line = yylloc_param->last_line = 1
-#define SET_STRING yylval_param->val = (struct val *)calloc(sizeof(struct val),1); yylval_param->val->type = AST_EXPR_string; yylval_param->val->u.s = strdup(yytext);
-#define SET_NUMERIC_STRING yylval_param->val = (struct val *)calloc(sizeof(struct val),1); yylval_param->val->type = AST_EXPR_numeric_string; yylval_param->val->u.s = strdup(yytext);
+#define SET_COLUMNS do { \
+ yylloc_param->first_column = (int)(yyg->yytext_r - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf); \
+ yylloc_param->last_column += yyleng - 1; \
+ yylloc_param->first_line = yylloc_param->last_line = 1; \
+ } while (0)
+
+#define SET_STRING do { \
+ yylval_param->val = calloc(1, sizeof(struct val)); \
+ yylval_param->val->type = AST_EXPR_string; \
+ yylval_param->val->u.s = strdup(yytext); \
+ } while (0)
+
+#define SET_NUMERIC_STRING do { \
+ yylval_param->val = calloc(1, sizeof(struct val)); \
+ yylval_param->val->type = AST_EXPR_numeric_string; \
+ yylval_param->val->u.s = strdup(yytext); \
+ } while (0)
struct parse_io
{
@@ -1395,17 +1421,19 @@
static int curlycount = 0;
static char *expr2_token_subst(char *mess);
-#line 1394 "ast_expr2f.c"
+#line 1425 "ast_expr2f.c"
#define INITIAL 0
#define var 1
#define trail 2
+#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
* The user has a chance to override it with an option.
*/
#include <unistd.h>
+#endif
#ifndef YY_EXTRA_TYPE
#define YY_EXTRA_TYPE void *
@@ -1449,6 +1477,8 @@
}; /* end struct yyguts_t */
+static int yy_init_globals (yyscan_t yyscanner );
+
/* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/
# define yylval yyg->yylval_r
@@ -1583,9 +1613,11 @@
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
-extern int ast_yylex (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
-
-#define YY_DECL int ast_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
+extern int ast_yylex \
+ (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
+
+#define YY_DECL int ast_yylex \
+ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
#endif /* !YY_DECL */
/* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1612,18 +1644,18 @@
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 83 "ast_expr2.fl"
-
-
-#line 1614 "ast_expr2f.c"
+#line 102 "ast_expr2.fl"
+
+
+#line 1651 "ast_expr2f.c"
yylval = yylval_param;
yylloc = yylloc_param;
- if ( yyg->yy_init )
+ if ( !yyg->yy_init )
{
- yyg->yy_init = 0;
+ yyg->yy_init = 1;
#ifdef YY_USER_INIT
YY_USER_INIT;
@@ -1698,192 +1730,241 @@
case 1:
YY_RULE_SETUP
-#line 85 "ast_expr2.fl"
+#line 104 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_OR;}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 86 "ast_expr2.fl"
+#line 105 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_AND;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 87 "ast_expr2.fl"
+#line 106 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQ;}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 88 "ast_expr2.fl"
+#line 107 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_OR;}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 89 "ast_expr2.fl"
+#line 108 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_AND;}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 90 "ast_expr2.fl"
+#line 109 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQ;}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 91 "ast_expr2.fl"
+#line 110 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQTILDE;}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 92 "ast_expr2.fl"
+#line 111 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_GT;}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 93 "ast_expr2.fl"
+#line 112 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LT;}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 94 "ast_expr2.fl"
+#line 113 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_GE;}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 95 "ast_expr2.fl"
+#line 114 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LE;}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 96 "ast_expr2.fl"
+#line 115 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_NE;}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 97 "ast_expr2.fl"
+#line 116 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_PLUS;}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 98 "ast_expr2.fl"
+#line 117 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MINUS;}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 99 "ast_expr2.fl"
+#line 118 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MULT;}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 100 "ast_expr2.fl"
+#line 119 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_DIV;}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 101 "ast_expr2.fl"
+#line 120 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MOD;}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 102 "ast_expr2.fl"
+#line 121 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COND;}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 103 "ast_expr2.fl"
+#line 122 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COMPL;}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 104 "ast_expr2.fl"
+#line 123 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COLON;}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 105 "ast_expr2.fl"
+#line 124 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;}
YY_BREAK
case 22:
YY_RULE_SETUP
[... 11988 lines stripped ...]
More information about the asterisk-commits
mailing list