kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-19 13:25:59 +00:00
parent 4cd913f575
commit a06cd4d098
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_misdn.c
View File

@@ -2304,8 +2304,14 @@ static int misdn_hangup(struct ast_channel *ast)
chan_misdn_log(2, bc->port, " --> state:%s\n", misdn_get_ch_state(p)); chan_misdn_log(2, bc->port, " --> state:%s\n", misdn_get_ch_state(p));
switch (p->state) { switch (p->state) {
case MISDN_INCOMING_SETUP:
case MISDN_CALLING: case MISDN_CALLING:
case MISDN_INCOMING_SETUP:
/* This is the only place in misdn_hangup, where we
* can call release_chan, else it might create lot's of trouble
* */
ast_log(LOG_NOTICE, "release channel, in CALLING/INCOMING_SETUP state.. no other events happened\n");
release_chan(bc);
p->state=MISDN_CLEANING; p->state=MISDN_CLEANING;
misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE); misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE);
break; break;

4
res/res_features.c
View File

@@ -383,12 +383,12 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con); ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con);
} }
} }
if (peer)
ast_say_digits(peer, pu->parkingnum, "", peer->language);
if (con) { if (con) {
snprintf(exten, sizeof(exten), "%d", x); snprintf(exten, sizeof(exten), "%d", x);
ast_add_extension2(con, 1, exten, 1, NULL, NULL, parkedcall, strdup(exten), FREE, registrar); ast_add_extension2(con, 1, exten, 1, NULL, NULL, parkedcall, strdup(exten), FREE, registrar);
} }
if (peer)
ast_say_digits(peer, pu->parkingnum, "", peer->language);
if (pu->notquiteyet) { if (pu->notquiteyet) {
/* Wake up parking thread if we're really done */ /* Wake up parking thread if we're really done */
ast_moh_start(pu->chan, NULL); ast_moh_start(pu->chan, NULL);