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

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 91f6e8fa9b51eeb6bec8d9008f5b5323fb569d3e..3d684ed470358c3716a2b6e843ff2a072df17a33 100644 (file)
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -1281,7 +1281,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
 
        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 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
        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 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
       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;
                        }