Merge "res_pjsip_caller_id: Copy header name to short header name" into 13

This commit is contained in:
zuul
2016-08-12 15:55:20 -05:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -413,7 +413,7 @@ static pjsip_fromto_hdr *create_new_id_hdr(const pj_str_t *hdr_name, pjsip_fromt
id_hdr = pjsip_from_hdr_create(tdata->pool); id_hdr = pjsip_from_hdr_create(tdata->pool);
id_hdr->type = PJSIP_H_OTHER; id_hdr->type = PJSIP_H_OTHER;
pj_strdup(tdata->pool, &id_hdr->name, hdr_name); pj_strdup(tdata->pool, &id_hdr->name, hdr_name);
id_hdr->sname.slen = 0; id_hdr->sname = id_hdr->name;
id_name_addr = pjsip_uri_clone(tdata->pool, base->uri); id_name_addr = pjsip_uri_clone(tdata->pool, base->uri);
id_uri = pjsip_uri_get_uri(id_name_addr->uri); id_uri = pjsip_uri_get_uri(id_name_addr->uri);

View File

@@ -305,7 +305,7 @@ static void add_diversion_header(pjsip_tx_data *tdata, struct ast_party_redirect
hdr = pjsip_from_hdr_create(tdata->pool); hdr = pjsip_from_hdr_create(tdata->pool);
hdr->type = PJSIP_H_OTHER; hdr->type = PJSIP_H_OTHER;
pj_strdup(tdata->pool, &hdr->name, &diversion_name); pj_strdup(tdata->pool, &hdr->name, &diversion_name);
hdr->sname.slen = 0; hdr->sname = hdr->name;
name_addr = pjsip_uri_clone(tdata->pool, base); name_addr = pjsip_uri_clone(tdata->pool, base);
uri = pjsip_uri_get_uri(name_addr->uri); uri = pjsip_uri_get_uri(name_addr->uri);