From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 19 Apr 2006 15:15:03 +0000 (+0000)
Subject: extract a common condition.
X-Git-Tag: 1.4.0-beta1~1871
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bdcaa4849b26167cce548e9d1b0da0d2719b1fc;p=thirdparty%2Fasterisk.git

extract a common condition.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index c1a790b660..c6e2c64113 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -608,21 +608,21 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
 					if (option_debug)
 						ast_log(LOG_DEBUG, "Dunno what to do with control type %d\n", f->subclass);
 				}
-			} else if (single && (f->frametype == AST_FRAME_VOICE) && 
-						!(ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK))) {
-				if (ast_write(in, f)) 
-					ast_log(LOG_WARNING, "Unable to forward voice frame\n");
-			} else if (single && (f->frametype == AST_FRAME_IMAGE) && 
-						!(ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK))) {
-				if (ast_write(in, f))
-					ast_log(LOG_WARNING, "Unable to forward image\n");
-			} else if (single && (f->frametype == AST_FRAME_TEXT) && 
-						!(ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK))) {
-				if (ast_write(in, f))
-					ast_log(LOG_WARNING, "Unable to send text\n");
-			} else if (single && (f->frametype == AST_FRAME_HTML) && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML)) {
-				if(ast_channel_sendhtml(in, f->subclass, f->data, f->datalen) == -1)
-					ast_log(LOG_WARNING, "Unable to send URL\n");
+			} else if (single) {
+				/* XXX are we sure the logic is correct ? or we should just switch on f->frametype ? */
+				if (f->frametype == AST_FRAME_VOICE && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+					if (ast_write(in, f)) 
+						ast_log(LOG_WARNING, "Unable to forward voice frame\n");
+				} else if (f->frametype == AST_FRAME_IMAGE && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+					if (ast_write(in, f))
+						ast_log(LOG_WARNING, "Unable to forward image\n");
+				} else if (f->frametype == AST_FRAME_TEXT && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+					if (ast_write(in, f))
+						ast_log(LOG_WARNING, "Unable to send text\n");
+				} else if (f->frametype == AST_FRAME_HTML && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML)) {
+					if (ast_channel_sendhtml(in, f->subclass, f->data, f->datalen) == -1)
+						ast_log(LOG_WARNING, "Unable to send URL\n");
+				}
 			}
 			ast_frfree(f);
 		} /* end for */