diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 22:59:55 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 22:59:55 +0000 |
| commit | 8cea0763f195bf88e3842ed09674b7d1a7f09c40 (patch) | |
| tree | b92765da4114be19e3a3b4dcbe2a54c1a4ad8084 /channels/chan_phone.c | |
| parent | 15e3b6e0c04eaf9702935829af9dc2e7e8ec0707 (diff) | |
Merged revisions 51788 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51788 | file | 2007-01-23 17:46:31 -0500 (Tue, 23 Jan 2007) | 2 lines
Update channel drivers to use module referencing so that unloading them while in use will not result in crashes. (issue #8897 reported by junky)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@51801 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
| -rw-r--r-- | channels/chan_phone.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 26e692127..8312fabf0 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -385,6 +385,7 @@ static int phone_hangup(struct ast_channel *ast) p->dialtone = 0; memset(p->ext, 0, sizeof(p->ext)); ((struct phone_pvt *)(ast->tech_pvt))->owner = NULL; + ast_module_unref(ast_module_info->self); if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Hungup '%s'\n", ast->name); ast->tech_pvt = NULL; @@ -907,6 +908,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *conte tmp->cid.cid_name = ast_strdup(i->cid_name); i->owner = tmp; + ast_module_ref(ast_module_info->self); if (state != AST_STATE_DOWN) { if (state == AST_STATE_RING) { ioctl(tmp->fds[0], PHONE_RINGBACK); @@ -987,6 +989,7 @@ static void phone_check_exception(struct phone_pvt *i) if (i->mode == MODE_IMMEDIATE) { phone_new(i, AST_STATE_RING, i->context); } else if (i->mode == MODE_DIALTONE) { + ast_module_ref(ast_module_info->self); /* Reset the extension */ i->ext[0] = '\0'; /* Play the dialtone */ @@ -996,6 +999,7 @@ static void phone_check_exception(struct phone_pvt *i) ioctl(i->fd, PHONE_PLAY_START); i->lastformat = -1; } else if (i->mode == MODE_SIGMA) { + ast_module_ref(ast_module_info->self); /* Reset the extension */ i->ext[0] = '\0'; /* Play the dialtone */ @@ -1003,6 +1007,8 @@ static void phone_check_exception(struct phone_pvt *i) ioctl(i->fd, PHONE_DIALTONE); } } else { + if (i->dialtone) + ast_module_unref(ast_module_info->self); memset(i->ext, 0, sizeof(i->ext)); if (i->cpt) { |