[Asterisk-cvs]
asterisk/apps app_ivrdemo.c, 1.4, 1.5 app_md5.c, 1.2,
1.3 app_meetme.c, 1.85, 1.86 app_skel.c, 1.7, 1.8
markster at lists.digium.com
markster at lists.digium.com
Fri Mar 11 23:41:21 CST 2005
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv16987/apps
Modified Files:
app_ivrdemo.c app_md5.c app_meetme.c app_skel.c
Log Message:
Create experimental new options API, various cleanups
Index: app_ivrdemo.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_ivrdemo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- app_ivrdemo.c 5 Mar 2005 21:06:26 -0000 1.4
+++ app_ivrdemo.c 12 Mar 2005 05:37:32 -0000 1.5
@@ -94,7 +94,7 @@
int load_module(void)
{
- return ast_register_application(app, skel_exec, synopsis, tdesc);
+ return ast_register_application(app, skel_exec, tdesc, synopsis);
}
char *description(void)
Index: app_md5.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_md5.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- app_md5.c 19 Feb 2005 16:18:19 -0000 1.2
+++ app_md5.c 12 Mar 2005 05:37:32 -0000 1.3
@@ -21,14 +21,15 @@
#include <unistd.h>
#include <string.h>
-static char *tdesc_md5 = "MD5 checksum application";
+static char *tdesc_md5 = "MD5 checksum applications";
static char *app_md5 = "MD5";
+static char *desc_md5 = "Calculate MD5 checksum";
static char *synopsis_md5 =
" MD5(<var>=<string>): Calculates a MD5 checksum on <string>.\n"
"Returns hash value in a channel variable. Always return 0\n";
-static char *tdesc_md5check = "MD5 checksum verification application";
static char *app_md5check = "MD5Check";
+static char *desc_md5check = "Check MD5 checksum";
static char *synopsis_md5check =
" MD5Check(<md5hash>,<string>): Calculates a MD5 checksum on <string>\n"
"and compares it with the hash. Returns 0 if <md5hash> is correct for <string>.\n"
@@ -122,8 +123,8 @@
{
int res;
- res = ast_register_application(app_md5check, md5check_exec, synopsis_md5check, tdesc_md5check);
- res |= ast_register_application(app_md5, md5_exec, synopsis_md5, tdesc_md5);
+ res = ast_register_application(app_md5check, md5check_exec, desc_md5check, synopsis_md5check);
+ res |= ast_register_application(app_md5, md5_exec, desc_md5, synopsis_md5);
return res;
}
Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- app_meetme.c 5 Mar 2005 15:25:08 -0000 1.85
+++ app_meetme.c 12 Mar 2005 05:37:32 -0000 1.86
@@ -184,6 +184,35 @@
#define CONFFLAG_INTROUSER (1 << 14) /* If set, user will be ask record name on entry of conference */
#define CONFFLAG_RECORDCONF (1<< 15) /* If set, the MeetMe will be recorded */
#define CONFFLAG_MONITORTALKER (1 << 16) /* If set, the user will be monitored if the user is talking or not */
+#define CONFFLAG_DYNAMIC (1 << 17)
+#define CONFFLAG_DYNAMICPIN (1 << 18)
+#define CONFFLAG_EMPTY (1 << 19)
+#define CONFFLAG_EMPTYNOPIN (1 << 20)
+#define CONFFLAG_ALWAYSPROMPT (1 << 21)
+
+
+AST_DECLARE_OPTIONS(meetme_opts,{
+ ['a'] = { CONFFLAG_ADMIN },
+ ['T'] = { CONFFLAG_MONITORTALKER },
+ ['i'] = { CONFFLAG_INTROUSER },
+ ['m'] = { CONFFLAG_MONITOR },
+ ['p'] = { CONFFLAG_POUNDEXIT },
+ ['s'] = { CONFFLAG_STARMENU },
+ ['t'] = { CONFFLAG_TALKER },
+ ['q'] = { CONFFLAG_QUIET },
+ ['M'] = { CONFFLAG_MOH },
+ ['x'] = { CONFFLAG_MARKEDEXIT },
+ ['X'] = { CONFFLAG_EXIT_CONTEXT },
+ ['A'] = { CONFFLAG_MARKEDUSER },
+ ['b'] = { CONFFLAG_AGI },
+ ['w'] = { CONFFLAG_WAITMARKED },
+ ['r'] = { CONFFLAG_RECORDCONF },
+ ['d'] = { CONFFLAG_DYNAMIC },
+ ['D'] = { CONFFLAG_DYNAMICPIN },
+ ['e'] = { CONFFLAG_EMPTY },
+ ['E'] = { CONFFLAG_EMPTYNOPIN },
+ ['P'] = { CONFFLAG_ALWAYSPROMPT },
+});
static char *istalking(int x)
{
@@ -657,10 +686,11 @@
else
strncpy(exitcontext, chan->context, sizeof(exitcontext) - 1);
}
- snprintf(user->namerecloc,sizeof(user->namerecloc),"%s/meetme-username-%s-%d",AST_SPOOL_DIR,conf->confno,user->user_no);
- if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER))
+ if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER)) {
+ snprintf(user->namerecloc,sizeof(user->namerecloc),"%s/meetme/meetme-username-%s-%d",ast_config_AST_SPOOL_DIR,conf->confno,user->user_no);
ast_record_review(chan,"vm-rec-name",user->namerecloc, 10,"sln", &duration, NULL);
+ }
while((confflags & CONFFLAG_WAITMARKED) && (conf->markedusers == 0)) {
confflags &= ~CONFFLAG_QUIET;
@@ -1363,7 +1393,7 @@
int allowretry = 0;
int retrycnt = 0;
struct ast_conference *cnf;
- int confflags = 0;
+ struct ast_flags confflags = {0};
int dynamic = 0;
int empty = 0, empty_no_pin = 0;
int always_prompt = 0;
@@ -1396,52 +1426,14 @@
strncpy(the_pin, inpin, sizeof(the_pin) - 1);
if (inflags) {
- if (strchr(inflags, 'a'))
- confflags |= CONFFLAG_ADMIN;
- if (strchr(inflags, 'T'))
- confflags |= CONFFLAG_MONITORTALKER;
- if (strchr(inflags, 'i'))
- confflags |= CONFFLAG_INTROUSER;
- if (strchr(inflags, 'm'))
- confflags |= CONFFLAG_MONITOR;
- if (strchr(inflags, 'p'))
- confflags |= CONFFLAG_POUNDEXIT;
- if (strchr(inflags, 's'))
- confflags |= CONFFLAG_STARMENU;
- if (strchr(inflags, 't'))
- confflags |= CONFFLAG_TALKER;
- if (strchr(inflags, 'q'))
- confflags |= CONFFLAG_QUIET;
- if (strchr(inflags, 'M'))
- confflags |= CONFFLAG_MOH;
- if (strchr(inflags, 'x'))
- confflags |= CONFFLAG_MARKEDEXIT;
- if (strchr(inflags, 'X'))
- confflags |= CONFFLAG_EXIT_CONTEXT;
- if (strchr(inflags, 'A'))
- confflags |= CONFFLAG_MARKEDUSER;
- if (strchr(inflags, 'b'))
- confflags |= CONFFLAG_AGI;
- if (strchr(inflags, 'w'))
- confflags |= CONFFLAG_WAITMARKED;
- if (strchr(inflags, 'r'))
- confflags |= CONFFLAG_RECORDCONF;
- if (strchr(inflags, 'd'))
- dynamic = 1;
- if (strchr(inflags, 'D')) {
- dynamic = 1;
- if (! inpin) {
- strncpy(the_pin, "q", sizeof(the_pin) - 1);
- }
- }
- if (strchr(inflags, 'e'))
- empty = 1;
- if (strchr(inflags, 'E')) {
- empty = 1;
- empty_no_pin = 1;
- }
- if (strchr(inflags, 'P'))
- always_prompt = 1;
+ ast_parseoptions(meetme_opts, &confflags, NULL, inflags);
+ dynamic = ast_test_flag(&confflags, CONFFLAG_DYNAMIC | CONFFLAG_DYNAMICPIN);
+ if (ast_test_flag(&confflags, CONFFLAG_DYNAMICPIN) && !inpin)
+ strncpy(the_pin, "q", sizeof(the_pin) - 1);
+
+ empty = ast_test_flag(&confflags, CONFFLAG_EMPTY | CONFFLAG_EMPTYNOPIN);
+ empty_no_pin = ast_test_flag(&confflags, CONFFLAG_EMPTYNOPIN);
+ always_prompt = ast_test_flag(&confflags, CONFFLAG_ALWAYSPROMPT);
}
do {
@@ -1568,7 +1560,7 @@
if (allowretry)
confno[0] = '\0';
} else {
- if ((!ast_strlen_zero(cnf->pin) && ! (confflags & CONFFLAG_ADMIN)) || (!ast_strlen_zero(cnf->pinadmin) && (confflags & CONFFLAG_ADMIN))) {
+ if ((!ast_strlen_zero(cnf->pin) && !ast_test_flag(&confflags, CONFFLAG_ADMIN)) || (!ast_strlen_zero(cnf->pinadmin) && ast_test_flag(&confflags, CONFFLAG_ADMIN))) {
char pin[AST_MAX_EXTENSION]="";
int j;
@@ -1587,9 +1579,9 @@
/* Pin correct */
allowretry = 0;
if (!ast_strlen_zero(cnf->pinadmin) && !strcasecmp(pin, cnf->pinadmin))
- confflags |= CONFFLAG_ADMIN;
+ ast_set_flag(&confflags, CONFFLAG_ADMIN);
/* Run the conference */
- res = conf_run(chan, cnf, confflags);
+ res = conf_run(chan, cnf, confflags.flags);
break;
} else {
/* Pin invalid */
@@ -1620,7 +1612,7 @@
allowretry = 0;
/* Run the conference */
- res = conf_run(chan, cnf, confflags);
+ res = conf_run(chan, cnf, confflags.flags);
}
}
}
Index: app_skel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_skel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_skel.c 22 Jun 2004 19:32:52 -0000 1.7
+++ app_skel.c 12 Mar 2005 05:37:32 -0000 1.8
@@ -53,7 +53,7 @@
int load_module(void)
{
- return ast_register_application(app, skel_exec, synopsis, tdesc);
+ return ast_register_application(app, skel_exec, tdesc, synopsis);
}
char *description(void)
More information about the svn-commits
mailing list