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

Timestamp:

Aug 11, 2009 12:42:38 PM (15 years ago)

Author:

nanang

Message:

Ticket #833:

• Initial version of Session Timers (RFC 4028).
• Added new options in pjsua app to configure Session Timers settings.
• Added python tests for Session Timers.

File:

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

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

@@ -480 +480 @@
     /* 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;
 
     status = pjsip_inv_create_uac( dlg, offer, options, &inv);
@@ -489 +492 @@
     }
 
+    /* Init Session Timers */
+    {
+        pjsip_timer_setting timer_setting;
+
+        pjsip_timer_default_setting(&timer_setting);
+        timer_setting.sess_expires = acc->cfg.timer_se;
+        timer_setting.min_se = acc->cfg.timer_min_se;
+
+        status = pjsip_timer_init_session(inv, &timer_setting);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Session Timer init failed", status);
+            goto on_error;
+        }
+    }
 
     /* Create and associate our data in the session. */
@@ -806 +823 @@
     /* Verify that we can handle the request. */
     options |= PJSIP_INV_SUPPORT_100REL;
+    options |= PJSIP_INV_SUPPORT_TIMER;
     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;
 
     status = pjsip_inv_verify_request2(rdata, &options, offer, answer, NULL,
@@ -896 +916 @@
     }
 
+    /* Init Session Timers */
+    {
+        pjsip_timer_setting timer_setting;
+
+        pjsip_timer_default_setting(&timer_setting);
+        timer_setting.sess_expires = pjsua_var.acc[acc_id].cfg.timer_se;
+        timer_setting.min_se = pjsua_var.acc[acc_id].cfg.timer_min_se;
+
+        status = pjsip_timer_init_session(inv, &timer_setting);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Session Timer init failed", status);
+            status = pjsip_inv_end_session(inv, PJSIP_SC_INTERNAL_SERVER_ERROR,
+                                           NULL, &response);
+            if (status == PJ_SUCCESS && response)
+                status = pjsip_inv_send_msg(inv, response);
+
+            pjsua_media_channel_deinit(call->index);
+
+            PJSUA_UNLOCK();
+            return PJ_TRUE;
+        }
+    }
+
     /* Update NAT type of remote endpoint, only when there is SDP in
      * incoming INVITE! 
@@ -929 +972 @@
                                       100, NULL, NULL, &response);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send answer to incoming INVITE", 
-                     status);
-
-        pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL);
-        pjsip_inv_terminate(inv, 500, PJ_FALSE);
+        if (response == NULL) {
+            pjsua_perror(THIS_FILE, "Unable to send answer to incoming INVITE",
+                         status);
+            pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL);
+            pjsip_inv_terminate(inv, 500, PJ_FALSE);
+        } else {
+            pjsip_inv_send_msg(inv, response);
+            pjsip_inv_terminate(inv, PJSIP_ERRNO_TO_SIP_STATUS(status), 
+                                PJ_FALSE);
+        }
         pjsua_media_channel_deinit(call->index);
         PJSUA_UNLOCK();