]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip_pubsub.c: Fix incorrect message string wrapping. 39/4739/1
authorRichard Mudgett <rmudgett@digium.com>
Thu, 5 Jan 2017 19:02:06 +0000 (13:02 -0600)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 20 Jan 2017 18:36:11 +0000 (12:36 -0600)
Change-Id: Id771e6fe56d89ce365ddcbb423f820af97211120

res/res_pjsip_pubsub.c

index f6b6efcf57930019e7dd4e495c573446e66493b0..c06d86b6fc61c264e4db0c8c9e34821fccfc550c 100644 (file)
@@ -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",
@@ -2630,8 +2631,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;
        }
 
@@ -2829,7 +2831,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",