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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Patch for res_pjsip_* module load/reload crash<br><br>The session_supplements for the pjsip makes crashes when the module<br>load/unload.<br><br>ASTERISK-28157<br><br>Change-Id: I5b82be3a75d702cf1933d8d1417f44aa10ad1029<br>---<br>M include/asterisk/res_pjsip_session.h<br>M res/res_pjsip/pjsip_session.c<br>2 files changed, 15 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h</span><br><span>index 0c2b1e3..e2d4fcd 100644</span><br><span>--- a/include/asterisk/res_pjsip_session.h</span><br><span>+++ b/include/asterisk/res_pjsip_session.h</span><br><span>@@ -533,10 +533,14 @@</span><br><span>  * a module could reject an incoming request if desired.</span><br><span>  *</span><br><span>  * \param supplement The supplement to register</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param module Referenced module(NULL safe)</span><br><span>  * \retval 0 Success</span><br><span>  * \retval -1 Failure</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-int ast_sip_session_register_supplement(struct ast_sip_session_supplement *supplement);</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_sip_session_register_supplement_with_module(struct ast_module *module, struct ast_sip_session_supplement *supplement);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define ast_sip_session_register_supplement(supplement) \</span><br><span style="color: hsl(120, 100%, 40%);">+               ast_sip_session_register_supplement_with_module(ast_module_info->self, supplement)</span><br><span> </span><br><span> /*!</span><br><span>  * \brief Unregister a an supplement to SIP session processing</span><br><span>diff --git a/res/res_pjsip/pjsip_session.c b/res/res_pjsip/pjsip_session.c</span><br><span>index 074ec4e..2002bbd 100644</span><br><span>--- a/res/res_pjsip/pjsip_session.c</span><br><span>+++ b/res/res_pjsip/pjsip_session.c</span><br><span>@@ -56,10 +56,11 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int ast_sip_session_register_supplement(struct ast_sip_session_supplement *supplement)</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_sip_session_register_supplement_with_module(struct ast_module *module, struct ast_sip_session_supplement *supplement)</span><br><span> {</span><br><span>         internal_sip_session_register_supplement(supplement);</span><br><span>        internal_res_pjsip_ref();</span><br><span style="color: hsl(120, 100%, 40%);">+     ast_module_shutdown_ref(module);</span><br><span> </span><br><span>         return 0;</span><br><span> }</span><br><span>@@ -118,3 +119,11 @@</span><br><span> </span><br><span>    return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* This stub is for ABI compatibility. */</span><br><span style="color: hsl(120, 100%, 40%);">+#undef ast_sip_session_register_supplement</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_sip_session_register_supplement(struct ast_sip_session_supplement *supplement);</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_sip_session_register_supplement(struct ast_sip_session_supplement *supplement)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   return ast_sip_session_register_supplement_with_module(NULL, supplement);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10716">change 10716</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/10716"/><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: I5b82be3a75d702cf1933d8d1417f44aa10ad1029 </div>
<div style="display:none"> Gerrit-Change-Number: 10716 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>