diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 17:59:43 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 17:59:43 +0000 |
| commit | 7143b0381c4e95b6081e0e89ae52bdda859f00f1 (patch) | |
| tree | 69e9cc7da10351b80147ccc4bfd5ee295cb92ade /channels | |
| parent | 90d1abc00bece97d353a0f7b735ec67c8895ef4a (diff) | |
Merged revisions 121857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r121857 | mattf | 2008-06-11 12:50:17 -0500 (Wed, 11 Jun 2008) | 1 line
Make sure we hangup any calls we have and NULL out the ss7call value when we get a reset circuit message. Fixes crash bug
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121858 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index e4bdd34da..289993b2c 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9446,11 +9446,18 @@ static void *ss7_linkset(void *data) } p = linkset->pvts[chanpos]; ast_mutex_lock(&p->lock); + p->inservice = 1; p->remotelyblocked = 0; dpc = p->dpc; isup_set_call_dpc(e->rsc.call, dpc); + if (p->ss7call) + p->ss7call = NULL; + if (p->owner) + p->owner->_softhangup |= AST_SOFTHANGUP_DEV; + ast_mutex_unlock(&p->lock); + isup_rlc(ss7, e->rsc.call); break; case ISUP_EVENT_GRS: |