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

Merge "res_pjsip_pubsub: More accurately persist packet."

Browse Source
This commit is contained in:
Joshua Colp
2015-08-07 05:17:13 -05:00
committed by Gerrit Code Review
parent 58effbc3f6 382334cc06
commit 12d7c8a740
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_pjsip_pubsub.c
View File

@@ -561,7 +561,7 @@ static void subscription_persistence_update(struct sip_subscription_tree *sub_tr
expires = expires_hdr ? expires_hdr->ivalue : DEFAULT_PUBLISH_EXPIRES; expires = expires_hdr ? expires_hdr->ivalue : DEFAULT_PUBLISH_EXPIRES;
sub_tree->persistence->expires = ast_tvadd(ast_tvnow(), ast_samp2tv(expires, 1)); sub_tree->persistence->expires = ast_tvadd(ast_tvnow(), ast_samp2tv(expires, 1));
ast_copy_string(sub_tree->persistence->packet, rdata->pkt_info.packet, pjsip_msg_print(rdata->msg_info.msg, sub_tree->persistence->packet,
sizeof(sub_tree->persistence->packet)); sizeof(sub_tree->persistence->packet));
ast_copy_string(sub_tree->persistence->src_name, rdata->pkt_info.src_name, ast_copy_string(sub_tree->persistence->src_name, rdata->pkt_info.src_name,
sizeof(sub_tree->persistence->src_name)); sizeof(sub_tree->persistence->src_name));
@@ -1338,6 +1338,13 @@ static int subscription_persistence_recreate(void *obj, void *arg, int flags)
return 0; return 0;
} }
if (rdata.msg_info.msg->type != PJSIP_REQUEST_MSG) {
ast_log(LOG_NOTICE, "Endpoint %s persisted a SIP response instead of a subscribe request. Unable to reload subscription.\n",
ast_sorcery_object_get_id(endpoint));
ast_sorcery_delete(ast_sip_get_sorcery(), persistence);
return 0;
}
request_uri = pjsip_uri_get_uri(rdata.msg_info.msg->line.req.uri); request_uri = pjsip_uri_get_uri(rdata.msg_info.msg->line.req.uri);
resource_size = pj_strlen(&request_uri->user) + 1; resource_size = pj_strlen(&request_uri->user) + 1;
resource = alloca(resource_size); resource = alloca(resource_size);