Index: chan_oss.c =================================================================== --- chan_oss.c (revision 41164) +++ chan_oss.c (working copy) @@ -264,9 +258,9 @@ #define TEXT_SIZE 256 #if 0 -#define TRYOPEN 1 /* try to open on startup */ +#define TRYOPEN 1 /* try to open on startup */ #endif -#define O_CLOSE 0x444 /* special 'close' mode for device */ +#define O_CLOSE 0x444 /* special 'close' mode for device */ /* Which device to use */ #if defined( __OpenBSD__ ) || defined( __NetBSD__ ) #define DEV_DSP "/dev/audio" @@ -332,26 +332,26 @@ * nosound is set to disable the audio data from the channel * (so we can play the tones etc.). */ - int sndcmd[2]; /* Sound command pipe */ - int cursound; /* index of sound to send */ - int sampsent; /* # of sound samples sent */ - int nosound; /* set to block audio from the PBX */ + int sndcmd[2]; /* Sound command pipe */ + int cursound; /* index of sound to send */ + int sampsent; /* # of sound samples sent */ + int nosound; /* set to block audio from the PBX */ - int total_blocks; /* total blocks in the output device */ + int total_blocks; /* total blocks in the output device */ int sounddev; enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex; int autoanswer; int autohangup; int hookstate; - char *mixer_cmd; /* initial command to issue to the mixer */ - unsigned int queuesize; /* max fragments in queue */ - unsigned int frags; /* parameter for SETFRAGMENT */ + char *mixer_cmd; /* initial command to issue to the mixer */ + unsigned int queuesize; /* max fragments in queue */ + unsigned int frags; /* parameter for SETFRAGMENT */ - int warned; /* various flags used for warnings */ + int warned; /* various flags used for warnings */ #define WARN_used_blocks 1 #define WARN_speed 2 #define WARN_frag 4 - int w_errors; /* overfull in the write path */ + int w_errors; /* overfull in the write path */ struct timeval lastopen; int overridecontext; @@ -361,9 +361,9 @@ * be representable in 16 bits to avoid overflows. */ #define BOOST_SCALE (1<<9) -#define BOOST_MAX 40 /* slightly less than 7 bits */ - int boost; /* input boost, scaled by BOOST_SCALE */ - char device[64]; /* device to open */ +#define BOOST_MAX 40 /* slightly less than 7 bits */ + int boost; /* input boost, scaled by BOOST_SCALE */ + char device[64]; /* device to open */ pthread_t sthread; @@ -371,25 +371,25 @@ char ext[AST_MAX_EXTENSION]; char ctx[AST_MAX_CONTEXT]; char language[MAX_LANGUAGE]; - char cid_name[256]; /*XXX */ - char cid_num[256]; /*XXX */ + char cid_name[256]; /*XXX */ + char cid_num[256]; /*XXX */ char mohinterpret[MAX_MUSICCLASS]; /* buffers used in oss_write */ - char oss_write_buf[FRAME_SIZE*2]; + char oss_write_buf[FRAME_SIZE * 2]; int oss_write_dst; /* buffers used in oss_read - AST_FRIENDLY_OFFSET space for headers * plus enough room for a full frame */ char oss_read_buf[FRAME_SIZE * 2 + AST_FRIENDLY_OFFSET]; - int readpos; /* read position above */ + int readpos; /* read position above */ struct ast_frame read_f; /* returned by oss_read */ }; static struct chan_oss_pvt oss_default = { .cursound = -1, .sounddev = -1, - .duplex = M_UNSET, /* XXX check this */ + .duplex = M_UNSET, /* XXX check this */ .autoanswer = 1, .autohangup = 1, .queuesize = QUEUE_SIZE, @@ -397,16 +397,15 @@ .ext = "s", .ctx = "default", .readpos = AST_FRIENDLY_OFFSET, /* start here on reads */ - .lastopen = { 0, 0 }, + .lastopen = {0, 0}, .boost = BOOST_SCALE, }; -static char *oss_active; /* the active device */ +static char *oss_active; /* the active device */ static int setformat(struct chan_oss_pvt *o, int mode); -static struct ast_channel *oss_request(const char *type, int format, void *data -, int *cause); +static struct ast_channel *oss_request(const char *type, int format, void *data, int *cause); static int oss_digit(struct ast_channel *c, char digit); static int oss_text(struct ast_channel *c, const char *text); static int oss_hangup(struct ast_channel *c); @@ -419,9 +418,9 @@ static char tdesc[] = "OSS Console Channel Driver"; static const struct ast_channel_tech oss_tech = { - .type = "Console", - .description = tdesc, - .capabilities = AST_FORMAT_SLINEAR, + .type = "Console", + .description = tdesc, + .capabilities = AST_FORMAT_SLINEAR, .requester = oss_request, .send_digit = oss_digit, .send_text = oss_text, @@ -443,8 +442,7 @@ if (dev == NULL) ast_log(LOG_WARNING, "null dev\n"); - for (o = oss_default.next; o && o->name && dev && strcmp(o->name, dev) != 0; o = o->next) - ; + for (o = oss_default.next; o && o->name && dev && strcmp(o->name, dev) != 0; o = o->next); if (o == NULL) ast_log(LOG_WARNING, "could not find <%s>\n", dev ? dev : "--no-device--"); return o; @@ -464,7 +462,7 @@ struct chan_oss_pvt *o = find_desc(oss_active); if (ext == NULL || ctx == NULL) - return NULL; /* error */ + return NULL; /* error */ *ext = *ctx = NULL; if (src && *src != '\0') *ext = ast_strdup(src); @@ -487,18 +485,15 @@ struct audio_buf_info info; if (ioctl(o->sounddev, SNDCTL_DSP_GETOSPACE, &info)) { - if (! (o->warned & WARN_used_blocks)) { + if (!(o->warned & WARN_used_blocks)) { ast_log(LOG_WARNING, "Error reading output space\n"); o->warned |= WARN_used_blocks; } return 1; } if (o->total_blocks == 0) { - if (0) /* debugging */ - ast_log(LOG_WARNING, "fragtotal %d size %d avail %d\n", - info.fragstotal, - info.fragsize, - info.fragments); + if (0) /* debugging */ + ast_log(LOG_WARNING, "fragtotal %d size %d avail %d\n", info.fragstotal, info.fragsize, info.fragments); o->total_blocks = info.fragments; } return o->total_blocks - info.fragments; @@ -506,13 +501,13 @@ /* Write an exactly FRAME_SIZE sized frame */ static int soundcard_writeframe(struct chan_oss_pvt *o, short *data) -{ +{ int res; if (o->sounddev < 0) setformat(o, O_RDWR); if (o->sounddev < 0) - return 0; /* not fatal */ + return 0; /* not fatal */ /* * Nothing complex to manage the audio device queue. * If the buffer is full just drop the extra, otherwise write. @@ -522,12 +517,11 @@ res = used_blocks(o); if (res > o->queuesize) { /* no room to write a block */ if (o->w_errors++ == 0 && (oss_debug & 0x4)) - ast_log(LOG_WARNING, "write: used %d blocks (%d)\n", - res, o->w_errors); + ast_log(LOG_WARNING, "write: used %d blocks (%d)\n", res, o->w_errors); return 0; } o->w_errors = 0; - return write(o->sounddev, ((void *)data), FRAME_SIZE * 2); + return write(o->sounddev, ((void *) data), FRAME_SIZE * 2); } /* @@ -547,37 +541,36 @@ int l_sampsent = o->sampsent; struct sound *s; - if (o->cursound < 0) /* no sound to send */ + if (o->cursound < 0) /* no sound to send */ return; s = &sounds[o->cursound]; for (ofs = 0; ofs < FRAME_SIZE; ofs += l) { l = s->samplen - l_sampsent; /* # of available samples */ if (l > 0) { - start = l_sampsent % s->datalen; /* source offset */ + start = l_sampsent % s->datalen; /* source offset */ if (l > FRAME_SIZE - ofs) /* don't overflow the frame */ l = FRAME_SIZE - ofs; if (l > s->datalen - start) /* don't overflow the source */ l = s->datalen - start; - bcopy(s->data + start, myframe + ofs, l*2); + bcopy(s->data + start, myframe + ofs, l * 2); if (0) - ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", - l_sampsent, l, s->samplen, ofs); + ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs); l_sampsent += l; - } else { /* end of samples, maybe some silence */ - static const short silence[FRAME_SIZE] = {0, }; + } else { /* end of samples, maybe some silence */ + static const short silence[FRAME_SIZE] = { 0, }; l += s->silencelen; if (l > 0) { if (l > FRAME_SIZE - ofs) l = FRAME_SIZE - ofs; - bcopy(silence, myframe + ofs, l*2); + bcopy(silence, myframe + ofs, l * 2); l_sampsent += l; - } else { /* silence is over, restart sound if loop */ + } else { /* silence is over, restart sound if loop */ if (s->repeat == 0) { /* last block */ o->cursound = -1; o->nosound = 0; /* allow audio data */ if (ofs < FRAME_SIZE) /* pad with silence */ - bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs)*2); + bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2); } l_sampsent = 0; } @@ -591,7 +584,7 @@ static void *sound_thread(void *arg) { char ign[4096]; - struct chan_oss_pvt *o = (struct chan_oss_pvt *)arg; + struct chan_oss_pvt *o = (struct chan_oss_pvt *) arg; /* * Just in case, kick the driver by trying to read from it. @@ -607,11 +600,11 @@ FD_SET(o->sndcmd[0], &rfds); maxfd = o->sndcmd[0]; /* pipe from the main process */ if (o->cursound > -1 && o->sounddev < 0) - setformat(o, O_RDWR); /* need the channel, try to reopen */ + setformat(o, O_RDWR); /* need the channel, try to reopen */ else if (o->cursound == -1 && o->owner == NULL) - setformat(o, O_CLOSE); /* can close */ + setformat(o, O_CLOSE); /* can close */ if (o->sounddev > -1) { - if (!o->owner) { /* no one owns the audio, so we must drain it */ + if (!o->owner) { /* no one owns the audio, so we must drain it */ FD_SET(o->sounddev, &rfds); maxfd = MAX(o->sounddev, maxfd); } @@ -636,7 +629,7 @@ if (sounds[i].ind == what) { o->cursound = i; o->sampsent = 0; - o->nosound = 1; /* block audio from pbx */ + o->nosound = 1; /* block audio from pbx */ break; } } @@ -644,13 +637,13 @@ ast_log(LOG_WARNING, "invalid sound index: %d\n", what); } if (o->sounddev > -1) { - if (FD_ISSET(o->sounddev, &rfds)) /* read and ignore errors */ + if (FD_ISSET(o->sounddev, &rfds)) /* read and ignore errors */ read(o->sounddev, ign, sizeof(ign)); if (FD_ISSET(o->sounddev, &wfds)) send_sound(o); } } - return NULL; /* Never reached */ + return NULL; /* Never reached */ } /* @@ -668,15 +661,14 @@ o->duplex = M_UNSET; o->sounddev = -1; } - if (mode == O_CLOSE) /* we are done */ + if (mode == O_CLOSE) /* we are done */ return 0; if (ast_tvdiff_ms(ast_tvnow(), o->lastopen) < 1000) - return -1; /* don't open too often */ + return -1; /* don't open too often */ o->lastopen = ast_tvnow(); - fd = o->sounddev = open(o->device, mode |O_NONBLOCK); + fd = o->sounddev = open(o->device, mode | O_NONBLOCK); if (fd < 0) { - ast_log(LOG_WARNING, "Unable to re-open DSP device %s: %s\n", - o->device, strerror(errno)); + ast_log(LOG_WARNING, "Unable to re-open DSP device %s: %s\n", o->device, strerror(errno)); return -1; } if (o->owner) @@ -693,22 +685,22 @@ return -1; } switch (mode) { - case O_RDWR: - res = ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0); - /* Check to see if duplex set (FreeBSD Bug)*/ - res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt); - if (res == 0 && (fmt & DSP_CAP_DUPLEX)) { - if (option_verbose > 1) - ast_verbose(VERBOSE_PREFIX_2 "Console is full duplex\n"); - o->duplex = M_FULL; - }; - break; - case O_WRONLY: - o->duplex = M_WRITE; - break; - case O_RDONLY: - o->duplex = M_READ; - break; + case O_RDWR: + res = ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0); + /* Check to see if duplex set (FreeBSD Bug) */ + res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt); + if (res == 0 && (fmt & DSP_CAP_DUPLEX)) { + if (option_verbose > 1) + ast_verbose(VERBOSE_PREFIX_2 "Console is full duplex\n"); + o->duplex = M_FULL; + }; + break; + case O_WRONLY: + o->duplex = M_WRITE; + break; + case O_RDONLY: + o->duplex = M_READ; + break; } fmt = 0; @@ -717,7 +709,7 @@ ast_log(LOG_WARNING, "Failed to set audio device to mono\n"); return -1; } - fmt = desired = DEFAULT_SAMPLE_RATE; /* 8000 Hz desired */ + fmt = desired = DEFAULT_SAMPLE_RATE; /* 8000 Hz desired */ res = ioctl(fd, SNDCTL_DSP_SPEED, &fmt); if (res < 0) { @@ -760,14 +749,14 @@ static int oss_digit(struct ast_channel *c, char digit) { /* no better use for received digits than print them */ - ast_verbose( " << Console Received digit %c >> \n", digit); + ast_verbose(" << Console Received digit %c >> \n", digit); return 0; } static int oss_text(struct ast_channel *c, const char *text) { /* print received messages */ - ast_verbose( " << Console Received text %s >> \n", text); + ast_verbose(" << Console Received text %s >> \n", text); return 0; } @@ -786,10 +775,9 @@ struct chan_oss_pvt *o = c->tech_pvt; struct ast_frame f = { 0, }; - ast_verbose(" << Call to device '%s' dnid '%s' rdnis '%s' on console from '%s' <%s> >>\n", - dest, c->cid.cid_dnid, c->cid.cid_rdnis, c->cid.cid_name, c->cid.cid_num); + ast_verbose(" << Call to device '%s' dnid '%s' rdnis '%s' on console from '%s' <%s> >>\n", dest, c->cid.cid_dnid, c->cid.cid_rdnis, c->cid.cid_name, c->cid.cid_num); if (o->autoanswer) { - ast_verbose( " << Auto-answered >> \n" ); + ast_verbose(" << Auto-answered >> \n"); f.frametype = AST_FRAME_CONTROL; f.subclass = AST_CONTROL_ANSWER; ast_queue_frame(c, &f); @@ -810,14 +798,14 @@ { struct chan_oss_pvt *o = c->tech_pvt; - ast_verbose( " << Console call has been answered >> \n"); + ast_verbose(" << Console call has been answered >> \n"); #if 0 /* play an answer tone (XXX do we really need it ?) */ ring(o, AST_CONTROL_ANSWER); #endif ast_setstate(c, AST_STATE_UP); o->cursound = -1; - o->nosound=0; + o->nosound = 0; return 0; } @@ -829,7 +817,7 @@ o->nosound = 0; c->tech_pvt = NULL; o->owner = NULL; - ast_verbose( " << Hangup on console >> \n"); + ast_verbose(" << Hangup on console >> \n"); ast_mutex_lock(&usecnt_lock); /* XXX not sure why */ usecnt--; ast_mutex_unlock(&usecnt_lock); @@ -863,22 +851,20 @@ * in FRAME_SIZE chunks. * Keep the residue stored for future use. */ - src = 0; /* read position into f->data */ - while ( src < f->datalen ) { + src = 0; /* read position into f->data */ + while (src < f->datalen) { /* Compute spare room in the buffer */ int l = sizeof(o->oss_write_buf) - o->oss_write_dst; if (f->datalen - src >= l) { /* enough to fill a frame */ - memcpy(o->oss_write_buf + o->oss_write_dst, - f->data + src, l); - soundcard_writeframe(o, (short *)o->oss_write_buf); + memcpy(o->oss_write_buf + o->oss_write_dst, f->data + src, l); + soundcard_writeframe(o, (short *) o->oss_write_buf); src += l; o->oss_write_dst = 0; - } else { /* copy residue */ + } else { /* copy residue */ l = f->datalen - src; - memcpy(o->oss_write_buf + o->oss_write_dst, - f->data + src, l); - src += l; /* but really, we are done */ + memcpy(o->oss_write_buf + o->oss_write_dst, f->data + src, l); + src += l; /* but really, we are done */ o->oss_write_dst += l; } } @@ -897,9 +883,8 @@ f->frametype = AST_FRAME_NULL; f->src = oss_tech.type; - res = read(o->sounddev, o->oss_read_buf + o->readpos, - sizeof(o->oss_read_buf) - o->readpos); - if (res < 0) /* audio data not ready, return a NULL frame */ + res = read(o->sounddev, o->oss_read_buf + o->readpos, sizeof(o->oss_read_buf) - o->readpos); + if (res < 0) /* audio data not ready, return a NULL frame */ return f; o->readpos += res; @@ -918,9 +903,9 @@ f->samples = FRAME_SIZE; f->datalen = FRAME_SIZE * 2; f->data = o->oss_read_buf + AST_FRIENDLY_OFFSET; - if (o->boost != BOOST_SCALE) { /* scale and clip values */ + if (o->boost != BOOST_SCALE) { /* scale and clip values */ int i, x; - int16_t *p = (int16_t *)f->data; + int16_t *p = (int16_t *) f->data; for (i = 0; i < f->samples; i++) { x = (p[i] * o->boost) / BOOST_SCALE; if (x > 32767) @@ -930,7 +915,7 @@ p[i] = x; } } - + f->offset = AST_FRIENDLY_OFFSET; return f; } @@ -947,48 +932,45 @@ struct chan_oss_pvt *o = c->tech_pvt; int res = -1; - switch(cond) { - case AST_CONTROL_BUSY: - case AST_CONTROL_CONGESTION: - case AST_CONTROL_RINGING: - res = cond; - break; + switch (cond) { + case AST_CONTROL_BUSY: + case AST_CONTROL_CONGESTION: + case AST_CONTROL_RINGING: + res = cond; + break; - case -1: - o->cursound = -1; - o->nosound = 0; /* when cursound is -1 nosound must be 0 */ - return 0; + case -1: + o->cursound = -1; + o->nosound = 0; /* when cursound is -1 nosound must be 0 */ + return 0; - case AST_CONTROL_VIDUPDATE: - res = -1; - break; - case AST_CONTROL_HOLD: - ast_verbose( " << Console Has Been Placed on Hold >> \n"); - ast_moh_start(c, data, o->mohinterpret); - break; - case AST_CONTROL_UNHOLD: - ast_verbose( " << Console Has Been Retrieved from Hold >> \n"); - ast_moh_stop(c); - break; + case AST_CONTROL_VIDUPDATE: + res = -1; + break; + case AST_CONTROL_HOLD: + ast_verbose(" << Console Has Been Placed on Hold >> \n"); + ast_moh_start(c, data, o->mohinterpret); + break; + case AST_CONTROL_UNHOLD: + ast_verbose(" << Console Has Been Retrieved from Hold >> \n"); + ast_moh_stop(c); + break; - default: - ast_log(LOG_WARNING, - "Don't know how to display condition %d on %s\n", - cond, c->name); - return -1; + default: + ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, c->name); + return -1; } if (res > -1) ring(o, res); - - return 0; + + return 0; } /* * allocate a new channel. */ -static struct ast_channel *oss_new(struct chan_oss_pvt *o, - char *ext, char *ctx, int state) +static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx, int state) { struct ast_channel *c; @@ -999,7 +981,7 @@ ast_string_field_build(c, name, "OSS/%s", o->device + 5); if (o->sounddev < 0) setformat(o, O_RDWR); - c->fds[0] = o->sounddev; /* -1 if device closed, override later */ + c->fds[0] = o->sounddev; /* -1 if device closed, override later */ c->nativeformats = AST_FORMAT_SLINEAR; c->readformat = AST_FORMAT_SLINEAR; c->writeformat = AST_FORMAT_SLINEAR; @@ -1035,16 +1017,14 @@ return c; } -static struct ast_channel *oss_request(const char *type, - int format, void *data, int *cause) +static struct ast_channel *oss_request(const char *type, int format, void *data, int *cause) { struct ast_channel *c; struct chan_oss_pvt *o = find_desc(data); - ast_log(LOG_WARNING, "oss_request ty <%s> data 0x%p <%s>\n", - type, data, (char *)data); + ast_log(LOG_WARNING, "oss_request ty <%s> data 0x%p <%s>\n", type, data, (char *) data); if (o == NULL) { - ast_log(LOG_NOTICE, "Device %s not found\n", (char *)data); + ast_log(LOG_NOTICE, "Device %s not found\n", (char *) data); /* XXX we could default to 'dsp' perhaps ? */ return NULL; } @@ -1057,7 +1037,7 @@ *cause = AST_CAUSE_BUSY; return NULL; } - c= oss_new(o, NULL, NULL, AST_STATE_DOWN); + c = oss_new(o, NULL, NULL, AST_STATE_DOWN); if (c == NULL) { ast_log(LOG_WARNING, "Unable to create new OSS channel\n"); return NULL; @@ -1076,8 +1056,7 @@ if (argc != 2) return RESULT_SHOWUSAGE; if (o == NULL) { - ast_log(LOG_WARNING, "Cannot find device %s (should not happen!)\n", - oss_active); + ast_log(LOG_WARNING, "Cannot find device %s (should not happen!)\n", oss_active); return RESULT_FAILURE; } if (!strcasecmp(argv[1], "on")) @@ -1097,10 +1076,9 @@ } static char autoanswer_usage[] = -"Usage: autoanswer [on|off]\n" -" Enables or disables autoanswer feature. If used without\n" -" argument, displays the current on/off status of autoanswer.\n" -" The default value of autoanswer is in 'oss.conf'.\n"; + "Usage: autoanswer [on|off]\n" + " Enables or disables autoanswer feature. If used without\n" + " argument, displays the current on/off status of autoanswer.\n" " The default value of autoanswer is in 'oss.conf'.\n"; /* * answer command from the console @@ -1127,9 +1105,7 @@ return RESULT_SUCCESS; } -static char sendtext_usage[] = -"Usage: send text \n" -" Sends a text message for display on the remote terminal.\n"; +static char sendtext_usage[] = "Usage: send text \n" " Sends a text message for display on the remote terminal.\n"; /* * concatenate all arguments into a single string. argv is NULL-terminated @@ -1146,7 +1122,7 @@ ast_cli(fd, "Not in a call\n"); return RESULT_FAILURE; } - ast_join(buf, sizeof(buf) - 1, argv+2); + ast_join(buf, sizeof(buf) - 1, argv + 2); if (!ast_strlen_zero(buf)) { struct ast_frame f = { 0, }; int i = strlen(buf); @@ -1160,9 +1136,7 @@ return RESULT_SUCCESS; } -static char answer_usage[] = -"Usage: answer\n" -" Answers an incoming call on the console (OSS) channel.\n"; +static char answer_usage[] = "Usage: answer\n" " Answers an incoming call on the console (OSS) channel.\n"; static int console_hangup(int fd, int argc, char *argv[]) { @@ -1172,7 +1146,7 @@ return RESULT_SHOWUSAGE; o->cursound = -1; o->nosound = 0; - if (!o->owner && !o->hookstate) { /* XXX maybe only one ? */ + if (!o->owner && !o->hookstate) { /* XXX maybe only one ? */ ast_cli(fd, "No call to hang up\n"); return RESULT_FAILURE; } @@ -1183,9 +1157,7 @@ return RESULT_SUCCESS; } -static char hangup_usage[] = -"Usage: hangup\n" -" Hangs up any call currently placed on the console.\n"; +static char hangup_usage[] = "Usage: hangup\n" " Hangs up any call currently placed on the console.\n"; static int console_flash(int fd, int argc, char *argv[]) @@ -1196,21 +1168,19 @@ if (argc != 1) return RESULT_SHOWUSAGE; o->cursound = -1; - o->nosound = 0; /* when cursound is -1 nosound must be 0 */ - if (!o->owner) { /* XXX maybe !o->hookstate too ? */ + o->nosound = 0; /* when cursound is -1 nosound must be 0 */ + if (!o->owner) { /* XXX maybe !o->hookstate too ? */ ast_cli(fd, "No call to flash\n"); return RESULT_FAILURE; } o->hookstate = 0; - if (o->owner) /* XXX must be true, right ? */ + if (o->owner) /* XXX must be true, right ? */ ast_queue_frame(o->owner, &f); return RESULT_SUCCESS; } -static char flash_usage[] = -"Usage: flash\n" -" Flashes the call currently placed on the console.\n"; +static char flash_usage[] = "Usage: flash\n" " Flashes the call currently placed on the console.\n"; @@ -1221,17 +1191,17 @@ if (argc != 1 && argc != 2) return RESULT_SHOWUSAGE; - if (o->owner) { /* already in a call */ + if (o->owner) { /* already in a call */ int i; struct ast_frame f = { AST_FRAME_DTMF, 0 }; - if (argc == 1) { /* argument is mandatory here */ + if (argc == 1) { /* argument is mandatory here */ ast_cli(fd, "Already in a call. You can only dial digits until you hangup.\n"); return RESULT_FAILURE; } s = argv[1]; /* send the string one char at a time */ - for (i=0; iowner, &f); } @@ -1255,15 +1225,11 @@ return RESULT_SUCCESS; } -static char dial_usage[] = -"Usage: dial [extension[@context]]\n" -" Dials a given extension (and context if specified)\n"; +static char dial_usage[] = "Usage: dial [extension[@context]]\n" " Dials a given extension (and context if specified)\n"; -static char mute_usage[] = -"Usage: mute\nMutes the microphone\n"; +static char mute_usage[] = "Usage: mute\nMutes the microphone\n"; -static char unmute_usage[] = -"Usage: unmute\nUnmutes the microphone\n"; +static char unmute_usage[] = "Usage: unmute\nUnmutes the microphone\n"; static int console_mute(int fd, int argc, char *argv[]) { @@ -1295,19 +1261,18 @@ return RESULT_SHOWUSAGE; if (o == NULL) return RESULT_FAILURE; - if (o->owner ==NULL || (b = ast_bridged_channel(o->owner)) == NULL) { + if (o->owner == NULL || (b = ast_bridged_channel(o->owner)) == NULL) { ast_cli(fd, "There is no call to transfer\n"); return RESULT_SUCCESS; } tmp = ast_ext_ctx(argv[1], &ext, &ctx); - if (ctx == NULL) /* supply default context if needed */ + if (ctx == NULL) /* supply default context if needed */ ctx = o->owner->context; if (!ast_exists_extension(b, ctx, ext, 1, b->cid.cid_num)) ast_cli(fd, "No such extension exists\n"); else { - ast_cli(fd, "Whee, transferring %s to %s@%s.\n", - b->name, ext, ctx); + ast_cli(fd, "Whee, transferring %s to %s@%s.\n", b->name, ext, ctx); if (ast_async_goto(b, ctx, ext, 1)) ast_cli(fd, "Failed to transfer :(\n"); } @@ -1316,16 +1281,11 @@ return RESULT_SUCCESS; } -static char transfer_usage[] = -"Usage: transfer [@context]\n" -" Transfers the currently connected call to the given extension (and\n" -"context if specified)\n"; +static char transfer_usage[] = "Usage: transfer [@context]\n" " Transfers the currently connected call to the given extension (and\n" "context if specified)\n"; static char console_usage[] = -"Usage: console [device]\n" -" If used without a parameter, displays which device is the current\n" -"console. If a device is specified, the console sound device is changed to\n" -"the device specified.\n"; + "Usage: console [device]\n" + " If used without a parameter, displays which device is the current\n" "console. If a device is specified, the console sound device is changed to\n" "the device specified.\n"; static int console_active(int fd, int argc, char *argv[]) { @@ -1336,8 +1296,8 @@ else { struct chan_oss_pvt *o; if (strcmp(argv[1], "show") == 0) { - for (o = oss_default.next; o ; o = o->next) - ast_cli(fd, "device [%s] exists\n", o->name); + for (o = oss_default.next; o; o = o->next) + ast_cli(fd, "device [%s] exists\n", o->name); return RESULT_SUCCESS; } o = find_desc(argv[1]); @@ -1359,16 +1319,14 @@ ast_log(LOG_WARNING, "invalid boost <%s>\n", s); return; } - if (boost < - BOOST_MAX) { - ast_log(LOG_WARNING, "boost %s too small, using %d\n", - s, -BOOST_MAX); + if (boost < -BOOST_MAX) { + ast_log(LOG_WARNING, "boost %s too small, using %d\n", s, -BOOST_MAX); boost = -BOOST_MAX; } else if (boost > BOOST_MAX) { - ast_log(LOG_WARNING, "boost %s too large, using %d\n", - s, BOOST_MAX); + ast_log(LOG_WARNING, "boost %s too large, using %d\n", s, BOOST_MAX); boost = BOOST_MAX; } - boost = exp(log(10)*boost/20) * BOOST_SCALE; + boost = exp(log(10) * boost / 20) * BOOST_SCALE; o->boost = boost; ast_log(LOG_WARNING, "setting boost %s to %d\n", s, o->boost); } @@ -1378,25 +1336,24 @@ struct chan_oss_pvt *o = find_desc(oss_active); if (argc == 2) - ast_cli(fd, "boost currently %5.1f\n", - 20 * log10(((double)o->boost/(double)BOOST_SCALE)) ); + ast_cli(fd, "boost currently %5.1f\n", 20 * log10(((double) o->boost / (double) BOOST_SCALE))); else if (argc == 3) store_boost(o, argv[2]); return RESULT_SUCCESS; } static struct ast_cli_entry myclis[] = { - { { "answer", NULL }, console_answer, "Answer an incoming console call", answer_usage }, - { { "hangup", NULL }, console_hangup, "Hangup a call on the console", hangup_usage }, - { { "flash", NULL }, console_flash, "Flash a call on the console", flash_usage }, - { { "dial", NULL }, console_dial, "Dial an extension on the console", dial_usage }, - { { "mute", NULL }, console_mute, "Disable mic input", mute_usage }, - { { "unmute", NULL }, console_unmute, "Enable mic input", unmute_usage }, - { { "transfer", NULL }, console_transfer, "Transfer a call to a different extension", transfer_usage }, - { { "send", "text", NULL }, console_sendtext, "Send text to the remote device", sendtext_usage }, - { { "autoanswer", NULL }, console_autoanswer, "Sets/displays autoanswer", autoanswer_usage, autoanswer_complete }, - { { "oss", "boost", NULL }, do_boost, "Sets/displays mic boost in dB"}, - { { "console", NULL }, console_active, "Sets/displays active console", console_usage }, + {{"answer", NULL}, console_answer, "Answer an incoming console call", answer_usage}, + {{"hangup", NULL}, console_hangup, "Hangup a call on the console", hangup_usage}, + {{"flash", NULL}, console_flash, "Flash a call on the console", flash_usage}, + {{"dial", NULL}, console_dial, "Dial an extension on the console", dial_usage}, + {{"mute", NULL}, console_mute, "Disable mic input", mute_usage}, + {{"unmute", NULL}, console_unmute, "Enable mic input", unmute_usage}, + {{"transfer", NULL}, console_transfer, "Transfer a call to a different extension", transfer_usage}, + {{"send", "text", NULL}, console_sendtext, "Send text to the remote device", sendtext_usage}, + {{"autoanswer", NULL}, console_autoanswer, "Sets/displays autoanswer", autoanswer_usage, autoanswer_complete}, + {{"oss", "boost", NULL}, do_boost, "Sets/displays mic boost in dB"}, + {{"console", NULL}, console_active, "Sets/displays active console", console_usage}, }; /* @@ -1408,10 +1365,9 @@ { int i; - for (i=0; i < strlen(s); i++) { + for (i = 0; i < strlen(s); i++) { if (!isalnum(s[i]) && index(" \t-/", s[i]) == NULL) { - ast_log(LOG_WARNING, - "Suspect char %c in mixer cmd, ignoring:\n\t%s\n", s[i], s); + ast_log(LOG_WARNING, "Suspect char %c in mixer cmd, ignoring:\n\t%s\n", s[i], s); return; } } @@ -1432,7 +1388,7 @@ /* * grab fields from the config file, init the descriptor and open the device. */ -static struct chan_oss_pvt * store_config(struct ast_config *cfg, char *ctg) +static struct chan_oss_pvt *store_config(struct ast_config *cfg, char *ctg) { struct ast_variable *v; struct chan_oss_pvt *o; @@ -1455,9 +1411,9 @@ strcpy(o->mohinterpret, "default"); - o->lastopen = ast_tvnow(); /* don't leave it 0 or tvdiff may wrap */ + o->lastopen = ast_tvnow(); /* don't leave it 0 or tvdiff may wrap */ /* fill other fields from configuration */ - for (v = ast_variable_browse(cfg, ctg);v; v=v->next) { + for (v = ast_variable_browse(cfg, ctg); v; v = v->next) { M_START(v->name, v->value); /* handle jb conf */ @@ -1465,20 +1421,21 @@ continue; M_BOOL("autoanswer", o->autoanswer) - M_BOOL("autohangup", o->autohangup) - M_BOOL("overridecontext", o->overridecontext) - M_STR("device", o->device) - M_UINT("frags", o->frags) - M_UINT("debug", oss_debug) - M_UINT("queuesize", o->queuesize) - M_STR("context", o->ctx) - M_STR("language", o->language) - M_STR("mohinterpret", o->mohinterpret) - M_STR("extension", o->ext) - M_F("mixer", store_mixer(o, v->value)) - M_F("callerid", store_callerid(o, v->value)) - M_F("boost", store_boost(o, v->value)) - M_END(;); + M_BOOL("autohangup", o->autohangup) + M_BOOL("overridecontext", o->overridecontext) + M_STR("device", o->device) + M_UINT("frags", o->frags) + M_UINT("debug", oss_debug) + M_UINT("queuesize", o->queuesize) + M_STR("context", o->ctx) + M_STR("language", o->language) + M_STR("mohinterpret", o->mohinterpret) + M_STR("extension", o->ext) + M_F("mixer", store_mixer(o, v->value)) + M_F("callerid", store_callerid(o, v->value)) + M_F("boost", store_boost(o, v->value)) + M_END(; + ); } if (ast_strlen_zero(o->device)) ast_copy_string(o->device, DEV_DSP, sizeof(o->device)); @@ -1490,22 +1447,20 @@ system(cmd); free(cmd); } - if (o == &oss_default) /* we are done with the default */ + if (o == &oss_default) /* we are done with the default */ return NULL; -openit: + openit: #if TRYOPEN if (setformat(o, O_RDWR) < 0) { /* open device */ if (option_verbose > 0) { ast_verbose(VERBOSE_PREFIX_2 "Device %s not detected\n", ctg); - ast_verbose(VERBOSE_PREFIX_2 "Turn off OSS support by adding " - "'noload=chan_oss.so' in /etc/asterisk/modules.conf\n"); + ast_verbose(VERBOSE_PREFIX_2 "Turn off OSS support by adding " "'noload=chan_oss.so' in /etc/asterisk/modules.conf\n"); } goto error; } if (o->duplex != M_FULL) - ast_log(LOG_WARNING, "XXX I don't work right with non " - "full-duplex sound cards XXX\n"); + ast_log(LOG_WARNING, "XXX I don't work right with non " "full-duplex sound cards XXX\n"); #endif /* TRYOPEN */ if (pipe(o->sndcmd) != 0) { ast_log(LOG_ERROR, "Unable to create pipe\n"); @@ -1519,7 +1474,7 @@ } return o; -error: + error: if (o != &oss_default) free(o); return NULL; @@ -1536,15 +1491,15 @@ /* load config file */ cfg = ast_config_load(config); if (cfg != NULL) { - char *ctg = NULL; /* first pass is 'general' */ + char *ctg = NULL; /* first pass is 'general' */ do { store_config(cfg, ctg); - } while ( (ctg = ast_category_browse(cfg, ctg)) != NULL); + } while ((ctg = ast_category_browse(cfg, ctg)) != NULL); ast_config_destroy(cfg); } else { - ast_log(LOG_NOTICE, "Unable to load config oss.conf\n"); - return -1; + ast_log(LOG_NOTICE, "Unable to load config oss.conf\n"); + return -1; } if (find_desc(oss_active) == NULL) { ast_log(LOG_NOTICE, "Device %s not found\n", oss_active); @@ -1558,7 +1513,7 @@ /* XXX should cleanup allocated memory etc. */ return -1; } - ast_cli_register_multiple(myclis, sizeof(myclis)/sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry)); return 0; } @@ -1568,10 +1523,9 @@ struct chan_oss_pvt *o; ast_channel_unregister(&oss_tech); - ast_cli_unregister_multiple(myclis, - sizeof(myclis)/sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry)); - for (o = oss_default.next; o ; o = o->next) { + for (o = oss_default.next; o; o = o->next) { close(o->sounddev); if (o->sndcmd[0] > 0) { close(o->sndcmd[0]); @@ -1579,7 +1533,7 @@ } if (o->owner) ast_softhangup(o->owner, AST_SOFTHANGUP_APPUNLOAD); - if (o->owner) /* XXX how ??? */ + if (o->owner) /* XXX how ??? */ return -1; /* XXX what about the thread ? */ /* XXX what about the memory allocated ? */