[Asterisk-code-review] chan ooh323: fix ooManualProgress/ooManualRingback on ooh323... (asterisk[master])

[Alexander Anikin]

Alexander Anikin has uploaded this change for review. ( https://gerrit.asterisk.org/8848


Change subject: chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on
......................................................................

chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on

Call ooManualProgress/Ringback outside of ast_debug function
when ooh323 debugging is on

ASTERISK-27812 #close
ASTERISK-26893 #close
Reported by: Dimos, Marco Giordani

Change-Id: I5873762e4f05824e7b6e94a19dd4eb56adbbbb79
---
M addons/chan_ooh323.c
1 file changed, 5 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/48/8848/1

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index ffdbf67..bcec8e4 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -1281,7 +1281,7 @@
 
 	struct ooh323_pvt *p = (struct ooh323_pvt *) ast_channel_tech_pvt(ast);
 	char *callToken = (char *)NULL;
-	int res = -1;
+	int res = -1, rres;
 
 	if (!p) return -1;
 
@@ -1328,11 +1328,9 @@
 	case AST_CONTROL_PROGRESS:
 		if (ast_channel_state(ast) != AST_STATE_UP) {
 	    		if (!p->progsent) {
+				rres = ooManualProgress(callToken);
 	     			if (gH323Debug) {
-					ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken,
-             				ooManualProgress(callToken));
-				} else {
-	     				ooManualProgress(callToken);
+					ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken, rres);
 				}
 	     			p->progsent = 1;
 	    		}
@@ -1341,12 +1339,9 @@
       case AST_CONTROL_RINGING:
 		if (ast_channel_state(ast) == AST_STATE_RING || ast_channel_state(ast) == AST_STATE_RINGING) {
 			if (!p->alertsent) {
+				rres = ooManualRingback(callToken);
 				if (gH323Debug) {
-					ast_debug(1, "Sending manual ringback for %s, res = %u\n",
-						callToken,
-						ooManualRingback(callToken));
-				} else {
-					ooManualRingback(callToken);
+					ast_debug(1, "Sending manual ringback for %s, res = %u\n", callToken, rres);
 				}
 				p->alertsent = 1;
 			}

-- 
To view, visit https://gerrit.asterisk.org/8848
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5873762e4f05824e7b6e94a19dd4eb56adbbbb79
Gerrit-Change-Number: 8848
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Anikin <may213 at yandex.ru>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180420/a888b214/attachment.html>