<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8850">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on<br><br>Call ooManualProgress/Ringback outside of ast_debug function<br>when ooh323 debugging is on<br><br>ASTERISK-27812 #close<br>ASTERISK-26893 #close<br>Reported by: Dimos, Marco Giordani<br><br>Change-Id: I5873762e4f05824e7b6e94a19dd4eb56adbbbb79<br>---<br>M addons/chan_ooh323.c<br>1 file changed, 5 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c<br>index 91f6e8f..3d684ed 100644<br>--- a/addons/chan_ooh323.c<br>+++ b/addons/chan_ooh323.c<br>@@ -1281,7 +1281,7 @@<br> <br>     struct ooh323_pvt *p = (struct ooh323_pvt *) ast_channel_tech_pvt(ast);<br>       char *callToken = (char *)NULL;<br>-      int res = -1;<br>+        int res = -1, rres;<br> <br>        if (!p) return -1;<br> <br>@@ -1328,11 +1328,9 @@<br>         case AST_CONTROL_PROGRESS:<br>            if (ast_channel_state(ast) != AST_STATE_UP) {<br>                         if (!p->progsent) {<br>+                               rres = ooManualProgress(callToken);<br>                           if (gH323Debug) {<br>-                                    ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken,<br>-                                      ooManualProgress(callToken));<br>-                                } else {<br>-                                     ooManualProgress(callToken);<br>+                                 ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken, rres);<br>                                }<br>                             p->progsent = 1;<br>                   }<br>@@ -1341,12 +1339,9 @@<br>       case AST_CONTROL_RINGING:<br>           if (ast_channel_state(ast) == AST_STATE_RING || ast_channel_state(ast) == AST_STATE_RINGING) {<br>                        if (!p->alertsent) {<br>+                              rres = ooManualRingback(callToken);<br>                           if (gH323Debug) {<br>-                                    ast_debug(1, "Sending manual ringback for %s, res = %u\n",<br>-                                         callToken,<br>-                                           ooManualRingback(callToken));<br>-                                } else {<br>-                                     ooManualRingback(callToken);<br>+                                 ast_debug(1, "Sending manual ringback for %s, res = %u\n", callToken, rres);<br>                                }<br>                             p->alertsent = 1;<br>                  }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8850">change 8850</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8850"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5873762e4f05824e7b6e94a19dd4eb56adbbbb79 </div>
<div style="display:none"> Gerrit-Change-Number: 8850 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Anikin <may213@yandex.ru> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>