Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up code in res_adsi.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Joshua Colp 18 years ago
parent 2897a41de8
commit c1d1440e59
1 changed files with 141 additions and 183 deletions
Show Stats Download Patch File Download Diff File

182
res/res_adsi.c
Unescape View File

@ -76,13 +76,9 @@ static int alignment = 0;
static int adsi_generate(unsigned char *buf, int msgtype, unsigned char *msg, int msglen, int msgnum, int last, int codec)
{
int sum;
int x;
int bytes=0;
int sum, x, bytes = 0;
/* Initial carrier (imaginary) */
float cr = 1.0;
float ci = 0.0;
float scont = 0.0;
float cr = 1.0, ci = 0.0, scont = 0.0;
if (msglen > 255)
msglen = 255;
@ -92,6 +88,7 @@ static int adsi_generate(unsigned char *buf, int msgtype, unsigned char *msg, in
for (x = 0; x < 150; x++) /* was 150 */
PUT_CLID_MARKMS;
}
/* Put message type */
PUT_CLID(msgtype);
sum = msgtype;
@ -162,14 +159,19 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l
about it */
if (ast_waitfor(chan, 1000) < 1)
return -1;
inf = ast_read(chan);
/* Detect hangup */
if (!inf)
if (!(inf = ast_read(chan)))
return -1;
if (inf->frametype == AST_FRAME_VOICE) {
/* Read a voice frame */
/* Drop any frames that are not voice */
if (inf->frametype != AST_FRAME_VOICE) {
ast_frfree(inf);
continue;
}
if (inf->subclass != AST_FORMAT_ULAW) {
ast_log(LOG_WARNING, "Channel not in ulaw?\n");
ast_frfree(inf);
return -1;
}
/* Send no more than they sent us */
@ -189,7 +191,6 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l
/* Update pointers and lengths */
buf += amt;
len -= amt;
}
ast_frfree(inf);
}
return 0;
@ -199,18 +200,9 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
{
/* msglen must be no more than 256 bits, each */
unsigned char buf[24000 * 5];
int pos = 0, res;
int x;
int start=0;
int retries = 0;
int pos = 0, res, x, start = 0, retries = 0, waittime, rem = 0, def;
char ack[3];
/* Wait up to 500 ms for initial ACK */
int waittime;
struct ast_frame *f;
int rem = 0;
int def;
if (chan->adsicpe == AST_ADSI_UNAVAILABLE) {
/* Don't bother if we know they don't support ADSI */
@ -224,9 +216,9 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
ast_gen_cas(buf, 0, 680, AST_FORMAT_ULAW);
/* Send CAS */
if (adsi_careful_send(chan, buf, 680, NULL)) {
if (adsi_careful_send(chan, buf, 680, NULL))
ast_log(LOG_WARNING, "Unable to send CAS\n");
}
/* Wait For DTMF result */
waittime = 500;
for(;;) {
@ -239,8 +231,7 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
return -1;
}
waittime = res;
f = ast_read(chan);
if (!f) {
if (!(f = ast_read(chan))) {
ast_debug(1, "Hangup in ADSI\n");
return -1;
}
@ -251,9 +242,9 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
chan->adsicpe = AST_ADSI_AVAILABLE;
break;
} else {
if (f->subclass == 'D') {
if (f->subclass == 'D')
ast_debug(1, "Off-hook capable CPE only, not ADSI\n");
} else
else
ast_log(LOG_WARNING, "Unknown ADSI response '%c'\n", f->subclass);
if (!chan->adsicpe)
chan->adsicpe = AST_ADSI_UNAVAILABLE;
@ -275,8 +266,7 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
def= ast_channel_defer_dtmf(chan);
#endif
while ((x < 6) && msg[x]) {
res = adsi_generate(buf + pos, msgtype[x], msg[x], msglen[x], x+1 - start, (x == 5) || !msg[x+1], AST_FORMAT_ULAW);
if (res < 0) {
if ((res = adsi_generate(buf + pos, msgtype[x], msg[x], msglen[x], x+1 - start, (x == 5) || !msg[x+1], AST_FORMAT_ULAW)) < 0) {
ast_log(LOG_WARNING, "Failed to generate ADSI message %d on channel %s\n", x + 1, chan->name);
return -1;
}
@ -296,10 +286,8 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
ast_debug(1, "Sent total spill of %d bytes\n", pos);
memset(ack, 0, sizeof(ack));
/* Get real result */
res = ast_readstring(chan, ack, 2, 1000, 1000, "");
/* Check for hangup */
if (res < 0)
/* Get real result and check for hangup */
if ((res = ast_readstring(chan, ack, 2, 1000, 1000, "")) < 0)
return -1;
if (ack[0] == 'D') {
ast_debug(1, "Acked up to message %d\n", atoi(ack + 1)); start += atoi(ack + 1);
@ -325,10 +313,10 @@ static int __adsi_transmit_messages(struct ast_channel *chan, unsigned char **ms
static int _ast_adsi_begin_download(struct ast_channel *chan, char *service, unsigned char *fdn, unsigned char *sec, int version)
{
int bytes;
int bytes = 0;
unsigned char buf[256];
char ack[2];
bytes = 0;
/* Setup the resident soft key stuff, a piece at a time */
/* Upload what scripts we can for voicemail ahead of time */
bytes += ast_adsi_download_connect(buf + bytes, service, fdn, sec, version);
@ -344,9 +332,9 @@ static int _ast_adsi_begin_download(struct ast_channel *chan, char *service, uns
static int _ast_adsi_end_download(struct ast_channel *chan)
{
int bytes;
int bytes = 0;
unsigned char buf[256];
bytes = 0;
/* Setup the resident soft key stuff, a piece at a time */
/* Upload what scripts we can for voicemail ahead of time */
bytes += ast_adsi_download_disconnect(buf + bytes);
@ -358,18 +346,7 @@ static int _ast_adsi_end_download(struct ast_channel *chan)
static int _ast_adsi_transmit_message_full(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype, int dowait)
{
unsigned char *msgs[5] = { NULL, NULL, NULL, NULL, NULL };
int msglens[5];
int msgtypes[5];
int newdatamode;
int res;
int x;
int writeformat, readformat;
int waitforswitch = 0;
writeformat = chan->writeformat;
readformat = chan->readformat;
newdatamode = chan->adsicpe & ADSI_FLAG_DATAMODE;
int msglens[5], msgtypes[5], newdatamode = (chan->adsicpe & ADSI_FLAG_DATAMODE), res, x, writeformat = chan->writeformat, readformat = chan->readformat, waitforswitch = 0;
for (x = 0; x < msglen; x += (msg[x+1]+2)) {
if (msg[x] == ADSI_SWITCH_TO_DATA) {
@ -455,6 +432,7 @@ static int _ast_adsi_load_soft_key(unsigned char *buf, int key, const char *llab
/* Abort if invalid key specified */
if ((key < 2) || (key > 33))
return -1;
buf[bytes++] = ADSI_LOAD_SOFTKEY;
/* Reserve for length */
bytes++;
@ -489,8 +467,7 @@ static int _ast_adsi_load_soft_key(unsigned char *buf, int key, const char *llab
static int _ast_adsi_connect_session(unsigned char *buf, unsigned char *fdn, int ver)
{
int bytes=0;
int x;
int bytes = 0, x;
/* Message type */
buf[bytes++] = ADSI_CONNECT_SESSION;
@ -512,8 +489,7 @@ static int _ast_adsi_connect_session(unsigned char *buf, unsigned char *fdn, int
static int _ast_adsi_download_connect(unsigned char *buf, char *service, unsigned char *fdn, unsigned char *sec, int ver)
{
int bytes=0;
int x;
int bytes = 0, x;
/* Message type */
buf[bytes++] = ADSI_DOWNLOAD_CONNECT;
@ -527,11 +503,12 @@ static int _ast_adsi_download_connect(unsigned char *buf, char *service, unsign
/* Delimiter */
buf[bytes++] = 0xff;
for (x=0;x<4;x++) {
for (x = 0; x < 4; x++)
buf[bytes++] = fdn[x];
}
for (x = 0; x < 4; x++)
buf[bytes++] = sec[x];
buf[bytes++] = ver & 0xff;
buf[1] = bytes - 2;
@ -577,16 +554,14 @@ static int _ast_adsi_query_cpeinfo(unsigned char *buf)
static int _ast_adsi_read_encoded_dtmf(struct ast_channel *chan, unsigned char *buf, int maxlen)
{
int bytes = 0;
int res;
int bytes = 0, res, gotstar = 0, pos = 0;
unsigned char current = 0;
int gotstar = 0;
int pos = 0;
memset(buf, 0, sizeof(buf));
while(bytes <= maxlen) {
/* Wait up to a second for a digit */
res = ast_waitfordigit(chan, 1000);
if (!res)
if (!(res = ast_waitfordigit(chan, 1000)))
break;
if (res == '*') {
gotstar = 1;
@ -607,14 +582,15 @@ static int _ast_adsi_read_encoded_dtmf(struct ast_channel *chan, unsigned char *
}
gotstar = 0;
}
return bytes;
}
static int _ast_adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, int voice)
{
unsigned char buf[256];
int bytes = 0;
int res;
unsigned char buf[256] = "";
int bytes = 0, res;
bytes += ast_adsi_data_mode(buf);
ast_adsi_transmit_message_full(chan, buf, bytes, ADSI_MSG_DISPLAY, 0);
@ -623,7 +599,6 @@ static int _ast_adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, i
ast_adsi_transmit_message_full(chan, buf, bytes, ADSI_MSG_DISPLAY, 0);
/* Get response */
memset(buf, 0, sizeof(buf));
res = ast_adsi_read_encoded_dtmf(chan, cpeid, 4);
if (res != 4) {
ast_log(LOG_WARNING, "Got %d bytes back of encoded DTMF, expecting 4\n", res);
@ -644,9 +619,9 @@ static int _ast_adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, i
static int _ast_adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *height, int *buttons, int voice)
{
unsigned char buf[256];
int bytes = 0;
int res;
unsigned char buf[256] = "";
int bytes = 0, res;
bytes += ast_adsi_data_mode(buf);
ast_adsi_transmit_message_full(chan, buf, bytes, ADSI_MSG_DISPLAY, 0);
@ -655,9 +630,7 @@ static int _ast_adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *heig
ast_adsi_transmit_message_full(chan, buf, bytes, ADSI_MSG_DISPLAY, 0);
/* Get width */
memset(buf, 0, sizeof(buf));
res = ast_readstring(chan, (char *)buf, 2, 1000, 500, "");
if (res < 0)
if ((res = ast_readstring(chan, (char *)buf, 2, 1000, 500, "")) < 0)
return res;
if (strlen((char *)buf) != 2) {
ast_log(LOG_WARNING, "Got %d bytes of width, expecting 2\n", res);
@ -670,8 +643,7 @@ static int _ast_adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *heig
/* Get height */
memset(buf, 0, sizeof(buf));
if (res) {
res = ast_readstring(chan, (char *)buf, 2, 1000, 500, "");
if (res < 0)
if ((res = ast_readstring(chan, (char *)buf, 2, 1000, 500, "")) < 0)
return res;
if (strlen((char *)buf) != 2) {
ast_log(LOG_WARNING, "Got %d bytes of height, expecting 2\n", res);
@ -685,8 +657,7 @@ static int _ast_adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *heig
/* Get buttons */
memset(buf, 0, sizeof(buf));
if (res) {
res = ast_readstring(chan, (char *)buf, 1, 1000, 500, "");
if (res < 0)
if ((res = ast_readstring(chan, (char *)buf, 1, 1000, 500, "")) < 0)
return res;
if (strlen((char *)buf) != 1) {
ast_log(LOG_WARNING, "Got %d bytes of buttons, expecting 1\n", res);
@ -883,8 +854,8 @@ static int _ast_adsi_input_format(unsigned char *buf, int num, int dir, int wrap
static int _ast_adsi_set_keys(unsigned char *buf, unsigned char *keys)
{
int bytes=0;
int x;
int bytes = 0, x;
/* Message type */
buf[bytes++] = ADSI_INIT_SOFTKEY_LINE;
/* Space for size */
@ -929,12 +900,8 @@ static int speeds = 0;
static int _ast_adsi_channel_restore(struct ast_channel *chan)
{
unsigned char dsp[256];
int bytes;
int x;
unsigned char keyd[6];
memset(dsp, 0, sizeof(dsp));
unsigned char dsp[256] = "", keyd[6] = "";
int bytes, x;
/* Start with initial display setup */
bytes = 0;
@ -943,10 +910,8 @@ static int _ast_adsi_channel_restore(struct ast_channel *chan)
/* Prepare key setup messages */
if (speeds) {
memset(keyd, 0, sizeof(keyd));
for (x=0;x<speeds;x++) {
for (x = 0; x < speeds; x++)
keyd[x] = ADSI_SPEED_DIAL + x;
}
bytes += ast_adsi_set_keys(dsp + bytes, keyd);
}
ast_adsi_transmit_message_full(chan, dsp, bytes, ADSI_MSG_DISPLAY, 0);
@ -957,34 +922,27 @@ static int _ast_adsi_channel_restore(struct ast_channel *chan)
static int _ast_adsi_print(struct ast_channel *chan, char **lines, int *aligns, int voice)
{
unsigned char buf[4096];
int bytes=0;
int res;
int x;
int bytes = 0, res, x;
for(x = 0; lines[x]; x++)
bytes += ast_adsi_display(buf + bytes, ADSI_INFO_PAGE, x+1, aligns[x], 0, lines[x], "");
bytes += ast_adsi_set_line(buf + bytes, ADSI_INFO_PAGE, 1);
if (voice) {
if (voice)
bytes += ast_adsi_voice_mode(buf + bytes, 0);
}
res = ast_adsi_transmit_message_full(chan, buf, bytes, ADSI_MSG_DISPLAY, 0);
if (voice) {
if (voice)
/* Ignore the resulting DTMF B announcing it's in voice mode */
ast_waitfordigit(chan, 1000);
}
return res;
}
static int _ast_adsi_load_session(struct ast_channel *chan, unsigned char *app, int ver, int data)
{
unsigned char dsp[256];
int bytes;
int res;
unsigned char dsp[256] = "";
int bytes = 0, res;
char resp[2];
memset(dsp, 0, sizeof(dsp));
/* Connect to session */
bytes = 0;
bytes += ast_adsi_connect_session(dsp + bytes, app, ver);
if (data)
@ -994,8 +952,7 @@ static int _ast_adsi_load_session(struct ast_channel *chan, unsigned char *app,
if (ast_adsi_transmit_message_full(chan, dsp, bytes, ADSI_MSG_DISPLAY, 0))
return -1;
if (app) {
res = ast_readstring(chan, resp, 1, 1200, 1200, "");
if (res < 0)
if ((res = ast_readstring(chan, resp, 1, 1200, 1200, "")) < 0)
return -1;
if (res) {
ast_debug(1, "No response from CPE about version. Assuming not there.\n");
@ -1017,19 +974,17 @@ static int _ast_adsi_load_session(struct ast_channel *chan, unsigned char *app,
static int _ast_adsi_unload_session(struct ast_channel *chan)
{
unsigned char dsp[256];
int bytes;
memset(dsp, 0, sizeof(dsp));
unsigned char dsp[256] = "";
int bytes = 0;
/* Connect to session */
bytes = 0;
bytes += ast_adsi_disconnect_session(dsp + bytes);
bytes += ast_adsi_voice_mode(dsp + bytes, 0);
/* Prepare key setup messages */
if (ast_adsi_transmit_message_full(chan, dsp, bytes, ADSI_MSG_DISPLAY, 0))
return -1;
return 0;
}
@ -1064,15 +1019,16 @@ static void init_state(void)
static void adsi_load(void)
{
int x;
struct ast_config *conf;
int x = 0;
struct ast_config *conf = NULL;
struct ast_variable *v;
struct ast_flags config_flags = { 0 };
char *name, *sname;
init_state();
conf = ast_config_load("adsi.conf", config_flags);
if (conf) {
x=0;
if (!(conf = ast_config_load("adsi.conf", config_flags)))
return;
for (v = ast_variable_browse(conf, "intro"); v; v = v->next) {
if (!strcasecmp(v->name, "alignment"))
alignment = str2align(v->value);
@ -1089,6 +1045,7 @@ static void adsi_load(void)
}
if (x)
total = x;
x = 0;
for (v = ast_variable_browse(conf, "speeddial"); v; v = v->next) {
char *stringp = v->value;
@ -1106,7 +1063,8 @@ static void adsi_load(void)
if (x)
speeds = x;
ast_config_destroy(conf);
}
return;
}
static int reload(void)

Write Preview
Loading…
Cancel
Save