Changeset 4779 for pjproject

Timestamp:

Mar 6, 2014 1:00:11 AM (11 years ago)

Author:

ming

Message:

Re #1742 (misc): Fixed incorrect checking of require_100rel configuration

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app_config.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

@@ -1646 +1646 @@
 
     /* 100rel extension */
-    if (acc_cfg->require_100rel) {
+    if (acc_cfg->require_100rel == PJSUA_100REL_MANDATORY) {
         pj_strcat2(result, "--use-100rel\n");
     }
@@ -2156 +2156 @@
     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");
     }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -421 +421 @@
     /* 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) {