From 65f8e930c65b43912d7db6b728538e371b0ecc41 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Fri, 6 Sep 2013 10:04:39 +0000 Subject: Fixed #1698: Follow account config in generating contact's secure scheme and deprecate PJSUA_SECURE_SCHEME. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4592 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/include/pjsua-lib/pjsua.h | 10 ---------- pjsip/include/pjsua-lib/pjsua_internal.h | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'pjsip/include') diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h index beb0762e..be5b08e8 100644 --- a/pjsip/include/pjsua-lib/pjsua.h +++ b/pjsip/include/pjsua-lib/pjsua.h @@ -2533,16 +2533,6 @@ PJ_DECL(pj_status_t) pjsua_transport_close( pjsua_transport_id id, #endif -/** - * This macro specifies the URI scheme to use in Contact header - * when secure transport such as TLS is used. Application can specify - * either "sip" or "sips". - */ -#ifndef PJSUA_SECURE_SCHEME -# define PJSUA_SECURE_SCHEME "sip" -#endif - - /** * Maximum time to wait for unpublication transaction(s) to complete * during shutdown process, before sending unregistration. The library diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h index d70506eb..dcf50209 100644 --- a/pjsip/include/pjsua-lib/pjsua_internal.h +++ b/pjsip/include/pjsua-lib/pjsua_internal.h @@ -214,6 +214,7 @@ typedef struct pjsua_acc int index; /**< Index in accounts array. */ pj_str_t display; /**< Display name, if any. */ pj_str_t user_part; /**< User part of local URI. */ + pj_bool_t is_sips; /**< Local URI uses "sips"? */ pj_str_t contact; /**< Our Contact header. */ pj_str_t reg_contact; /**< Contact header for REGISTER. It may be different than acc -- cgit v1.2.3