retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

- removed interface lock from capi_read() 

- moved ast_softhangup() out of interface lock
This commit is contained in:
MelwareDE 2005-10-09 14:40:27 +00:00
parent 69f777c23b
commit 65100a1838
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chan_capi.c
View File

@ -93,6 +93,7 @@ static unsigned int capi_counter = 0;
static unsigned long capi_used_controllers = 0;
static char *emptyid = "\0";
static struct ast_channel *chan_to_hangup = NULL;
static struct ast_channel *chan_to_softhangup = NULL;
static char capi_national_prefix[AST_MAX_EXTENSION];
static char capi_international_prefix[AST_MAX_EXTENSION];
@ -1072,11 +1073,8 @@ struct ast_frame *capi_read(struct ast_channel *c)
return NULL;
}
ast_mutex_lock(&i->lock);
if (i->state == CAPI_STATE_ONHOLD) {
i->fr.frametype = AST_FRAME_NULL;
ast_mutex_unlock(&i->lock);
return &i->fr;
}
@ -1101,7 +1099,6 @@ struct ast_frame *capi_read(struct ast_channel *c)
i->fr.mallocd = 0;
if (i->fr.frametype == AST_FRAME_NULL) {
ast_mutex_unlock(&i->lock);
return NULL;
}
if ((i->fr.frametype == AST_FRAME_DTMF) && (i->fr.subclass == 'f')) {
@ -1120,7 +1117,6 @@ struct ast_frame *capi_read(struct ast_channel *c)
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
}
}
ast_mutex_unlock(&i->lock);
return &i->fr;
}
@ -2954,7 +2950,7 @@ static void capi_handle_disconnect_indication(_cmsg *CMSG, unsigned int PLCI, un
(state != CAPI_STATE_DISCONNECTING) && (ast_check_hangup(i->owner) == 0)) {
cc_ast_verbose(1, 0, VERBOSE_PREFIX_3 "%s: soft hangup by capi\n",
i->name);
ast_softhangup(i->owner, AST_SOFTHANGUP_DEV);
chan_to_softhangup = i->owner;
} else {
/* dont ever hangup while hanging up! */
/* ast_log(LOG_NOTICE,"no soft hangup by capi\n"); */
@ -4046,6 +4042,11 @@ static void *do_monitor(void *data)
ast_hangup(chan_to_hangup);
chan_to_hangup = NULL;
}
if (chan_to_softhangup != NULL) {
/* deferred (out of lock) soft-hangup */
ast_softhangup(chan_to_softhangup, AST_SOFTHANGUP_DEV);
chan_to_softhangup = NULL;
}
break;
case 0x1104:
/* CAPI queue is empty */