summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-10-23 11:50:04 +0000
committerMark Spencer <markster@digium.com>2004-10-23 11:50:04 +0000
commit3267c78539fdc306c56cb3e20d121c3ff60f8b4b (patch)
tree736a339d49c2267340c59b566522032ba297624e /channels
parent73831ac046acad463402e09184a6b2c14440a5cb (diff)
Add missing fixup (bug #2667)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rwxr-xr-xchannels/chan_modem.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index a911f41e1..c6a27f1a4 100755
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -510,6 +510,18 @@ static int modem_write(struct ast_channel *ast, struct ast_frame *frame)
return res;
}
+static int modem_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
+{
+ struct ast_modem_pvt *p = newchan->pvt->pvt;
+ast_log(LOG_WARNING, "fixup called\n");
+ if (p->owner!=oldchan) {
+ ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n",oldchan,p->owner);
+ return -1;
+ }
+ p->owner = newchan;
+ return 0;
+}
+
struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
{
struct ast_channel *tmp;
@@ -529,6 +541,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
tmp->pvt->answer = modem_answer;
tmp->pvt->read = modem_read;
tmp->pvt->write = modem_write;
+ tmp->pvt->fixup = modem_fixup;
strncpy(tmp->context, i->context, sizeof(tmp->context)-1);
if (!ast_strlen_zero(i->cid_num))