kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 0.1.7 from FTP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2001-03-10 19:12:11 +00:00
parent 22318b627d
commit 7157261be4
11 changed files with 272 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_modem.c
View File

@@ -227,7 +227,7 @@ int ast_modem_read_response(struct ast_modem_pvt *p, int timeout)
timeout *= 1000;
strncpy(p->response, "(No Response)", sizeof(p->response));
do {
res = ast_waitfor_n_fd(&p->fd, 1, &timeout);
res = ast_waitfor_n_fd(&p->fd, 1, &timeout, NULL);
if (res < 0) {
return -1;
}
@@ -244,7 +244,7 @@ int ast_modem_expect(struct ast_modem_pvt *p, char *result, int timeout)
timeout *= 1000;
strncpy(p->response, "(No Response)", sizeof(p->response));
do {
res = ast_waitfor_n_fd(&p->fd, 1, &timeout);
res = ast_waitfor_n_fd(&p->fd, 1, &timeout, NULL);
if (res < 0) {
return -1;
}
@@ -432,7 +432,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
snprintf(tmp->name, sizeof(tmp->name), "Modem[%s]/%s", i->mc->name, i->dev + 5);
tmp->type = type;
tmp->fd = i->fd;
tmp->format = i->mc->formats;
tmp->nativeformats = i->mc->formats;
tmp->state = state;
if (state == AST_STATE_RING)
tmp->rings = 1;
@@ -855,3 +855,8 @@ char *description()
return desc;
}
char *key()
{
return ASTERISK_GPL_KEY;
}

36
channels/chan_phone.c
View File

@@ -207,7 +207,7 @@ static int phone_setup(struct ast_channel *ast)
p = ast->pvt->pvt;
ioctl(p->fd, PHONE_CPT_STOP);
/* Nothing to answering really, just start recording */
if (ast->format & AST_FORMAT_G723_1) {
if (ast->pvt->rawreadformat == AST_FORMAT_G723_1) {
/* Prefer g723 */
ioctl(p->fd, PHONE_REC_STOP);
if (p->lastinput != AST_FORMAT_G723_1) {
@@ -217,7 +217,7 @@ static int phone_setup(struct ast_channel *ast)
return -1;
}
}
} else if (ast->format & AST_FORMAT_SLINEAR) {
} else if (ast->pvt->rawreadformat == AST_FORMAT_SLINEAR) {
ioctl(p->fd, PHONE_REC_STOP);
if (p->lastinput != AST_FORMAT_SLINEAR) {
p->lastinput = AST_FORMAT_SLINEAR;
@@ -227,7 +227,7 @@ static int phone_setup(struct ast_channel *ast)
}
}
} else {
ast_log(LOG_WARNING, "Can't do format %d\n", ast->format);
ast_log(LOG_WARNING, "Can't do format %d\n", ast->pvt->rawreadformat);
return -1;
}
if (ioctl(p->fd, PHONE_REC_START)) {
@@ -268,7 +268,7 @@ static char phone_2digit(char c)
return '?';
}
static struct ast_frame *phone_read(struct ast_channel *ast)
static struct ast_frame *phone_exception(struct ast_channel *ast)
{
int res;
union telephony_exception phonee;
@@ -286,7 +286,7 @@ static struct ast_frame *phone_read(struct ast_channel *ast)
phonee.bytes = ioctl(p->fd, PHONE_EXCEPTION);
if (phonee.bits.dtmf_ready) {
if (option_debug)
ast_log(LOG_DEBUG, "phone_read(): DTMF\n");
ast_log(LOG_DEBUG, "phone_exception(): DTMF\n");
/* We've got a digit -- Just handle this nicely and easily */
digit = ioctl(p->fd, PHONE_GET_DTMF_ASCII);
@@ -324,6 +324,25 @@ static struct ast_frame *phone_read(struct ast_channel *ast)
if (phonee.bits.pstn_wink)
ast_verbose("Detected Wink\n");
#endif
/* Strange -- nothing there.. */
p->fr.frametype = AST_FRAME_NULL;
p->fr.subclass = 0;
return &p->fr;
}
static struct ast_frame *phone_read(struct ast_channel *ast)
{
int res;
struct phone_pvt *p = ast->pvt->pvt;
/* Some nice norms */
p->fr.datalen = 0;
p->fr.timelen = 0;
p->fr.data = NULL;
p->fr.src = type;
p->fr.offset = 0;
p->fr.mallocd=0;
/* Try to read some data... */
CHECK_BLOCKING(ast);
res = read(p->fd, p->buf, PHONE_MAX_BUF);
@@ -517,7 +536,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *conte
tmp->type = type;
tmp->fd = i->fd;
/* XXX Switching formats silently causes kernel panics XXX */
tmp->format = prefformat;
tmp->nativeformats = prefformat;
tmp->state = state;
if (state == AST_STATE_RING)
tmp->rings = 1;
@@ -528,6 +547,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *conte
tmp->pvt->answer = phone_answer;
tmp->pvt->read = phone_read;
tmp->pvt->write = phone_write;
tmp->pvt->exception = phone_exception;
strncpy(tmp->context, context, sizeof(tmp->context));
if (strlen(i->ext))
strncpy(tmp->exten, i->ext, sizeof(tmp->exten));
@@ -1052,3 +1072,7 @@ char *description()
return desc;
}
char *key()
{
return ASTERISK_GPL_KEY;
}

7
channels/chan_vofr.c
View File

@@ -795,7 +795,7 @@ static struct ast_channel *vofr_new(struct vofr_pvt *i, int state)
tmp->type = type;
tmp->fd = i->s;
/* Adtran VoFR supports only G723.1 format data. G711 (ulaw) would be nice too */
tmp->format = AST_FORMAT_G723_1;
tmp->nativeformats = AST_FORMAT_G723_1;
tmp->state = state;
if (state == AST_STATE_RING)
tmp->rings = 1;
@@ -1241,6 +1241,11 @@ int usecount()
return res;
}
char *key()
{
return ASTERISK_GPL_KEY;
}
char *description()
{
return desc;