diff options
author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-02 08:41:08 +0000 |
---|---|---|
committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-02 08:41:08 +0000 |
commit | 43635bd7dde5fb5b9c54165b14219a40e702bb11 (patch) | |
tree | 2c2f9930e195a355df726f0e7ac5e715dc1b49f7 /channels/chan_misdn.c | |
parent | 1aed11a32ad14459c5f4c9aac6df923995d46fb2 (diff) |
Merged revisions 72585 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r72585 | crichter | 2007-06-29 15:08:26 +0200 (Fr, 29 Jun 2007) | 1 line
check if the bchannel stack id is already used, if so don't use it a second time. Also added a release_chan lock, so that the same chan_list object cannot be freed twice. chan_misdn does not crash anymore on heavy load with these changes.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@72852 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r-- | channels/chan_misdn.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 78ff25873..4d37c7136 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -110,6 +110,10 @@ of data. */ int misdn_jb_empty(struct misdn_jb *jb, char *data, int len); +/* BEGIN: chan_misdn.h */ + +ast_mutex_t release_lock; + enum misdn_chan_state { MISDN_NOTHING=0, /*!< at beginning */ MISDN_WAITING4DIGS, /*!< when waiting for infos */ @@ -2424,11 +2428,13 @@ static int misdn_hangup(struct ast_channel *ast) /* between request and call */ ast_log(LOG_DEBUG, "State Reserved (or nothing) => chanIsAvail\n"); MISDN_ASTERISK_TECH_PVT(ast)=NULL; - + + ast_mutex_lock(&release_lock); cl_dequeue_chan(&cl_te, p); close(p->pipe[0]); close(p->pipe[1]); free(p); + ast_mutex_unlock(&release_lock); if (bc) misdn_lib_release(bc); @@ -3516,10 +3522,13 @@ static void hangup_chan(struct chan_list *ch) /** Isdn asks us to release channel, pendant to misdn_hangup **/ static void release_chan(struct misdn_bchannel *bc) { struct ast_channel *ast=NULL; + + ast_mutex_lock(&release_lock); { struct chan_list *ch=find_chan_by_bc(cl_te, bc); if (!ch) { chan_misdn_log(1, bc->port, "release_chan: Ch not found!\n"); + ast_mutex_unlock(&release_lock); return; } @@ -3578,6 +3587,8 @@ static void release_chan(struct misdn_bchannel *bc) { /* chan is already cleaned, so exiting */ } } + + ast_mutex_unlock(&release_lock); } /*** release end **/ @@ -4917,6 +4928,7 @@ static int load_module(void) } ast_mutex_init(&cl_te_lock); + ast_mutex_init(&release_lock); misdn_cfg_update_ptp(); misdn_cfg_get_ports_string(ports); |