Changeset 1733

Timestamp:

Jan 23, 2008 8:29:30 PM (16 years ago)

Author:

bennylp

Message:

Related to ticket #61: added new invite session API pjsip_inv_verify_request() which takes additional remote SDP, to avoid parsing SDP multiple times

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (2 diffs)
• src/pjsip-ua/sip_inv.c (modified) (5 diffs)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -395 +395 @@
  *                      (this is useful e.g. when application wants to send 
  *                      the response statelessly).
+ *
+ * @see pjsip_inv_verify_request2()
  */
 PJ_DECL(pj_status_t) pjsip_inv_verify_request(  pjsip_rx_data *rdata,
@@ -403 +405 @@
                                                 pjsip_tx_data **tdata);
 
+/**
+ * Variant of #pjsip_inv_verify_request() which allows application to specify
+ * the parsed SDP in the \a offer argument. This is useful to avoid having to
+ * re-parse the SDP in the incoming request.
+ *
+ * @see pjsip_inv_verify_request()
+ */
+PJ_DECL(pj_status_t) pjsip_inv_verify_request2( pjsip_rx_data *rdata,
+                                                unsigned *options,
+                                                const pjmedia_sdp_session *offer,
+                                                const pjmedia_sdp_session *answer,
+                                                pjsip_dialog *dlg,
+                                                pjsip_endpoint *endpt,
+                                                pjsip_tx_data **tdata);
 
 /**

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -677 +677 @@
  * Verify incoming INVITE request.
  */
-PJ_DEF(pj_status_t) pjsip_inv_verify_request(pjsip_rx_data *rdata,
-                                             unsigned *options,
-                                             const pjmedia_sdp_session *l_sdp,
-                                             pjsip_dialog *dlg,
-                                             pjsip_endpoint *endpt,
-                                             pjsip_tx_data **p_tdata)
+PJ_DEF(pj_status_t) pjsip_inv_verify_request2(pjsip_rx_data *rdata,
+                                              unsigned *options,
+                                              const pjmedia_sdp_session *r_sdp,
+                                              const pjmedia_sdp_session *l_sdp,
+                                              pjsip_dialog *dlg,
+                                              pjsip_endpoint *endpt,
+                                              pjsip_tx_data **p_tdata)
 {
     pjsip_msg *msg;
@@ -723 +724 @@
     pj_list_init(&res_hdr_list);
 
-    /* Check the request body, see if it'inv something that we support
-     * (i.e. SDP). 
+    /* Check the request body, see if it's something that we support,
+     * only when the body hasn't been parsed before.
      */
-    if (msg->body) {
+    if (r_sdp==NULL && msg->body) {
         pjsip_msg_body *body = msg->body;
         pj_str_t str_application = {"application", 11};
@@ -778 +779 @@
         }
 
+        r_sdp = sdp;
+    }
+
+    if (r_sdp) {
         /* Negotiate with local SDP */
         if (l_sdp) {
@@ -788 +793 @@
             /* Create SDP negotiator */
             status = pjmedia_sdp_neg_create_w_remote_offer(
-                            rdata->tp_info.pool, l_sdp, sdp, &neg);
+                            rdata->tp_info.pool, l_sdp, r_sdp, &neg);
             PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
@@ -1026 +1031 @@
 
     return status;
+}
+
+
+/*
+ * Verify incoming INVITE request.
+ */
+PJ_DEF(pj_status_t) pjsip_inv_verify_request( pjsip_rx_data *rdata,
+                                              unsigned *options,
+                                              const pjmedia_sdp_session *l_sdp,
+                                              pjsip_dialog *dlg,
+                                              pjsip_endpoint *endpt,
+                                              pjsip_tx_data **p_tdata)
+{
+    return pjsip_inv_verify_request2(rdata, options, NULL, l_sdp, dlg, 
+                                     endpt, p_tdata);
 }