Changeset 1698 for pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Jan 17, 2008 5:29:36 PM (17 years ago)

Author:

nanang

Message:

Ticket #452:

• Add directory srtp to third_party/build directory
• Add libsrtp project & integrate it to pjproject vs8 solution
• Add transport_srtp.h & .c
• Modify project dependencies to include libsrtp
• Modify Samples-vc.mak, add libsrtp as third party library
• Modify transport interface
• Modify transport_ice & transport_udp to accomodate new transport interface
• Modify other files that uses transport

File:

• pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_call.c (modified) (9 diffs)

pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_call.c

@@ -335 +335 @@
     offer = NULL;
 #else
-    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, &offer);
+    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL, &offer);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "pjmedia unable to create SDP", status);
@@ -482 +482 @@
     pjsua_call *call;
     int call_id = -1;
-    pjmedia_sdp_session *answer;
+    pjmedia_sdp_session *offer, *answer;
     pj_status_t status;
 
@@ -590 +590 @@
     }
 
+    /* Parse SDP from incoming request */
+    if (rdata->msg_info.msg->body) {
+        status = pjmedia_sdp_parse(rdata->tp_info.pool, 
+                                   rdata->msg_info.msg->body->data,
+                                   rdata->msg_info.msg->body->len, &offer);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error parsing SDP in incoming INVITE", status);
+            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 400, NULL,
+                                          NULL, NULL);
+            pjsua_media_channel_deinit(call->index);
+            PJSUA_UNLOCK();
+            return PJ_TRUE;
+        }
+    } else {
+        offer = NULL;
+    }
 
     /* Get media capability from media endpoint: */
-    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, &answer);
+    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, 
+                                            offer, &answer);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
@@ -613 +630 @@
         options |= PJSIP_INV_REQUIRE_100REL;
 
-    status = pjsip_inv_verify_request(rdata, &options, answer, NULL,
-                                      pjsua_var.endpt, &response);
+    status = pjsip_inv_verify_request2(rdata, &options, offer, answer, NULL,
+                                       pjsua_var.endpt, &response);
     if (status != PJ_SUCCESS) {
 
@@ -1314 +1331 @@
     PJ_UNUSED_ARG(unhold);
     PJ_TODO(create_active_inactive_sdp_based_on_unhold_arg);
-    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &sdp);
+    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                            NULL, &sdp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
@@ -1380 +1398 @@
 
     /* Create SDP */
-    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &sdp);
+    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                            NULL, &sdp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
@@ -2321 +2340 @@
 {
     pjsua_call *call;
-    const pjmedia_sdp_session *local_sdp;
+    pjmedia_sdp_session *local_sdp;
     const pjmedia_sdp_session *remote_sdp;
 
@@ -2502 +2521 @@
         }
 
-        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &answer);
+        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                                offer, &answer);
     }
 
@@ -2554 +2574 @@
         }
 
-        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, offer);
+        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                                NULL, offer);
     }