From ab858295a27b7e7bb6ae028b25d6e16e8ae67076 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 5 Jan 2017 13:02:06 -0600
Subject: [PATCH] res_pjsip_pubsub.c: Fix incorrect message string wrapping.
Change-Id: Id771e6fe56d89ce365ddcbb423f820af97211120
---
res/res_pjsip_pubsub.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 43a9d4ba65..0ec344334d 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -889,8 +889,9 @@ static void build_node_children(struct ast_sip_endpoint *endpoint, const struct
if (PJSIP_IS_STATUS_IN_CLASS(resp, 200)) {
current = tree_node_alloc(resource, visited, 0);
if (!current) {
- ast_debug(1, "Subscription to leaf resource %s was successful, but encountered"
- "allocation error afterwards\n", resource);
+ ast_debug(1,
+ "Subscription to leaf resource %s was successful, but encountered allocation error afterwards\n",
+ resource);
continue;
}
ast_debug(2, "Subscription to leaf resource %s resulted in success. Adding to parent %s\n",
@@ -2565,8 +2566,9 @@ int ast_sip_register_subscription_handler(struct ast_sip_subscription_handler *h
existing = find_sub_handler_for_event_name(handler->event_name);
if (existing) {
- ast_log(LOG_ERROR, "Unable to register subscription handler for event %s."
- "A handler is already registered\n", handler->event_name);
+ ast_log(LOG_ERROR,
+ "Unable to register subscription handler for event %s. A handler is already registered\n",
+ handler->event_name);
return -1;
}
@@ -2764,7 +2766,6 @@ static pj_bool_t pubsub_on_rx_subscribe_request(pjsip_rx_data *rdata)
AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(resource);
expires_header = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, rdata->msg_info.msg->hdr.next);
-
if (expires_header) {
if (expires_header->ivalue == 0) {
ast_log(LOG_WARNING, "Subscription request from endpoint %s rejected. Expiration of 0 is invalid\n",
--
GitLab