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

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Martin Pycko
2003-11-21 18:24:49 +00:00
parent e6e02ac002
commit dc17a4c1c8
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channels/chan_zap.c
View File

@@ -3857,6 +3857,8 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
i->isidlecall = 0; i->isidlecall = 0;
i->alreadyhungup = 0; i->alreadyhungup = 0;
#endif #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 */ /* Assure there is no confmute on this channel */
zt_confmute(i, 0); zt_confmute(i, 0);
if (startpbx) { if (startpbx) {
@@ -6814,6 +6816,10 @@ static int action_transfer(struct mansession *s, struct message *m)
return 0; return 0;
} }
p = find_channel(atoi(channel)); 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) { if (!p) {
astman_send_error(s, m, "No such channel"); astman_send_error(s, m, "No such channel");
return 0; return 0;
@@ -6832,6 +6838,10 @@ static int action_transferhangup(struct mansession *s, struct message *m)
return 0; return 0;
} }
p = find_channel(atoi(channel)); 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) { if (!p) {
astman_send_error(s, m, "No such channel"); astman_send_error(s, m, "No such channel");
return 0; return 0;
@@ -6856,6 +6866,15 @@ static int action_zapdialoffhook(struct mansession *s, struct message *m)
return 0; return 0;
} }
p = find_channel(atoi(channel)); 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) { if (!p) {
astman_send_error(s, m, "No such channel"); astman_send_error(s, m, "No such channel");
return 0; return 0;