kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 12:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_pubsub: Ensure remote URI contains URI only." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-11-13 06:32:28 -06:00
committed by Gerrit Code Review
parent bb2173275a 56e32ca355
commit bcd2241c47
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_pjsip_pubsub.c
View File

@@ -2475,9 +2475,14 @@ void ast_sip_subscription_get_local_uri(struct ast_sip_subscription *sub, char *
void ast_sip_subscription_get_remote_uri(struct ast_sip_subscription *sub, char *buf, size_t size) void ast_sip_subscription_get_remote_uri(struct ast_sip_subscription *sub, char *buf, size_t size)
{ {
pjsip_dialog *dlg; pjsip_dialog *dlg;
pjsip_sip_uri *uri;
dlg = sub->tree->dlg; dlg = sub->tree->dlg;
ast_copy_pj_str(buf, &dlg->remote.info_str, size); uri = pjsip_uri_get_uri(dlg->remote.info->uri);
if (pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, uri, buf, size) < 0) {
*buf = '\0';
}
} }
const char *ast_sip_subscription_get_resource_name(struct ast_sip_subscription *sub) const char *ast_sip_subscription_get_resource_name(struct ast_sip_subscription *sub)