diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-10-16 08:14:51 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-10-16 08:14:51 +0000 |
| commit | d0f2cf7fee354d2ab1ef8748edd62438edeb80cc (patch) | |
| tree | d8c72d9f80fd72c27e54277448265a7e7f9ee968 | |
| parent | b41b56367a4e473edb288d0ee0f5b12f140bfc06 (diff) | |
Ticket #665: Wrong Contact URI generated when TLS transport is used
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2351 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip/include/pjsua-lib/pjsua.h | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h index 43d28a88..1818f428 100644 --- a/pjsip/include/pjsua-lib/pjsua.h +++ b/pjsip/include/pjsua-lib/pjsua.h @@ -2004,7 +2004,7 @@ PJ_DECL(pj_status_t) pjsua_transport_close( pjsua_transport_id id, * either "sip" or "sips". */ #ifndef PJSUA_SECURE_SCHEME -# define PJSUA_SECURE_SCHEME "sips" +# define PJSUA_SECURE_SCHEME "sip" #endif diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 46a6dd1c..7faec4e4 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -367,7 +367,7 @@ PJ_DEF(pj_status_t) pjsua_acc_add_local( pjsua_transport_id tid, } /* Don't add transport parameter if it's UDP */ - if ((t->type & PJSIP_TRANSPORT_UDP) == 0) { + if (t->type!=PJSIP_TRANSPORT_UDP && t->type!=PJSIP_TRANSPORT_UDP6) { pj_ansi_snprintf(transport_param, sizeof(transport_param), ";transport=%s", pjsip_transport_get_type_name(t->type)); @@ -1651,7 +1651,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool, } /* Don't add transport parameter if it's UDP */ - if ((tp_type & PJSIP_TRANSPORT_UDP) == 0) { + if (tp_type!=PJSIP_TRANSPORT_UDP && tp_type!=PJSIP_TRANSPORT_UDP6) { pj_ansi_snprintf(transport_param, sizeof(transport_param), ";transport=%s", pjsip_transport_get_type_name(tp_type)); @@ -1801,7 +1801,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool, } /* Don't add transport parameter if it's UDP */ - if ((tp_type & PJSIP_TRANSPORT_UDP) == 0) { + if (tp_type!=PJSIP_TRANSPORT_UDP && tp_type!=PJSIP_TRANSPORT_UDP6) { pj_ansi_snprintf(transport_param, sizeof(transport_param), ";transport=%s", pjsip_transport_get_type_name(tp_type)); |