[Asterisk-code-review] res_pjsip_pubsub: add endpoint to some warning (...asterisk[master])

[George Joseph]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/12991 )

Change subject: res_pjsip_pubsub: add endpoint to some warning
......................................................................

res_pjsip_pubsub: add endpoint to some warning

There are some warning messages which are not informative without endpoint:
"No registered subscribe handler for event presence.winfo"
"No registered publish handler for event presence"

This patch adds an endpoint name to these messages.

Change-Id: Ia2811ec226d8a12659b4f9d4d224b48289650827
---
M res/res_pjsip_pubsub.c
1 file changed, 11 insertions(+), 7 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 955db1d..e26f250 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -758,7 +758,7 @@
 		size_t num_accept, const char *body_type);
 
 /*! \brief Retrieve a handler using the Event header of an rdata message */
-static struct ast_sip_subscription_handler *subscription_get_handler_from_rdata(pjsip_rx_data *rdata)
+static struct ast_sip_subscription_handler *subscription_get_handler_from_rdata(pjsip_rx_data *rdata, const char *endpoint)
 {
 	pjsip_event_hdr *event_header;
 	char event[32];
@@ -766,14 +766,16 @@
 
 	event_header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_event_name, rdata->msg_info.msg->hdr.next);
 	if (!event_header) {
-		ast_log(LOG_WARNING, "Incoming SUBSCRIBE request with no Event header\n");
+		ast_log(LOG_WARNING, "Incoming SUBSCRIBE request from %s with no Event header\n",
+			endpoint ? endpoint : "Unknown");
 		return NULL;
 	}
 	ast_copy_pj_str(event, &event_header->event_type, sizeof(event));
 
 	handler = find_sub_handler_for_event_name(event);
 	if (!handler) {
-		ast_log(LOG_WARNING, "No registered subscribe handler for event %s\n", event);
+		ast_log(LOG_WARNING, "No registered subscribe handler for event %s from %s\n", event,
+			endpoint ? endpoint : "Unknown");
 	}
 
 	return handler;
@@ -1549,7 +1551,7 @@
 	 */
 	AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(resource);
 
-	handler = subscription_get_handler_from_rdata(rdata);
+	handler = subscription_get_handler_from_rdata(rdata, persistence->endpoint);
 	if (!handler || !handler->notifier) {
 		ast_log(LOG_WARNING, "Failed recreating '%s' subscription: Could not get subscription handler.\n",
 			persistence->endpoint);
@@ -2982,7 +2984,7 @@
 		}
 	}
 
-	handler = subscription_get_handler_from_rdata(rdata);
+	handler = subscription_get_handler_from_rdata(rdata, ast_sorcery_object_get_id(endpoint));
 	if (!handler) {
 		pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 489, NULL, NULL, NULL);
 		return PJ_TRUE;
@@ -3294,7 +3296,8 @@
 
 	event_header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_event_name, rdata->msg_info.msg->hdr.next);
 	if (!event_header) {
-		ast_log(LOG_WARNING, "Incoming PUBLISH request with no Event header\n");
+		ast_log(LOG_WARNING, "Incoming PUBLISH request from %s with no Event header\n",
+			ast_sorcery_object_get_id(endpoint));
 		pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 489, NULL, NULL, NULL);
 		return PJ_TRUE;
 	}
@@ -3302,7 +3305,8 @@
 
 	handler = find_pub_handler(event);
 	if (!handler) {
-		ast_log(LOG_WARNING, "No registered publish handler for event %s\n", event);
+		ast_log(LOG_WARNING, "No registered publish handler for event %s from %s\n", event,
+			ast_sorcery_object_get_id(endpoint));
 		pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 489, NULL, NULL, NULL);
 		return PJ_TRUE;
 	}

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/12991
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ia2811ec226d8a12659b4f9d4d224b48289650827
Gerrit-Change-Number: 12991
Gerrit-PatchSet: 1
Gerrit-Owner: Alexei Gradinari <alex2grad at gmail.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20191001/bbf72671/attachment.html>