<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6199">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; Verified
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_transport_management.c: Rename some variables.<br><br>* Use monitored instead of the misleading keepalive name.<br><br>Change-Id: I9e5bcbb4ab2b82d49bcd0f06dfe85d15e0b552b6<br>---<br>M res/res_pjsip_transport_management.c<br>1 file changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/res_pjsip_transport_management.c b/res/res_pjsip_transport_management.c<br>index 3e129dc..86c53ca 100644<br>--- a/res/res_pjsip_transport_management.c<br>+++ b/res/res_pjsip_transport_management.c<br>@@ -33,7 +33,7 @@<br> #include "asterisk/module.h"<br> #include "asterisk/astobj2.h"<br> <br>-/*! \brief Number of buckets for keepalive transports */<br>+/*! \brief Number of buckets for monitored transports */<br> #define TRANSPORTS_BUCKETS 53<br> <br> #define IDLE_TIMEOUT (pjsip_cfg()->tsx.td)<br>@@ -114,7 +114,7 @@<br> <br> static int idle_sched_cb(const void *data)<br> {<br>-        struct monitored_transport *keepalive = (struct monitored_transport *) data;<br>+ struct monitored_transport *monitored = (struct monitored_transport *) data;<br> <br>       if (!pj_thread_is_registered()) {<br>             pj_thread_t *thread;<br>@@ -123,7 +123,7 @@<br>             desc = ast_threadstorage_get(&desc_storage, sizeof(pj_thread_desc));<br>              if (!desc) {<br>                  ast_log(LOG_ERROR, "Could not get thread desc from thread-local storage.\n");<br>-                      ao2_ref(keepalive, -1);<br>+                      ao2_ref(monitored, -1);<br>                       return 0;<br>             }<br> <br>@@ -132,22 +132,22 @@<br>           pj_thread_register("Transport Monitor", *desc, &thread);<br>        }<br> <br>- if (!keepalive->sip_received) {<br>+   if (!monitored->sip_received) {<br>            ast_log(LOG_NOTICE, "Shutting down transport '%s' since no request was received in %d seconds\n",<br>-                          keepalive->transport->info, IDLE_TIMEOUT / 1000);<br>-              pjsip_transport_shutdown(keepalive->transport);<br>+                   monitored->transport->info, IDLE_TIMEOUT / 1000);<br>+              pjsip_transport_shutdown(monitored->transport);<br>    }<br> <br>- ao2_ref(keepalive, -1);<br>+      ao2_ref(monitored, -1);<br>       return 0;<br> }<br> <br> /*! \brief Destructor for keepalive transport */<br> static void monitored_transport_destroy(void *obj)<br> {<br>- struct monitored_transport *keepalive = obj;<br>+ struct monitored_transport *monitored = obj;<br> <br>-      pjsip_transport_dec_ref(keepalive->transport);<br>+    pjsip_transport_dec_ref(monitored->transport);<br> }<br> <br> /*! \brief Callback invoked when transport changes occur */<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6199">change 6199</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/6199"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9e5bcbb4ab2b82d49bcd0f06dfe85d15e0b552b6 </div>
<div style="display:none"> Gerrit-Change-Number: 6199 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </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>