Changeset 3305 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Sep 7, 2010 9:36:15 AM (14 years ago)

Author:

nanang

Message:

Re #1120:

• Added enum pjsua_sip_timer_use for session timer usage types, containing: inactive, optional, required, always
• Replaced require_timer (boolean) with above enum in global and account config setting.
• Updated pjsua app --use-timer option accordingly.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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

@@ -494 +494 @@
     /* Create the INVITE session: */
     options |= PJSIP_INV_SUPPORT_100REL;
-    options |= PJSIP_INV_SUPPORT_TIMER;
     if (acc->cfg.require_100rel)
         options |= PJSIP_INV_REQUIRE_100REL;
-    if (acc->cfg.require_timer)
-        options |= PJSIP_INV_REQUIRE_TIMER;
+    if (acc->cfg.use_timer != PJSUA_SIP_TIMER_INACTIVE) {
+        options |= PJSIP_INV_SUPPORT_TIMER;
+        if (acc->cfg.use_timer == PJSUA_SIP_TIMER_REQUIRED)
+            options |= PJSIP_INV_REQUIRE_TIMER;
+        else if (acc->cfg.use_timer == PJSUA_SIP_TIMER_ALWAYS)
+            options |= PJSIP_INV_ALWAYS_USE_TIMER;
+    }
 
     status = pjsip_inv_create_uac( dlg, offer, options, &inv);
@@ -840 +844 @@
     if (pjsua_var.acc[acc_id].cfg.require_100rel)
         options |= PJSIP_INV_REQUIRE_100REL;
-    if (pjsua_var.acc[acc_id].cfg.require_timer)
-        options |= PJSIP_INV_REQUIRE_TIMER;
     if (pjsua_var.media_cfg.enable_ice)
         options |= PJSIP_INV_SUPPORT_ICE;
+    if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_REQUIRED)
+        options |= PJSIP_INV_REQUIRE_TIMER;
+    else if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_ALWAYS)
+        options |= PJSIP_INV_ALWAYS_USE_TIMER;
 
     status = pjsip_inv_verify_request2(rdata, &options, offer, answer, NULL,
@@ -909 +915 @@
     pjsip_auth_clt_set_prefs(&dlg->auth_sess, 
                              &pjsua_var.acc[acc_id].cfg.auth_pref);
+
+    /* Disable Session Timers if not prefered and the incoming INVITE request
+     * did not require it.
+     */
+    if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_INACTIVE && 
+        (options & PJSIP_INV_REQUIRE_TIMER) == 0)
+    {
+        options &= ~(PJSIP_INV_SUPPORT_TIMER);
+    }
 
     /* Create invite session: */