kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 18:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve the indication currently playing on a channel when a masquerade operation happens. (issue #BE-88)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@90548 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-12-03 18:40:56 +00:00
parent 90edaee7dd
commit b18d1bdd1a
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cleancount
View File

@@ -1 +1 @@
29 30

2
include/asterisk/channel.h
View File

@@ -437,6 +437,8 @@ struct ast_channel {
unsigned int emulate_dtmf_duration; /*!< Number of ms left to emulate DTMF for */ unsigned int emulate_dtmf_duration; /*!< Number of ms left to emulate DTMF for */
struct timeval dtmf_tv; /*!< The time that an in process digit began, or the last digit ended */ struct timeval dtmf_tv; /*!< The time that an in process digit began, or the last digit ended */
int visible_indication; /*!< Indication currently playing on the channel */
/*! \brief Data stores on the channel */ /*! \brief Data stores on the channel */
AST_LIST_HEAD_NOLOCK(datastores, ast_datastore) datastores; AST_LIST_HEAD_NOLOCK(datastores, ast_datastore) datastores;
}; };

10
main/channel.c
View File

@@ -1817,6 +1817,7 @@ int ast_answer(struct ast_channel *chan)
default: default:
break; break;
} }
chan->visible_indication = 0;
ast_channel_unlock(chan); ast_channel_unlock(chan);
return res; return res;
} }
@@ -2608,6 +2609,7 @@ int ast_indicate_data(struct ast_channel *chan, int condition, const void *data,
ast_log(LOG_DEBUG, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition); ast_log(LOG_DEBUG, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition);
ast_playtones_start(chan,0,ts->data, 1); ast_playtones_start(chan,0,ts->data, 1);
res = 0; res = 0;
chan->visible_indication = condition;
} else if (condition == AST_CONTROL_PROGRESS) { } else if (condition == AST_CONTROL_PROGRESS) {
/* ast_playtones_stop(chan); */ /* ast_playtones_stop(chan); */
} else if (condition == AST_CONTROL_PROCEEDING) { } else if (condition == AST_CONTROL_PROCEEDING) {
@@ -2624,7 +2626,9 @@ int ast_indicate_data(struct ast_channel *chan, int condition, const void *data,
res = -1; res = -1;
} }
} }
} } else
chan->visible_indication = condition;
return res; return res;
} }
@@ -3837,6 +3841,10 @@ int ast_do_masquerade(struct ast_channel *original)
} else } else
ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)! Bad things may happen.\n", ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)! Bad things may happen.\n",
original->tech->type, original->name); original->tech->type, original->name);
/* If an indication is currently playing maintain it on the channel that is taking the place of original */
if (original->visible_indication)
ast_indicate(original, original->visible_indication);
/* Now, at this point, the "clone" channel is totally F'd up. We mark it as /* Now, at this point, the "clone" channel is totally F'd up. We mark it as
a zombie so nothing tries to touch it. If it's already been marked as a a zombie so nothing tries to touch it. If it's already been marked as a