Changeset 3841 for pjproject/trunk/pjsip/src/pjsip/sip_util.c
- Timestamp:
- Oct 24, 2011 9:28:13 AM (13 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
-
pjproject/trunk/pjsip/src/pjsip/sip_util.c
r3553 r3841 814 814 pjsip_uri *uri = (pjsip_uri*) target_uri; 815 815 const pjsip_sip_uri *url=(const pjsip_sip_uri*)pjsip_uri_get_uri(uri); 816 unsigned flag; 817 816 818 dest_info->flag |= (PJSIP_TRANSPORT_SECURE | PJSIP_TRANSPORT_RELIABLE); 817 819 if (url->maddr_param.slen) … … 822 824 dest_info->type = 823 825 pjsip_transport_get_type_from_name(&url->transport_param); 826 /* Double-check that the transport parameter match. 827 * Sample case: sips:host;transport=tcp 828 * See https://trac.pjsip.org/repos/ticket/1319 829 */ 830 flag = pjsip_transport_get_flag_from_type(dest_info->type); 831 if ((flag & dest_info->flag) != dest_info->flag) { 832 pjsip_transport_type_e t; 833 834 t = pjsip_transport_get_type_from_flag(dest_info->flag); 835 if (t != PJSIP_TRANSPORT_UNSPECIFIED) 836 dest_info->type = t; 837 } 824 838 825 839 } else if (PJSIP_URI_SCHEME_IS_SIP(target_uri)) { … … 1390 1404 1391 1405 pj_assert(addr->count != 0); 1406 1407 /* Avoid tdata destroyed by pjsip_tpmgr_send_raw(). */ 1408 pjsip_tx_data_add_ref(sraw_data->tdata); 1392 1409 1393 1410 data_len = sraw_data->tdata->buf.cur - sraw_data->tdata->buf.start;
Note: See TracChangeset
for help on using the changeset viewer.