Changeset 3013 for pjproject

Timestamp:

Nov 11, 2009 12:33:00 AM (14 years ago)

Author:

bennylp

Message:

Misc (#951): undo r3012, and silently adjust max_calls to PJSUA_MAX_CALLS instead if it is greater

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_call.c (modified) (1 diff)
• pjsua_core.c (modified) (1 diff)

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

@@ -133 +133 @@
     /* Copy config */
     pjsua_config_dup(pjsua_var.pool, &pjsua_var.ua_cfg, cfg);
+
+    /* Verify settings */
+    if (pjsua_var.ua_cfg.max_calls >= PJSUA_MAX_CALLS) {
+        pjsua_var.ua_cfg.max_calls = PJSUA_MAX_CALLS;
+    }
 
     /* Check the route URI's and force loose route if required */

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

@@ -684 +684 @@
     }
 
-    /* Verify settings */
-    if (ua_cfg->max_calls >= PJSUA_MAX_CALLS) {
-        pjsua_perror(THIS_FILE, "Invalid max_calls setting", PJ_ETOOMANY);
-        return PJ_EINVAL;
-    }
-
     /* If nameserver is configured, create DNS resolver instance and
      * set it to be used by SIP resolver.