<p>Holger Hans Peter Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15306">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjsip: For the response priority to the handler<br><br>Some handlers register for multiple priorities and can have a different<br>behavior.<br><br>ASTERISK-29105<br><br>Change-Id: I0232ee602ee1daba0c563a75494a32b7e77222c4<br>---<br>M channels/chan_pjsip.c<br>M include/asterisk/res_pjsip_session.h<br>M res/res_pjsip_caller_id.c<br>M res/res_pjsip_diversion.c<br>M res/res_pjsip_nat.c<br>M res/res_pjsip_rfc3326.c<br>M res/res_pjsip_session.c<br>7 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/06/15306/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c</span><br><span>index bb04d73..81d4388 100644</span><br><span>--- a/channels/chan_pjsip.c</span><br><span>+++ b/channels/chan_pjsip.c</span><br><span>@@ -136,7 +136,7 @@</span><br><span> static void chan_pjsip_session_begin(struct ast_sip_session *session);</span><br><span> static void chan_pjsip_session_end(struct ast_sip_session *session);</span><br><span> static int chan_pjsip_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata);</span><br><span style="color: hsl(0, 100%, 40%);">-static void chan_pjsip_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata);</span><br><span style="color: hsl(120, 100%, 40%);">+static void chan_pjsip_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata, enum ast_sip_session_response_priority prio);</span><br><span> </span><br><span> /*! \brief SIP session supplement structure */</span><br><span> static struct ast_sip_session_supplement chan_pjsip_supplement = {</span><br><span>@@ -3125,7 +3125,7 @@</span><br><span> };</span><br><span> </span><br><span> /*! \brief Function called when a response is received on the session */</span><br><span style="color: hsl(0, 100%, 40%);">-static void chan_pjsip_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata)</span><br><span style="color: hsl(120, 100%, 40%);">+static void chan_pjsip_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata, enum ast_sip_session_response_priority prio)</span><br><span> {</span><br><span>      struct pjsip_status_line status = rdata->msg_info.msg->line.status;</span><br><span>    struct ast_control_pvt_cause_code *cause_code;</span><br><span>diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h</span><br><span>index 54c704f..f95c64b 100644</span><br><span>--- a/include/asterisk/res_pjsip_session.h</span><br><span>+++ b/include/asterisk/res_pjsip_session.h</span><br><span>@@ -338,7 +338,7 @@</span><br><span>     * \note</span><br><span>      * There is no guarantee that a channel will be present on the session when this is called.</span><br><span>   */</span><br><span style="color: hsl(0, 100%, 40%);">-     void (*incoming_response)(struct ast_sip_session *session, struct pjsip_rx_data *rdata);</span><br><span style="color: hsl(120, 100%, 40%);">+      void (*incoming_response)(struct ast_sip_session *session, struct pjsip_rx_data *rdata, enum ast_sip_session_response_priority response_priority);</span><br><span>   /*!</span><br><span>   * \brief Called on an outgoing SIP request</span><br><span>   * This method is always called from a SIP servant thread.</span><br><span>diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c</span><br><span>index 0b16665..00ee9ba 100644</span><br><span>--- a/res/res_pjsip_caller_id.c</span><br><span>+++ b/res/res_pjsip_caller_id.c</span><br><span>@@ -406,7 +406,7 @@</span><br><span>  * \param session The session on which communication is happening</span><br><span>  * \param rdata The incoming INVITE response</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void caller_id_incoming_response(struct ast_sip_session *session, pjsip_rx_data *rdata)</span><br><span style="color: hsl(120, 100%, 40%);">+static void caller_id_incoming_response(struct ast_sip_session *session, pjsip_rx_data *rdata, enum ast_sip_session_response_priority prio)</span><br><span> {</span><br><span>        if (!session->channel) {</span><br><span>          return;</span><br><span>diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c</span><br><span>index 24d1781..b084761 100644</span><br><span>--- a/res/res_pjsip_diversion.c</span><br><span>+++ b/res/res_pjsip_diversion.c</span><br><span>@@ -433,7 +433,7 @@</span><br><span>       return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void diversion_incoming_response(struct ast_sip_session *session, pjsip_rx_data *rdata)</span><br><span style="color: hsl(120, 100%, 40%);">+static void diversion_incoming_response(struct ast_sip_session *session, pjsip_rx_data *rdata, enum ast_sip_session_response_priority prio)</span><br><span> {</span><br><span>   static const pj_str_t contact_name = { "Contact", 7 };</span><br><span>     static const pj_str_t contact_name_s = { "m", 1 };</span><br><span>diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c</span><br><span>index 3d6f25d..419382e 100644</span><br><span>--- a/res/res_pjsip_nat.c</span><br><span>+++ b/res/res_pjsip_nat.c</span><br><span>@@ -493,7 +493,7 @@</span><br><span> }</span><br><span> </span><br><span> /*! \brief Function called when an INVITE response comes in */</span><br><span style="color: hsl(0, 100%, 40%);">-static void nat_incoming_invite_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata)</span><br><span style="color: hsl(120, 100%, 40%);">+static void nat_incoming_invite_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata, enum ast_sip_session_response_priority prio)</span><br><span> {</span><br><span>       handle_rx_message(session->endpoint, rdata);</span><br><span> }</span><br><span>diff --git a/res/res_pjsip_rfc3326.c b/res/res_pjsip_rfc3326.c</span><br><span>index 6a02641..7e64edc 100644</span><br><span>--- a/res/res_pjsip_rfc3326.c</span><br><span>+++ b/res/res_pjsip_rfc3326.c</span><br><span>@@ -80,7 +80,7 @@</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void rfc3326_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata)</span><br><span style="color: hsl(120, 100%, 40%);">+static void rfc3326_incoming_response(struct ast_sip_session *session, struct pjsip_rx_data *rdata, enum ast_sip_session_response_priority prio)</span><br><span> {</span><br><span>         struct pjsip_status_line status = rdata->msg_info.msg->line.status;</span><br><span> </span><br><span>diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c</span><br><span>index 82ef2aa..a6f52a2 100644</span><br><span>--- a/res/res_pjsip_session.c</span><br><span>+++ b/res/res_pjsip_session.c</span><br><span>@@ -4487,7 +4487,7 @@</span><br><span>                       continue;</span><br><span>            }</span><br><span>            if (supplement->incoming_response && does_method_match(&rdata->msg_info.cseq->method.name, supplement->method)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                       supplement->incoming_response(session, rdata);</span><br><span style="color: hsl(120, 100%, 40%);">+                     supplement->incoming_response(session, rdata, response_priority);</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/c/asterisk/+/15306">change 15306</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/c/asterisk/+/15306"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I0232ee602ee1daba0c563a75494a32b7e77222c4 </div>
<div style="display:none"> Gerrit-Change-Number: 15306 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Hans Peter Freyther <automatic@freyther.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>