diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-05-12 15:05:42 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-05-12 15:05:42 -0500 |
| commit | 95285c6d23279345a1cfd48881fa38f2bc8c6e23 (patch) | |
| tree | 741da4949915c49a9790d45e18eaf248f6d036bf | |
| parent | 37214b0bdf52cf2f742349b22fae73742aeda091 (diff) | |
| parent | a94a12bbf73c7e643a77e4aa0597e4e49eb5b7ab (diff) | |
Merge "res_pjsip_outbound_registration: generate correct Contact URI for TLS" into 13
| -rw-r--r-- | res/res_pjsip_outbound_registration.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index 8a40cce23..1ae3522d8 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -1096,7 +1096,7 @@ static int sip_dialog_create_contact(pj_pool_t *pool, pj_str_t *contact, const c contact->ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, "<%s:%s@%s%.*s%s:%d%s%s%s%s>", - (pjsip_transport_get_flag_from_type(type) & PJSIP_TRANSPORT_SECURE) ? "sips" : "sip", + ((pjsip_transport_get_flag_from_type(type) & PJSIP_TRANSPORT_SECURE) && PJSIP_URI_SCHEME_IS_SIPS(uri)) ? "sips" : "sip", user, (type & PJSIP_TRANSPORT_IPV6) ? "[" : "", (int)local_addr.slen, |