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.2 from FTP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2000-01-05 17:22:42 +00:00
parent c340c2093c
commit 2ebdf66e5f
6 changed files with 412 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channels/chan_modem.c
View File

@@ -419,7 +419,6 @@ 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;
/* XXX Switching formats silently causes kernel panics XXX */
tmp->format = i->mc->formats;
tmp->state = state;
if (state == AST_STATE_RING)
@@ -433,7 +432,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
tmp->pvt->write = modem_write;
strncpy(tmp->context, i->context, sizeof(tmp->context));
if (strlen(i->cid))
strncpy(tmp->callerid, i->cid, sizeof(tmp->callerid));
tmp->callerid = strdup(i->cid);
i->owner = tmp;
pthread_mutex_lock(&usecnt_lock);
usecnt++;
@@ -443,6 +442,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
if (ast_pbx_start(tmp)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
ast_hangup(tmp);
tmp = NULL;
}
}
} else
@@ -454,6 +454,12 @@ static void modem_mini_packet(struct ast_modem_pvt *i)
{
struct ast_frame *fr;
fr = i->mc->read(i);
if (fr->frametype == AST_FRAME_CONTROL) {
if (fr->subclass == AST_CONTROL_RING) {
ast_modem_new(i, AST_STATE_RING);
restart_monitor();
}
}
}
static void *do_monitor(void *data)
@@ -701,10 +707,10 @@ int load_module()
ast_verbose(VERBOSE_PREFIX_2 "Loading modem driver %s", driver);
if (ast_load_resource(driver)) {
ast_log(LOG_ERROR, "Failed to laod driver %s\n", driver);
ast_log(LOG_ERROR, "Failed to load driver %s\n", driver);
ast_destroy(cfg);
unload_module();
pthread_mutex_unlock(&iflock);
unload_module();
return -1;
}
} else if (!strcasecmp(v->name, "mode")) {
@@ -742,8 +748,6 @@ int load_module()
return 0;
}
int unload_module()
{
struct ast_modem_pvt *p, *pl;

13
channels/chan_modem_aopen.c
View File

@@ -194,9 +194,13 @@ static struct ast_frame *aopen_handle_escape(struct ast_modem_pvt *p, char esc)
ast_log(LOG_DEBUG, "Escaped character '%c'\n", esc);
switch(esc) {
case 'R': /* Pseudo ring */
p->fr.frametype = AST_FRAME_CONTROL;
p->fr.subclass = AST_CONTROL_RING;
return &p->fr;
case 'X': /* Pseudo connect */
p->fr.frametype = AST_FRAME_CONTROL;
p->fr.subclass = AST_CONTROL_ANSWER;
p->fr.subclass = AST_CONTROL_RING;
if (p->owner)
p->owner->state = AST_STATE_UP;
if (aopen_startrec(p))
@@ -255,11 +259,14 @@ static struct ast_frame *aopen_read(struct ast_modem_pvt *p)
/* If we're in immediate mode, reply now */
if (p->mode == MODEM_MODE_IMMEDIATE)
return aopen_handle_escape(p, 'X');
}
} else
if (!strcasecmp(result, "BUSY")) {
/* Same as a busy signal */
return aopen_handle_escape(p, 'b');
}
} else
if (!strcasecmp(result, "RING")) {
return aopen_handle_escape(p, 'R');
} else
if (!strcasecmp(result, "NO DIALTONE")) {
/* There's no dialtone, so the line isn't working */
ast_log(LOG_WARNING, "Device '%s' lacking dialtone\n", p->dev);