diff options
Diffstat (limited to 'pjsip/include/pjsua-lib/pjsua.h')
| -rw-r--r-- | pjsip/include/pjsua-lib/pjsua.h | 121 |
1 files changed, 19 insertions, 102 deletions
diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h index 78f8b1bd..73793247 100644 --- a/pjsip/include/pjsua-lib/pjsua.h +++ b/pjsip/include/pjsua-lib/pjsua.h @@ -474,16 +474,8 @@ typedef struct pjsua_logging_config logging_cfg = py_pjsua.logging_config_default() * \endcode */ -PJ_INLINE(void) pjsua_logging_config_default(pjsua_logging_config *cfg) -{ - pj_bzero(cfg, sizeof(*cfg)); +PJ_DECL(void) pjsua_logging_config_default(pjsua_logging_config *cfg); - cfg->msg_logging = PJ_TRUE; - cfg->level = 5; - cfg->console_level = 4; - cfg->decor = PJ_LOG_HAS_SENDER | PJ_LOG_HAS_TIME | - PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_NEWLINE; -} /** * Use this function to duplicate logging config. @@ -496,14 +488,9 @@ PJ_INLINE(void) pjsua_logging_config_default(pjsua_logging_config *cfg) * Not available (for now). Ideally we should be able to just assign * one config to another, but this has not been tested. */ -PJ_INLINE(void) pjsua_logging_config_dup(pj_pool_t *pool, - pjsua_logging_config *dst, - const pjsua_logging_config *src) -{ - pj_memcpy(dst, src, sizeof(*src)); - pj_strdup_with_null(pool, &dst->log_filename, &src->log_filename); -} - +PJ_DECL(void) pjsua_logging_config_dup(pj_pool_t *pool, + pjsua_logging_config *dst, + const pjsua_logging_config *src); /** @@ -1015,13 +1002,7 @@ typedef struct pjsua_config * \endcode */ -PJ_INLINE(void) pjsua_config_default(pjsua_config *cfg) -{ - pj_bzero(cfg, sizeof(*cfg)); - - cfg->max_calls = 4; - cfg->thread_cnt = 1; -} +PJ_DECL(void) pjsua_config_default(pjsua_config *cfg); /** @@ -1035,16 +1016,9 @@ PJ_INLINE(void) pjsua_config_default(pjsua_config *cfg) * Not applicable (for now). Probably we could just assign one credential * variable to another, but this has not been tested. */ -PJ_INLINE(void) pjsip_cred_dup( pj_pool_t *pool, - pjsip_cred_info *dst, - const pjsip_cred_info *src) -{ - pj_strdup_with_null(pool, &dst->realm, &src->realm); - pj_strdup_with_null(pool, &dst->scheme, &src->scheme); - pj_strdup_with_null(pool, &dst->username, &src->username); - pj_strdup_with_null(pool, &dst->data, &src->data); - -} +PJ_DECL(void) pjsip_cred_dup( pj_pool_t *pool, + pjsip_cred_info *dst, + const pjsip_cred_info *src); /** @@ -1054,29 +1028,9 @@ PJ_INLINE(void) pjsip_cred_dup( pj_pool_t *pool, * @param dst Destination config. * @param src Source config. */ -PJ_INLINE(void) pjsua_config_dup(pj_pool_t *pool, - pjsua_config *dst, - const pjsua_config *src) -{ - unsigned i; - - pj_memcpy(dst, src, sizeof(*src)); - - for (i=0; i<src->outbound_proxy_cnt; ++i) { - pj_strdup_with_null(pool, &dst->outbound_proxy[i], - &src->outbound_proxy[i]); - } - - for (i=0; i<src->cred_count; ++i) { - pjsip_cred_dup(pool, &dst->cred_info[i], &src->cred_info[i]); - } - - pj_strdup_with_null(pool, &dst->user_agent, &src->user_agent); - pj_strdup_with_null(pool, &dst->stun_domain, &src->stun_domain); - pj_strdup_with_null(pool, &dst->stun_host, &src->stun_host); - pj_strdup_with_null(pool, &dst->stun_relay_host, &src->stun_relay_host); -} - +PJ_DECL(void) pjsua_config_dup(pj_pool_t *pool, + pjsua_config *dst, + const pjsua_config *src); /** @@ -1137,12 +1091,7 @@ typedef struct pjsua_msg_data msg_data = py_pjsua.msg_data_init() * \endcode */ -PJ_INLINE(void) pjsua_msg_data_init(pjsua_msg_data *msg_data) -{ - pj_bzero(msg_data, sizeof(*msg_data)); - pj_list_init(&msg_data->hdr_list); -} - +PJ_DECL(void) pjsua_msg_data_init(pjsua_msg_data *msg_data); /** @@ -1485,11 +1434,7 @@ typedef struct pjsua_transport_config transport_cfg = py_pjsua.transport_config_default() * \endcode */ -PJ_INLINE(void) pjsua_transport_config_default(pjsua_transport_config *cfg) -{ - pj_bzero(cfg, sizeof(*cfg)); - pjsip_tls_setting_default(&cfg->tls_setting); -} +PJ_DECL(void) pjsua_transport_config_default(pjsua_transport_config *cfg); /** @@ -1503,14 +1448,9 @@ PJ_INLINE(void) pjsua_transport_config_default(pjsua_transport_config *cfg) * Not applicable. One should be able to just copy one variable instance * to another in Python. */ -PJ_INLINE(void) pjsua_transport_config_dup(pj_pool_t *pool, - pjsua_transport_config *dst, - const pjsua_transport_config *src) -{ - PJ_UNUSED_ARG(pool); - pj_memcpy(dst, src, sizeof(*src)); -} - +PJ_DECL(void) pjsua_transport_config_dup(pj_pool_t *pool, + pjsua_transport_config *dst, + const pjsua_transport_config *src); /** @@ -1916,14 +1856,7 @@ typedef struct pjsua_acc_config acc_cfg = py_pjsua.acc_config_default() * \endcode */ -PJ_INLINE(void) pjsua_acc_config_default(pjsua_acc_config *cfg) -{ - pj_bzero(cfg, sizeof(*cfg)); - - cfg->reg_timeout = PJSUA_REG_INTERVAL; - cfg->transport_id = PJSUA_INVALID_ID; -} - +PJ_DECL(void) pjsua_acc_config_default(pjsua_acc_config *cfg); /** @@ -3064,10 +2997,7 @@ typedef struct pjsua_buddy_info buddy_cfg = py_pjsua.buddy_config_default() * \endcode */ -PJ_INLINE(void) pjsua_buddy_config_default(pjsua_buddy_config *cfg) -{ - pj_bzero(cfg, sizeof(*cfg)); -} +PJ_DECL(void) pjsua_buddy_config_default(pjsua_buddy_config *cfg); /** @@ -3555,20 +3485,7 @@ struct pjsua_media_config media_cfg = py_pjsua.media_config_default() * \endcode */ -PJ_INLINE(void) pjsua_media_config_default(pjsua_media_config *cfg) -{ - pj_bzero(cfg, sizeof(*cfg)); - - cfg->clock_rate = PJSUA_DEFAULT_CLOCK_RATE; - cfg->max_media_ports = 32; - cfg->has_ioqueue = PJ_TRUE; - cfg->thread_cnt = 1; - cfg->quality = PJSUA_DEFAULT_CODEC_QUALITY; - cfg->ilbc_mode = PJSUA_DEFAULT_ILBC_MODE; - cfg->ec_tail_len = PJSUA_DEFAULT_EC_TAIL_LEN; - cfg->jb_init = cfg->jb_min_pre = cfg->jb_max_pre = cfg->jb_max = -1; -} - +PJ_DECL(void) pjsua_media_config_default(pjsua_media_config *cfg); /** |