diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-08-12 15:55:20 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-12 15:55:20 -0500 |
| commit | 8633259301d945b32e6384fff443c60a3deb2b61 (patch) | |
| tree | 0791cc65d65833ce8f935136b4ff6695a9b1c17b | |
| parent | 03b7d04298d91239f7b031d6a8165b9bbb28f997 (diff) | |
| parent | 4d5e96ab53f7076496e62b251dd349f320120d88 (diff) | |
Merge "res_pjsip_caller_id: Copy header name to short header name" into 13
| -rw-r--r-- | res/res_pjsip_caller_id.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip_diversion.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c index efa1b89a8..4d9f09237 100644 --- a/res/res_pjsip_caller_id.c +++ b/res/res_pjsip_caller_id.c @@ -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->type = PJSIP_H_OTHER; 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_uri = pjsip_uri_get_uri(id_name_addr->uri); diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c index 41e6c821a..99d18da44 100644 --- a/res/res_pjsip_diversion.c +++ b/res/res_pjsip_diversion.c @@ -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->type = PJSIP_H_OTHER; pj_strdup(tdata->pool, &hdr->name, &diversion_name); - hdr->sname.slen = 0; + hdr->sname = hdr->name; name_addr = pjsip_uri_clone(tdata->pool, base); uri = pjsip_uri_get_uri(name_addr->uri); |