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

Timestamp:

Sep 30, 2007 4:50:27 PM (17 years ago)

Author:

bennylp

Message:

Ticket #385: Support for reliable provisional response (100rel, PRACK)

File:

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

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

@@ -221 +221 @@
                      PJ_EINVAL);
 
-    /* Options must be zero for now */
-    PJ_ASSERT_RETURN(options == 0, PJ_EINVAL);
-
     /* Check arguments */
     PJ_ASSERT_RETURN(dest_uri, PJ_EINVAL);
@@ -323 +320 @@
 
     /* Create the INVITE session: */
-
-    status = pjsip_inv_create_uac( dlg, offer, 0, &inv);
+#if PJSIP_HAS_100REL
+    options |= PJSIP_INV_SUPPORT_100REL;
+#endif
+    if (acc->cfg.require_100rel)
+        options |= PJSIP_INV_REQUIRE_100REL;
+
+    status = pjsip_inv_create_uac( dlg, offer, options, &inv);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Invite session creation failed", status);
@@ -558 +560 @@
     }
 
-
-    /* Verify that we can handle the request. */
-    status = pjsip_inv_verify_request(rdata, &options, answer, NULL,
-                                      pjsua_var.endpt, &response);
-    if (status != PJ_SUCCESS) {
-
-        /*
-         * No we can't handle the incoming INVITE request.
-         */
-
-        if (response) {
-            pjsip_response_addr res_addr;
-
-            pjsip_get_response_addr(response->pool, rdata, &res_addr);
-            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response, 
-                                      NULL, NULL);
-
-        } else {
-
-            /* Respond with 500 (Internal Server Error) */
-            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
-                                          NULL, NULL);
-        }
-
-        pjsua_media_channel_deinit(call->index);
-        PJSUA_UNLOCK();
-        return PJ_TRUE;
-    } 
-
-
     /* 
      * Get which account is most likely to be associated with this incoming
@@ -595 +567 @@
     acc_id = call->acc_id = pjsua_acc_find_for_incoming(rdata);
 
+    /* Verify that we can handle the request. */
+#if PJSIP_HAS_100REL
+    options |= PJSIP_INV_SUPPORT_100REL;
+#endif
+    if (pjsua_var.acc[acc_id].cfg.require_100rel)
+        options |= PJSIP_INV_REQUIRE_100REL;
+
+    status = pjsip_inv_verify_request(rdata, &options, answer, NULL,
+                                      pjsua_var.endpt, &response);
+    if (status != PJ_SUCCESS) {
+
+        /*
+         * No we can't handle the incoming INVITE request.
+         */
+        if (response) {
+            pjsip_response_addr res_addr;
+
+            pjsip_get_response_addr(response->pool, rdata, &res_addr);
+            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response, 
+                                      NULL, NULL);
+
+        } else {
+
+            /* Respond with 500 (Internal Server Error) */
+            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
+                                          NULL, NULL);
+        }
+
+        pjsua_media_channel_deinit(call->index);
+        PJSUA_UNLOCK();
+        return PJ_TRUE;
+    } 
+
+
     /* Get suitable Contact header */
     status = pjsua_acc_create_uas_contact(rdata->tp_info.pool, &contact,
@@ -626 +632 @@
 
     /* Create invite session: */
-    status = pjsip_inv_create_uas( dlg, rdata, answer, 0, &inv);
+    status = pjsip_inv_create_uas( dlg, rdata, answer, options, &inv);
     if (status != PJ_SUCCESS) {
         pjsip_hdr hdr_list;