From da94a4be035b1a79e759177a198edbde253d5337 Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Thu, 6 Mar 2014 01:00:11 +0000 Subject: Re #1742 (misc): Fixed incorrect checking of require_100rel configuration git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4779 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/src/pjsua/pjsua_app_config.c | 4 ++-- pjsip/src/pjsua-lib/pjsua_call.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pjsip-apps/src/pjsua/pjsua_app_config.c b/pjsip-apps/src/pjsua/pjsua_app_config.c index 46839981..3dcc4333 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_config.c +++ b/pjsip-apps/src/pjsua/pjsua_app_config.c @@ -1645,7 +1645,7 @@ static void write_account_settings(int acc_index, pj_str_t *result) } /* 100rel extension */ - if (acc_cfg->require_100rel) { + if (acc_cfg->require_100rel == PJSUA_100REL_MANDATORY) { pj_strcat2(result, "--use-100rel\n"); } @@ -2155,7 +2155,7 @@ int write_settings(pjsua_app_config *config, char *buf, pj_size_t max) /* SIP extensions. */ pj_strcat2(&cfg, "\n#\n# SIP extensions:\n#\n"); /* 100rel extension */ - if (config->cfg.require_100rel) { + if (config->cfg.require_100rel == PJSUA_100REL_MANDATORY) { pj_strcat2(&cfg, "--use-100rel\n"); } /* Session Timer extension */ diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index db8bfa11..35e50a03 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -420,7 +420,7 @@ on_make_call_med_tp_complete(pjsua_call_id call_id, /* Create the INVITE session: */ options |= PJSIP_INV_SUPPORT_100REL; - if (acc->cfg.require_100rel) + if (acc->cfg.require_100rel == PJSUA_100REL_MANDATORY) options |= PJSIP_INV_REQUIRE_100REL; if (acc->cfg.use_timer != PJSUA_SIP_TIMER_INACTIVE) { options |= PJSIP_INV_SUPPORT_TIMER; -- cgit v1.2.3