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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_sip.c: chan_sip unstable with TLS after asterisk start or reloads<br><br>Fixes random asterisk crash on start or reload with TLS phones.<br><br>ASTERISK-28034 #close<br>Reported-by: David Hajek<br><br>Change-Id: I2a859f97dc80c348e2fa56e918214ee29521c4ac<br>---<br>M channels/chan_sip.c<br>1 file changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index e375bfe..5563a9a 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -2617,7 +2617,8 @@</span><br><span> </span><br><span>      ao2_lock(tcptls_session);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (!(th = ao2_t_find(threadt, &tmp, OBJ_POINTER, "ao2_find, getting sip_threadinfo in tcp helper thread")) ||</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!tcptls_session->stream ||</span><br><span style="color: hsl(120, 100%, 40%);">+             !(th = ao2_t_find(threadt, &tmp, OBJ_POINTER, "ao2_find, getting sip_threadinfo in tcp helper thread")) ||</span><br><span>             !(packet = ao2_alloc(sizeof(*packet), tcptls_packet_destructor)) ||</span><br><span>          !(packet->data = ast_str_create(len))) {</span><br><span>          goto tcptls_write_setup_error;</span><br><span>@@ -3139,7 +3140,7 @@</span><br><span> </span><br><span>                   if (read(me->alert_pipe[0], &alert, sizeof(alert)) == -1) {</span><br><span>                           ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">-                           continue;</span><br><span style="color: hsl(120, 100%, 40%);">+                             goto cleanup;</span><br><span>                        }</span><br><span> </span><br><span>                        switch (alert) {</span><br><span>@@ -3157,10 +3158,13 @@</span><br><span>                                           ast_log(LOG_WARNING, "Failure to write to tcp/tls socket\n");</span><br><span>                                      }</span><br><span>                                    ao2_t_ref(packet, -1, "tcptls packet sent, this is no longer needed");</span><br><span style="color: hsl(120, 100%, 40%);">+                              } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                                      goto cleanup;</span><br><span>                                }</span><br><span>                            break;</span><br><span>                       default:</span><br><span>                             ast_log(LOG_ERROR, "Unknown tcptls thread alert '%u'\n", alert);</span><br><span style="color: hsl(120, 100%, 40%);">+                            goto cleanup;</span><br><span>                        }</span><br><span>            }</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10206">change 10206</a>. To unsubscribe, or for help writing mail filters, 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/10206"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2a859f97dc80c348e2fa56e918214ee29521c4ac </div>
<div style="display:none"> Gerrit-Change-Number: 10206 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: David Hajek <david.hajek@daktela.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>