<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/12991">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; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_pubsub: add endpoint to some warning<br><br>There are some warning messages which are not informative without endpoint:<br>"No registered subscribe handler for event presence.winfo"<br>"No registered publish handler for event presence"<br><br>This patch adds an endpoint name to these messages.<br><br>Change-Id: Ia2811ec226d8a12659b4f9d4d224b48289650827<br>---<br>M res/res_pjsip_pubsub.c<br>1 file changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c</span><br><span>index 955db1d..e26f250 100644</span><br><span>--- a/res/res_pjsip_pubsub.c</span><br><span>+++ b/res/res_pjsip_pubsub.c</span><br><span>@@ -758,7 +758,7 @@</span><br><span>                size_t num_accept, const char *body_type);</span><br><span> </span><br><span> /*! \brief Retrieve a handler using the Event header of an rdata message */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct ast_sip_subscription_handler *subscription_get_handler_from_rdata(pjsip_rx_data *rdata)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct ast_sip_subscription_handler *subscription_get_handler_from_rdata(pjsip_rx_data *rdata, const char *endpoint)</span><br><span> {</span><br><span>         pjsip_event_hdr *event_header;</span><br><span>       char event[32];</span><br><span>@@ -766,14 +766,16 @@</span><br><span> </span><br><span>  event_header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_event_name, rdata->msg_info.msg->hdr.next);</span><br><span>         if (!event_header) {</span><br><span style="color: hsl(0, 100%, 40%);">-            ast_log(LOG_WARNING, "Incoming SUBSCRIBE request with no Event header\n");</span><br><span style="color: hsl(120, 100%, 40%);">+          ast_log(LOG_WARNING, "Incoming SUBSCRIBE request from %s with no Event header\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   endpoint ? endpoint : "Unknown");</span><br><span>          return NULL;</span><br><span>         }</span><br><span>    ast_copy_pj_str(event, &event_header->event_type, sizeof(event));</span><br><span> </span><br><span>         handler = find_sub_handler_for_event_name(event);</span><br><span>    if (!handler) {</span><br><span style="color: hsl(0, 100%, 40%);">-         ast_log(LOG_WARNING, "No registered subscribe handler for event %s\n", event);</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_log(LOG_WARNING, "No registered subscribe handler for event %s from %s\n", event,</span><br><span style="color: hsl(120, 100%, 40%);">+                       endpoint ? endpoint : "Unknown");</span><br><span>  }</span><br><span> </span><br><span>        return handler;</span><br><span>@@ -1549,7 +1551,7 @@</span><br><span>       */</span><br><span>  AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(resource);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      handler = subscription_get_handler_from_rdata(rdata);</span><br><span style="color: hsl(120, 100%, 40%);">+ handler = subscription_get_handler_from_rdata(rdata, persistence->endpoint);</span><br><span>      if (!handler || !handler->notifier) {</span><br><span>             ast_log(LOG_WARNING, "Failed recreating '%s' subscription: Could not get subscription handler.\n",</span><br><span>                         persistence->endpoint);</span><br><span>@@ -2982,7 +2984,7 @@</span><br><span>           }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   handler = subscription_get_handler_from_rdata(rdata);</span><br><span style="color: hsl(120, 100%, 40%);">+ handler = subscription_get_handler_from_rdata(rdata, ast_sorcery_object_get_id(endpoint));</span><br><span>   if (!handler) {</span><br><span>              pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 489, NULL, NULL, NULL);</span><br><span>           return PJ_TRUE;</span><br><span>@@ -3294,7 +3296,8 @@</span><br><span> </span><br><span>  event_header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_event_name, rdata->msg_info.msg->hdr.next);</span><br><span>         if (!event_header) {</span><br><span style="color: hsl(0, 100%, 40%);">-            ast_log(LOG_WARNING, "Incoming PUBLISH request with no Event header\n");</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_log(LOG_WARNING, "Incoming PUBLISH request from %s with no Event header\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                     ast_sorcery_object_get_id(endpoint));</span><br><span>                pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 489, NULL, NULL, NULL);</span><br><span>           return PJ_TRUE;</span><br><span>      }</span><br><span>@@ -3302,7 +3305,8 @@</span><br><span> </span><br><span>        handler = find_pub_handler(event);</span><br><span>   if (!handler) {</span><br><span style="color: hsl(0, 100%, 40%);">-         ast_log(LOG_WARNING, "No registered publish handler for event %s\n", event);</span><br><span style="color: hsl(120, 100%, 40%);">+                ast_log(LOG_WARNING, "No registered publish handler for event %s from %s\n", event,</span><br><span style="color: hsl(120, 100%, 40%);">+                 ast_sorcery_object_get_id(endpoint));</span><br><span>                pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 489, NULL, NULL, NULL);</span><br><span>           return PJ_TRUE;</span><br><span>      }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/12991">change 12991</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/+/12991"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia2811ec226d8a12659b4f9d4d224b48289650827 </div>
<div style="display:none"> Gerrit-Change-Number: 12991 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexei Gradinari <alex2grad@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>