From: Richard Mudgett Date: Thu, 2 Jul 2009 22:05:07 +0000 (+0000) Subject: Merged revisions 204835 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~90 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ed4d287e77d8dff0fecbe13cb404fea782e8eb;p=thirdparty%2Fasterisk.git Merged revisions 204835 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r204835 | rmudgett | 2009-07-02 17:01:28 -0500 (Thu, 02 Jul 2009) | 17 lines Merged revisions 204834 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r204834 | rmudgett | 2009-07-02 16:59:43 -0500 (Thu, 02 Jul 2009) | 10 lines Removed confusing warning message "Got Busy in Connected State" If an incoming mISDN call is answered with the Answer application and a subsequent Dial gets a busy endpoint then it is valid for that already connected channel to get the busy indication. Asterisk will play the busy tones until the dialplan plays something else or hangs up the call. (closes issue #11974) Reported by: fvdb ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@204837 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index ea8de87bbd..7c203b7adf 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2645,8 +2645,6 @@ static int misdn_indication(struct ast_channel *ast, int cond, const void *data, if (p->state != MISDN_CONNECTED) { start_bc_tones(p); misdn_lib_send_event( p->bc, EVENT_DISCONNECT); - } else { - chan_misdn_log(-1, p->bc->port, " --> !! Got Busy in Connected State !?! ast:%s\n", ast->name); } return -1; case AST_CONTROL_RING: