kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

whitespace fixes only

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102908 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Michiel van Baak
2008-02-07 21:08:46 +00:00
parent d251bacacc
commit 408497916b
1 changed files with 61 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
apps/app_adsiprog.c
View File

@@ -21,7 +21,7 @@
* \brief Program Asterisk ADSI Scripts into phone * \brief Program Asterisk ADSI Scripts into phone
* *
* \author Mark Spencer <markster@digium.com> * \author Mark Spencer <markster@digium.com>
* *
* \ingroup applications * \ingroup applications
*/ */
@@ -36,7 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <netinet/in.h> #include <netinet/in.h>
#include <ctype.h> #include <ctype.h>
#include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */ #include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */
#include "asterisk/file.h" #include "asterisk/file.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"
#include "asterisk/pbx.h" #include "asterisk/pbx.h"
@@ -94,25 +94,25 @@ static struct adsi_event justify[] = {
{ 3, "INDENT" }, { 3, "INDENT" },
}; };
#define STATE_NORMAL 0 #define STATE_NORMAL 0
#define STATE_INKEY 1 #define STATE_INKEY 1
#define STATE_INSUB 2 #define STATE_INSUB 2
#define STATE_INIF 3 #define STATE_INIF 3
#define MAX_RET_CODE 20 #define MAX_RET_CODE 20
#define MAX_SUB_LEN 255 #define MAX_SUB_LEN 255
#define MAX_MAIN_LEN 1600 #define MAX_MAIN_LEN 1600
#define ARG_STRING (1 << 0) #define ARG_STRING (1 << 0)
#define ARG_NUMBER (1 << 1) #define ARG_NUMBER (1 << 1)
struct adsi_soft_key { struct adsi_soft_key {
char vname[40]; /* Which "variable" is associated with it */ char vname[40]; /* Which "variable" is associated with it */
int retstrlen; /* Length of return string */ int retstrlen; /* Length of return string */
int initlen; /* initial length */ int initlen; /* initial length */
int id; int id;
int defined; int defined;
char retstr[80]; /* Return string data */ char retstr[80]; /* Return string data */
}; };
struct adsi_subscript { struct adsi_subscript {
@@ -267,7 +267,7 @@ static int send_dtmf(char *buf, char *name, int id, char *args, struct adsi_scri
a = dtmfstr; a = dtmfstr;
while(*a) { while (*a) {
if (strchr(validdtmf, *a)) { if (strchr(validdtmf, *a)) {
*buf = *a; *buf = *a;
buf++; buf++;
@@ -292,11 +292,11 @@ static int goto_line(char *buf, char *name, int id, char *args, struct adsi_scri
return 0; return 0;
} }
if (!strcasecmp(page, "INFO")) { if (!strcasecmp(page, "INFO"))
cmd = 0; cmd = 0;
} else if (!strcasecmp(page, "COMM")) { else if (!strcasecmp(page, "COMM"))
cmd = 0x80; cmd = 0x80;
} else { else {
ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script); ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script);
return 0; return 0;
} }
@@ -325,11 +325,11 @@ static int goto_line_rel(char *buf, char *name, int id, char *args, struct adsi_
return 0; return 0;
} }
if (!strcasecmp(dir, "UP")) { if (!strcasecmp(dir, "UP"))
cmd = 0; cmd = 0;
} else if (!strcasecmp(dir, "DOWN")) { else if (!strcasecmp(dir, "DOWN"))
cmd = 0x20; cmd = 0x20;
} else { else {
ast_log(LOG_WARNING, "Expecting either 'UP' or 'DOWN' direction, got '%s' at line %d of %s\n", dir, lineno, script); ast_log(LOG_WARNING, "Expecting either 'UP' or 'DOWN' direction, got '%s' at line %d of %s\n", dir, lineno, script);
return 0; return 0;
} }
@@ -396,7 +396,7 @@ static int cleartimer(char *buf, char *name, int id, char *args, struct adsi_scr
{ {
char *tok = get_token(&args, script, lineno); char *tok = get_token(&args, script, lineno);
if (tok) if (tok)
ast_log(LOG_WARNING, "Clearing timer requires no arguments ('%s') at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Clearing timer requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id; buf[0] = id;
@@ -415,7 +415,7 @@ static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, ch
int x; int x;
for (x = 0; x < state->numflags; x++) { for (x = 0; x < state->numflags; x++) {
if (!strcasecmp(state->flags[x].vname, name)) if (!strcasecmp(state->flags[x].vname, name))
return &state->flags[x]; return &state->flags[x];
} }
@@ -540,7 +540,7 @@ static struct adsi_soft_key *getkeybyname(struct adsi_script *state, char *name,
int x; int x;
for (x = 0; x < state->numkeys; x++) { for (x = 0; x < state->numkeys; x++) {
if (!strcasecmp(state->keys[x].vname, name)) if (!strcasecmp(state->keys[x].vname, name))
return &state->keys[x]; return &state->keys[x];
} }
@@ -561,7 +561,7 @@ static struct adsi_subscript *getsubbyname(struct adsi_script *state, char *name
int x; int x;
for (x = 0; x < state->numsubs; x++) { for (x = 0; x < state->numsubs; x++) {
if (!strcasecmp(state->subs[x].vname, name)) if (!strcasecmp(state->subs[x].vname, name))
return &state->subs[x]; return &state->subs[x];
} }
@@ -582,7 +582,7 @@ static struct adsi_state *getstatebyname(struct adsi_script *state, char *name,
int x; int x;
for (x = 0; x <state->numstates; x++) { for (x = 0; x <state->numstates; x++) {
if (!strcasecmp(state->states[x].vname, name)) if (!strcasecmp(state->states[x].vname, name))
return &state->states[x]; return &state->states[x];
} }
@@ -607,7 +607,7 @@ static struct adsi_display *getdisplaybyname(struct adsi_script *state, char *na
int x; int x;
for (x = 0; x < state->numdisplays; x++) { for (x = 0; x < state->numdisplays; x++) {
if (!strcasecmp(state->displays[x].vname, name)) if (!strcasecmp(state->displays[x].vname, name))
return &state->displays[x]; return &state->displays[x];
} }
@@ -641,13 +641,13 @@ static int showkeys(char *buf, char *name, int id, char *args, struct adsi_scrip
break; break;
if (!strcasecmp(tok, "UNLESS")) { if (!strcasecmp(tok, "UNLESS")) {
/* Check for trailing UNLESS flag */ /* Check for trailing UNLESS flag */
if (!(tok = get_token(&args, script, lineno))) { if (!(tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script); ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
} else if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) { else if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING))
ast_log(LOG_WARNING, "Invalid flag name '%s' at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Invalid flag name '%s' at line %d of %s\n", tok, lineno, script);
} else if (!(flag = getflagbyname(state, newkey, script, lineno, 0))) { else if (!(flag = getflagbyname(state, newkey, script, lineno, 0)))
ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", newkey, lineno, script); ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", newkey, lineno, script);
} else else
flagid = flag->id; flagid = flag->id;
if ((tok = get_token(&args, script, lineno))) if ((tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
@@ -658,19 +658,19 @@ static int showkeys(char *buf, char *name, int id, char *args, struct adsi_scrip
break; break;
} }
if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) { if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) {
ast_log(LOG_WARNING, "Invalid token for key name: %s\n", tok); ast_log(LOG_WARNING, "Invalid token for key name: %s\n", tok);
continue; continue;
} }
if (!(key = getkeybyname(state, newkey, script, lineno))) if (!(key = getkeybyname(state, newkey, script, lineno)))
break; break;
keyid[x] = key->id; keyid[x] = key->id;
} }
buf[0] = id; buf[0] = id;
buf[1] = (flagid & 0x7) << 3 | (x & 0x7); buf[1] = (flagid & 0x7) << 3 | (x & 0x7);
for (bytes = 0; bytes < x; bytes++) { for (bytes = 0; bytes < x; bytes++)
buf[bytes + 2] = keyid[bytes]; buf[bytes + 2] = keyid[bytes];
}
return 2 + x; return 2 + x;
} }
@@ -709,17 +709,17 @@ static int showdisplay(char *buf, char *name, int id, char *args, struct adsi_sc
if (tok && !strcasecmp(tok, "UNLESS")) { if (tok && !strcasecmp(tok, "UNLESS")) {
/* Check for trailing UNLESS flag */ /* Check for trailing UNLESS flag */
if (!(tok = get_token(&args, script, lineno))) { if (!(tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script); ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
} else if (process_token(&flag, tok, sizeof(flag), ARG_NUMBER)) { else if (process_token(&flag, tok, sizeof(flag), ARG_NUMBER))
ast_log(LOG_WARNING, "Invalid flag number '%s' at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Invalid flag number '%s' at line %d of %s\n", tok, lineno, script);
}
if ((tok = get_token(&args, script, lineno))) if ((tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
} }
buf[0] = id; buf[0] = id;
buf[1] = (cmd << 6) | (disp->id & 0x3f); buf[1] = (cmd << 6) | (disp->id & 0x3f);
buf[2] = ((line & 0x1f) << 3) | (flag & 0x7); buf[2] = ((line & 0x1f) << 3) | (flag & 0x7);
return 3; return 3;
@@ -729,7 +729,7 @@ static int cleardisplay(char *buf, char *name, int id, char *args, struct adsi_s
{ {
char *tok = get_token(&args, script, lineno); char *tok = get_token(&args, script, lineno);
if (tok) if (tok)
ast_log(LOG_WARNING, "Clearing display requires no arguments ('%s') at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Clearing display requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id; buf[0] = id;
@@ -741,7 +741,7 @@ static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_sc
{ {
char *tok = get_token(&args, script, lineno); char *tok = get_token(&args, script, lineno);
if (tok) if (tok)
ast_log(LOG_WARNING, "Digitdirect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Digitdirect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id; buf[0] = id;
@@ -765,7 +765,7 @@ static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_s
{ {
char *tok = get_token(&args, script, lineno); char *tok = get_token(&args, script, lineno);
if (tok) if (tok)
ast_log(LOG_WARNING, "Digitcollect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Digitcollect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id; buf[0] = id;
@@ -816,8 +816,7 @@ static int onevent(char *buf, char *name, int id, char *args, struct adsi_script
} }
tok = get_token(&args, script, lineno); tok = get_token(&args, script, lineno);
while ((!sawin && !strcasecmp(tok, "IN")) || while ((!sawin && !strcasecmp(tok, "IN")) || (sawin && !strcasecmp(tok, "OR"))) {
(sawin && !strcasecmp(tok, "OR"))) {
sawin = 1; sawin = 1;
if (scnt > 7) { if (scnt > 7) {
ast_log(LOG_WARNING, "No more than 8 states may be specified for inclusion at line %d of %s\n", lineno, script); ast_log(LOG_WARNING, "No more than 8 states may be specified for inclusion at line %d of %s\n", lineno, script);
@@ -840,7 +839,7 @@ static int onevent(char *buf, char *name, int id, char *args, struct adsi_script
if (!tok || strcasecmp(tok, "GOTO")) { if (!tok || strcasecmp(tok, "GOTO")) {
if (!tok) if (!tok)
tok = "<nothing>"; tok = "<nothing>";
if (sawin) if (sawin)
ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'OR' at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'OR' at line %d of %s\n", tok, lineno, script);
else else
ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'IN' at line %d of %s\n", tok, lineno, script); ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'IN' at line %d of %s\n", tok, lineno, script);
@@ -941,17 +940,17 @@ static int process_returncode(struct adsi_soft_key *key, char *code, char *args,
if (kcmds[x].add_args) { if (kcmds[x].add_args) {
res = kcmds[x].add_args(key->retstr + key->retstrlen, res = kcmds[x].add_args(key->retstr + key->retstrlen,
code, kcmds[x].id, args, state, script, lineno); code, kcmds[x].id, args, state, script, lineno);
if ((key->retstrlen + res - key->initlen) <= MAX_RET_CODE) if ((key->retstrlen + res - key->initlen) <= MAX_RET_CODE)
key->retstrlen += res; key->retstrlen += res;
else else
ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script); ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
} else { } else {
if ((unused = get_token(&args, script, lineno))) if ((unused = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", kcmds[x].name, lineno, script, unused); ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", kcmds[x].name, lineno, script, unused);
if ((key->retstrlen + 1 - key->initlen) <= MAX_RET_CODE) { if ((key->retstrlen + 1 - key->initlen) <= MAX_RET_CODE) {
key->retstr[key->retstrlen] = kcmds[x].id; key->retstr[key->retstrlen] = kcmds[x].id;
key->retstrlen++; key->retstrlen++;
} else } else
ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script); ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
} }
return 0; return 0;
@@ -970,14 +969,14 @@ static int process_opcode(struct adsi_subscript *sub, char *code, char *args, st
if (opcmds[x].add_args) { if (opcmds[x].add_args) {
res = opcmds[x].add_args(sub->data + sub->datalen, res = opcmds[x].add_args(sub->data + sub->datalen,
code, opcmds[x].id, args, state, script, lineno); code, opcmds[x].id, args, state, script, lineno);
if ((sub->datalen + res + 1) <= max) if ((sub->datalen + res + 1) <= max)
sub->datalen += res; sub->datalen += res;
else { else {
ast_log(LOG_WARNING, "No space for '%s' code in subscript '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script); ast_log(LOG_WARNING, "No space for '%s' code in subscript '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script);
return -1; return -1;
} }
} else { } else {
if ((unused = get_token(&args, script, lineno))) if ((unused = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", opcmds[x].name, lineno, script, unused); ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", opcmds[x].name, lineno, script, unused);
if ((sub->datalen + 2) <= max) { if ((sub->datalen + 2) <= max) {
sub->data[sub->datalen] = opcmds[x].id; sub->data[sub->datalen] = opcmds[x].id;
@@ -1005,7 +1004,7 @@ static int adsi_process(struct adsi_script *state, char *buf, char *script, int
struct adsi_display *disp; struct adsi_display *disp;
struct adsi_subscript *newsub; struct adsi_subscript *newsub;
if (!keyword) if (!keyword)
return 0; return 0;
switch(state->state) { switch(state->state) {
@@ -1141,7 +1140,7 @@ static int adsi_process(struct adsi_script *state, char *buf, char *script, int
break; break;
} }
state->state = STATE_INSUB; state->state = STATE_INSUB;
} else if (!strcasecmp(keyword, "STATE")) { } else if (!strcasecmp(keyword, "STATE")) {
if (!(args = get_token(&buf, script, lineno))) { if (!(args = get_token(&buf, script, lineno))) {
ast_log(LOG_WARNING, "STATE definition missing name at line %d of %s\n", lineno, script); ast_log(LOG_WARNING, "STATE definition missing name at line %d of %s\n", lineno, script);
break; break;
@@ -1155,7 +1154,7 @@ static int adsi_process(struct adsi_script *state, char *buf, char *script, int
break; break;
} }
getstatebyname(state, vname, script, lineno, 1); getstatebyname(state, vname, script, lineno, 1);
} else if (!strcasecmp(keyword, "FLAG")) { } else if (!strcasecmp(keyword, "FLAG")) {
if (!(args = get_token(&buf, script, lineno))) { if (!(args = get_token(&buf, script, lineno))) {
ast_log(LOG_WARNING, "FLAG definition missing name at line %d of %s\n", lineno, script); ast_log(LOG_WARNING, "FLAG definition missing name at line %d of %s\n", lineno, script);
break; break;
@@ -1217,7 +1216,7 @@ static int adsi_process(struct adsi_script *state, char *buf, char *script, int
disp->datalen += strlen(tmp); disp->datalen += strlen(tmp);
args = get_token(&buf, script, lineno); args = get_token(&buf, script, lineno);
} }
while(args) { while (args) {
if (!strcasecmp(args, "JUSTIFY")) { if (!strcasecmp(args, "JUSTIFY")) {
args = get_token(&buf, script, lineno); args = get_token(&buf, script, lineno);
if (!args) { if (!args) {
@@ -1324,8 +1323,7 @@ static int adsi_process(struct adsi_script *state, char *buf, char *script, int
break; break;
} }
state->sub->ifinscount = 0; state->sub->ifinscount = 0;
state->sub->ifdata = state->sub->data + state->sub->ifdata = state->sub->data + state->sub->datalen;
state->sub->datalen;
/* Reserve header and insert op codes */ /* Reserve header and insert op codes */
state->sub->ifdata[0] = 0x1; state->sub->ifdata[0] = 0x1;
state->sub->ifdata[1] = event; state->sub->ifdata[1] = event;
@@ -1370,7 +1368,7 @@ static struct adsi_script *compile_script(char *script)
/* Create "main" as first subroutine */ /* Create "main" as first subroutine */
getsubbyname(scr, "main", NULL, 0); getsubbyname(scr, "main", NULL, 0);
while(!feof(f)) { while (!feof(f)) {
fgets(buf, sizeof(buf), f); fgets(buf, sizeof(buf), f);
if (!feof(f)) { if (!feof(f)) {
lineno++; lineno++;
@@ -1447,7 +1445,7 @@ static int adsi_prog(struct ast_channel *chan, char *script)
return -1; return -1;
/* Start an empty ADSI Session */ /* Start an empty ADSI Session */
if (ast_adsi_load_session(chan, NULL, 0, 1) < 1) if (ast_adsi_load_session(chan, NULL, 0, 1) < 1)
return -1; return -1;
/* Now begin the download attempt */ /* Now begin the download attempt */
@@ -1531,7 +1529,6 @@ static int adsi_prog(struct ast_channel *chan, char *script)
} }
} }
bytes = 0; bytes = 0;
bytes += ast_adsi_display(buf, ADSI_INFO_PAGE, 1, ADSI_JUST_LEFT, 0, "Download complete.", ""); bytes += ast_adsi_display(buf, ADSI_INFO_PAGE, 1, ADSI_JUST_LEFT, 0, "Download complete.", "");
bytes += ast_adsi_set_line(buf, ADSI_INFO_PAGE, 1); bytes += ast_adsi_set_line(buf, ADSI_INFO_PAGE, 1);
@@ -1555,14 +1552,14 @@ static int adsi_exec(struct ast_channel *chan, void *data)
if (ast_strlen_zero(data)) if (ast_strlen_zero(data))
data = "asterisk.adsi"; data = "asterisk.adsi";
if (!ast_adsi_available(chan)) { if (!ast_adsi_available(chan)) {
ast_verb(3, "ADSI Unavailable on CPE. Not bothering to try.\n"); ast_verb(3, "ADSI Unavailable on CPE. Not bothering to try.\n");
} else { } else {
ast_verb(3, "ADSI Available on CPE. Attempting Upload.\n"); ast_verb(3, "ADSI Available on CPE. Attempting Upload.\n");
res = adsi_prog(chan, data); res = adsi_prog(chan, data);
} }
return res; return res;
} }