diff options
author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 17:06:41 +0000 |
---|---|---|
committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 17:06:41 +0000 |
commit | 3bd233b49d32bfbdf330f025ea35c7cec7b5b145 (patch) | |
tree | 55034207f040527910e6f42202acd99c8d0ee4e9 /channels | |
parent | 7347af6efd5556d46826cf29374c01f86fc2c999 (diff) |
Add missing API function to sig_ss7: sig_ss7_fixup().
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@269308 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_dahdi.c | 21 | ||||
-rw-r--r-- | channels/sig_ss7.c | 17 | ||||
-rw-r--r-- | channels/sig_ss7.h | 1 |
3 files changed, 32 insertions, 7 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d054323f5..5df6dae0c 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7074,27 +7074,34 @@ static int dahdi_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct dahdi_pvt *p = newchan->tech_pvt; int x; + ast_mutex_lock(&p->lock); + ast_debug(1, "New owner for channel %d is %s\n", p->channel, newchan->name); if (p->owner == oldchan) { p->owner = newchan; } - for (x = 0; x < 3; x++) + for (x = 0; x < 3; x++) { if (p->subs[x].owner == oldchan) { - if (!x) + if (!x) { dahdi_unlink(NULL, p, 0); + } p->subs[x].owner = newchan; } + } if (analog_lib_handles(p->sig, p->radio, p->oprmode)) { analog_fixup(oldchan, newchan, p->sig_pvt); - } -#ifdef HAVE_PRI - else if (dahdi_sig_pri_lib_handles(p->sig)) { +#if defined(HAVE_PRI) + } else if (dahdi_sig_pri_lib_handles(p->sig)) { sig_pri_fixup(oldchan, newchan, p->sig_pvt); +#endif /* defined(HAVE_PRI) */ +#if defined(HAVE_SS7) + } else if (p->sig == SIG_SS7) { + sig_ss7_fixup(oldchan, newchan, p->sig_pvt); +#endif /* defined(HAVE_SS7) */ } -#endif - update_conf(p); + ast_mutex_unlock(&p->lock); if (newchan->_state == AST_STATE_RINGING) { diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c index f00e813a7..540b08e81 100644 --- a/channels/sig_ss7.c +++ b/channels/sig_ss7.c @@ -1435,6 +1435,23 @@ int sig_ss7_answer(struct sig_ss7_chan *p, struct ast_channel *ast) } /*! + * \brief Fix up a channel: If a channel is consumed, this is called. Basically update any ->owner links. + * \since 1.8 + * + * \param oldchan Old channel pointer to replace. + * \param newchan New channel pointer to set. + * \param pchan Signaling private structure pointer. + * + * \return Nothing + */ +void sig_ss7_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, struct sig_ss7_chan *pchan) +{ + if (pchan->owner == oldchan) { + pchan->owner = newchan; + } +} + +/*! * \brief SS7 answer channel. * \since 1.8 * diff --git a/channels/sig_ss7.h b/channels/sig_ss7.h index 1080f5d8e..be7c1e5e8 100644 --- a/channels/sig_ss7.h +++ b/channels/sig_ss7.h @@ -248,6 +248,7 @@ int sig_ss7_available(struct sig_ss7_chan *p); int sig_ss7_call(struct sig_ss7_chan *p, struct ast_channel *ast, char *rdest); int sig_ss7_hangup(struct sig_ss7_chan *p, struct ast_channel *ast); int sig_ss7_answer(struct sig_ss7_chan *p, struct ast_channel *ast); +void sig_ss7_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, struct sig_ss7_chan *pchan); int sig_ss7_indicate(struct sig_ss7_chan *p, struct ast_channel *chan, int condition, const void *data, size_t datalen); struct ast_channel *sig_ss7_request(struct sig_ss7_chan *p, enum sig_ss7_law law, const struct ast_channel *requestor, int transfercapability); void sig_ss7_chan_delete(struct sig_ss7_chan *doomed); |