kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_pubsub.c: Fix incorrect message string wrapping."

Browse Source
This commit is contained in:
zuul
2017-01-23 14:07:49 -06:00
committed by Gerrit Code Review
parent e2da0021b9 ab858295a2
commit 697fde39ac
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_pjsip_pubsub.c
View 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",
@@ -2574,8 +2575,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;
}
@@ -2775,7 +2777,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",