From: Automerge script Date: Fri, 10 Aug 2012 17:23:50 +0000 (+0000) Subject: Merged revisions 371090 via svnmerge from X-Git-Tag: 10.9.0-digiumphones-rc1~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba79302dad464d4fba4e234decef2604795919f7;p=thirdparty%2Fasterisk.git Merged revisions 371090 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ................ r371090 | may | 2012-08-10 11:46:38 -0500 (Fri, 10 Aug 2012) | 12 lines remove ALREADYGONE flag on ooh323 call data by ooh323_indicate (CONGESTION/BUSY) due to call hasn't gone there really. This indication arrive from asterisk core not h.323 stack (closes issue ASTERISK-19308) Reported by: Dmitry Melekhov Patches: ASTERISK-19308.patch ........ Merged revisions 371089 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@371112 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 069e14a2ec..e68e4b49de 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -1231,13 +1231,11 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d case AST_CONTROL_CONGESTION: if (!ast_test_flag(p, H323_ALREADYGONE)) { ooHangCall(callToken, OO_REASON_LOCAL_CONGESTED, AST_CAUSE_SWITCH_CONGESTION); - ast_set_flag(p, H323_ALREADYGONE); } break; case AST_CONTROL_BUSY: if (!ast_test_flag(p, H323_ALREADYGONE)) { ooHangCall(callToken, OO_REASON_LOCAL_BUSY, AST_CAUSE_USER_BUSY); - ast_set_flag(p, H323_ALREADYGONE); } break; case AST_CONTROL_HOLD: