Don't crash if ZapHangup, ZapTransfer, ZapDialOffhook are used on the channel that is onhook (idle)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Martin Pycko 22 years ago
parent e6e02ac002
commit dc17a4c1c8

@ -3857,6 +3857,8 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
i->isidlecall = 0;
i->alreadyhungup = 0;
#endif
/* clear the fake event in case we posted one before we had ast_chanenl */
i->fake_event = 0;
/* Assure there is no confmute on this channel */
zt_confmute(i, 0);
if (startpbx) {
@ -6814,6 +6816,10 @@ static int action_transfer(struct mansession *s, struct message *m)
return 0;
}
p = find_channel(atoi(channel));
if (p->owner && p->owner->_state != AST_STATE_UP) {
astman_send_error(s, m, "Channel is on hook");
return 0;
}
if (!p) {
astman_send_error(s, m, "No such channel");
return 0;
@ -6832,6 +6838,10 @@ static int action_transferhangup(struct mansession *s, struct message *m)
return 0;
}
p = find_channel(atoi(channel));
if (p->owner && p->owner->_state != AST_STATE_UP) {
astman_send_error(s, m, "Channel is on hook");
return 0;
}
if (!p) {
astman_send_error(s, m, "No such channel");
return 0;
@ -6856,6 +6866,15 @@ static int action_zapdialoffhook(struct mansession *s, struct message *m)
return 0;
}
p = find_channel(atoi(channel));
if (p->owner) {
if (p->owner->_state != AST_STATE_UP) {
astman_send_error(s, m, "Channel is on hook");
return 0;
}
} else {
astman_send_error(s, m, "Channel does not have it's owner");
return 0;
}
if (!p) {
astman_send_error(s, m, "No such channel");
return 0;

Loading…
Cancel
Save