Changeset 3243

Timestamp:

Aug 1, 2010 9:48:51 AM (14 years ago)

Author:

bennylp

Message:

Implemented core multipart support and support in the invite session (re #1070)

• incoming multipart message will be handled automatically
• for testing, enable HAVE_MULTIPART_TEST in pjsua_app.c

Location:

pjproject/trunk

Files:

• build.symbian/pjsip.mmp (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (8 diffs)
• pjsip/build/Makefile (modified) (2 diffs)
• pjsip/include/pjsip-ua/sip_inv.h (modified) (2 diffs)
• pjsip/include/pjsip.h (modified) (1 diff)
• pjsip/include/pjsip/sip_multipart.h (added)
• pjsip/include/pjsip/sip_parser.h (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (19 diffs)
• pjsip/src/pjsip/sip_multipart.c (added)
• pjsip/src/pjsip/sip_parser.c (modified) (6 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)
• pjsip/src/test/multipart_test.c (added)
• pjsip/src/test/test.c (modified) (1 diff)
• pjsip/src/test/test.h (modified) (2 diffs)
• tests/pjsua/inc_sip.py (modified) (5 diffs)
• tests/pjsua/mod_sendto.py (modified) (1 diff)
• tests/pjsua/scripts-sendto/251_multipart_ok_simple.py (added)
• tests/pjsua/scripts-sendto/252_multipart_ok_clutter.py (added)
• tests/pjsua/scripts-sendto/260_multipart_err_no_sdp.py (added)

pjproject/trunk/build.symbian/pjsip.mmp

@@ -44 +44 @@
 SOURCE  sip_errno.c
 SOURCE  sip_msg.c
+SOURCE  sip_multipart.c
 SOURCE  sip_parser_wrap.cpp
 SOURCE  sip_resolve.c

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -27 +27 @@
 //#define STEREO_DEMO
 //#define TRANSPORT_ADAPTER_SAMPLE
+//#define HAVE_MULTIPART_TEST
 
 /* Ringtones                US         UK  */
@@ -2219 +2220 @@
 }
 
+#ifdef HAVE_MULTIPART_TEST
+  /*
+   * Enable multipart in msg_data and add a dummy body into the
+   * multipart bodies.
+   */
+  static void add_multipart(pjsua_msg_data *msg_data)
+  {
+      static pjsip_multipart_part *alt_part;
+
+      if (!alt_part) {
+          pj_str_t type, subtype, content;
+
+          alt_part = pjsip_multipart_create_part(app_config.pool);
+
+          type = pj_str("text");
+          subtype = pj_str("plain");
+          content = pj_str("Sample text body of a multipart bodies");
+          alt_part->body = pjsip_msg_body_create(app_config.pool, &type,
+                                                 &subtype, &content);
+      }
+
+      msg_data->multipart_ctype.type = pj_str("multipart");
+      msg_data->multipart_ctype.subtype = pj_str("mixed");
+      pj_list_push_back(&msg_data->multipart_parts, alt_part);
+  }
+#  define TEST_MULTIPART(msg_data)      add_multipart(msg_data)
+#else
+#  define TEST_MULTIPART(msg_data)
+#endif
+
 /*
  * Find next call when current call is disconnected or when user
@@ -3433 +3464 @@
     pj_str_t tmp;
     struct input_result result;
+    pjsua_msg_data msg_data;
     pjsua_call_info call_info;
     pjsua_acc_info acc_info;
@@ -3501 +3533 @@
             }
             
-            pjsua_call_make_call( current_acc, &tmp, 0, NULL, NULL, NULL);
+            pjsua_msg_data_init(&msg_data);
+            TEST_MULTIPART(&msg_data);
+            pjsua_call_make_call( current_acc, &tmp, 0, NULL, &msg_data, NULL);
             break;
 
@@ -3639 +3673 @@
                 pj_str_t hvalue;
                 pjsip_generic_string_hdr hcontact;
-                pjsua_msg_data msg_data;
 
                 if (!simple_input("Answer with code (100-699)", buf, sizeof(buf)))
@@ -3887 +3920 @@
             } else {
                 int call = current_call;
-                pjsua_msg_data msg_data;
                 pjsip_generic_string_hdr refer_sub;
                 pj_str_t STR_REFER_SUB = { "Refer-Sub", 9 };
@@ -3942 +3974 @@
                 int call = current_call;
                 int dst_call;
-                pjsua_msg_data msg_data;
                 pjsip_generic_string_hdr refer_sub;
                 pj_str_t STR_REFER_SUB = { "Refer-Sub", 9 };
@@ -4084 +4115 @@
                 digits = pj_str(buf);
                 for (i=0; i<digits.slen; ++i) {
-                    pjsua_msg_data msg_data;
                     char body[80];
 

pjproject/trunk/pjsip/build/Makefile

@@ -37 +37 @@
 export PJSIP_SRCDIR = ../src/pjsip
 export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                sip_config.o \
+                sip_config.o sip_multipart.o \
                 sip_errno.o sip_msg.o sip_parser.o sip_tel_uri.o sip_uri.o \
                 sip_endpoint.o sip_util.o sip_util_proxy.o \
@@ -87 +87 @@
 export TEST_SRCDIR = ../src/test
 export TEST_OBJS += dlg_core_test.o dns_test.o msg_err_test.o \
-                    msg_logger.o msg_test.o regc_test.o \
+                    msg_logger.o msg_test.o multipart_test.o regc_test.o \
                     test.o transport_loop_test.o transport_tcp_test.o \
                     transport_test.o transport_udp_test.o \

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

@@ -383 +383 @@
 
 /**
+ * This structure represents SDP information in a pjsip_rx_data. Application
+ * retrieve this information by calling #pjsip_rdata_get_sdp_info(). This
+ * mechanism supports multipart message body.
+ */
+typedef struct pjsip_rdata_sdp_info
+{
+    /**
+     * Pointer and length of the text body in the incoming message. If
+     * the pointer is NULL, it means the message does not contain SDP
+     * body.
+     */
+    pj_str_t             body;
+
+    /**
+     * This will contain non-zero if an invalid SDP body is found in the
+     * message.
+     */
+    pj_status_t          sdp_err;
+
+    /**
+     * A parsed and validated SDP body.
+     */
+    pjmedia_sdp_session *sdp;
+
+} pjsip_rdata_sdp_info;
+
+
+/**
  * Initialize the invite usage module and register it to the endpoint. 
  * The callback argument contains pointer to functions to be called on 
@@ -875 +903 @@
                                            pjsip_msg_body **p_body);
 
+/**
+ * Retrieve SDP information from an incoming message. Application should
+ * prefer to use this function rather than parsing the SDP manually since
+ * this function supports multipart message body.
+ *
+ * This function will only parse the SDP once, the first time it is called
+ * on the same message. Subsequent call on the same message will just pick
+ * up the already parsed SDP from the message.
+ *
+ * @param rdata         The incoming message.
+ *
+ * @return              The SDP info.
+ */
+PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata);
+
 
 PJ_END_DECL

pjproject/trunk/pjsip/include/pjsip.h

@@ -29 +29 @@
 #include <pjsip/sip_tel_uri.h>
 #include <pjsip/sip_msg.h>
+#include <pjsip/sip_multipart.h>
 #include <pjsip/sip_parser.h>
 

pjproject/trunk/pjsip/include/pjsip/sip_parser.h

@@ -277 +277 @@
  *                      pinpoint the location of the error in the buffer.
  *
- * @return              The instance of the header if parsing was successfull,
+ * @return              The instance of the header if parsing was successful,
  *                      or otherwise a NULL pointer will be returned.
  */
@@ -288 +288 @@
  * When there are multiple headers, the headers MUST be separated by either
  * a newline (as in SIP message) or ampersand mark (as in URI). This separator
- * however is optional for the last header.
- *
- * @param pool          the pool.
- * @param input         the input text to parse, which must be NULL terminated.
- * @param size          the text length.
- * @param hlist         the header list to store the parsed headers. 
+ * is optional for the last header.
+ *
+ * @param pool          The pool.
+ * @param input         The input text to parse, which must be NULL terminated.
+ * @param size          The text length.
+ * @param hlist         The header list to store the parsed headers.
  *                      This list must have been initialized before calling 
  *                      this function.
+ * @param options       Specify 1 here to make parsing stop when error is
+ *                      encountered when parsing the header. Otherwise the
+ *                      error is silently ignored and parsing resumes to the
+ *                      next line.
  * @return              zero if successfull, or -1 if error is encountered. 
  *                      Upon error, the \a hlist argument MAY contain 
  *                      successfully parsed headers.
  */
-PJ_DECL(pj_status_t) pjsip_parse_headers( pj_pool_t *pool,
-                                          char *input, pj_size_t size,
-                                          pj_list *hlist );
+PJ_DECL(pj_status_t) pjsip_parse_headers( pj_pool_t *pool, char *input,
+                                          pj_size_t size, pjsip_hdr *hlist,
+                                          unsigned options);
 
 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1187 +1187 @@
 
     /**
-     * Optional message body.
+     * Optional message body to be added to the message, only when the
+     * message doesn't have a body.
      */
     pj_str_t    msg_body;
 
+    /**
+     * Content type of the multipart body. If application wants to send
+     * multipart message bodies, it puts the parts in \a parts and set
+     * the content type in \a multipart_ctype. If the message already
+     * contains a body, the body will be added to the multipart bodies.
+     */
+    pjsip_media_type  multipart_ctype;
+
+    /**
+     * List of multipart parts. If application wants to send multipart
+     * message bodies, it puts the parts in \a parts and set the content
+     * type in \a multipart_ctype. If the message already contains a body,
+     * the body will be added to the multipart bodies.
+     */
+    pjsip_multipart_part multipart_parts;
 };
 

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

@@ -24 +24 @@
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_event.h>
+#include <pjsip/sip_multipart.h>
 #include <pjsip/sip_transaction.h>
 #include <pjmedia/sdp.h>
@@ -746 +747 @@
 }
 
+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata)
+{
+    pjsip_rdata_sdp_info *sdp_info;
+    pjsip_msg_body *body = rdata->msg_info.msg->body;
+    pjsip_ctype_hdr *ctype_hdr = rdata->msg_info.ctype;
+    pjsip_media_type app_sdp;
+
+    sdp_info = (pjsip_rdata_sdp_info*)
+               rdata->endpt_info.mod_data[mod_inv.mod.id];
+    if (sdp_info)
+        return sdp_info;
+
+    sdp_info = PJ_POOL_ZALLOC_T(rdata->tp_info.pool,
+                                pjsip_rdata_sdp_info);
+    PJ_ASSERT_RETURN(mod_inv.mod.id >= 0, sdp_info);
+    rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info;
+
+    pjsip_media_type_init2(&app_sdp, "application", "sdp");
+
+    if (body && ctype_hdr &&
+        pj_stricmp(&ctype_hdr->media.type, &app_sdp.type)==0 &&
+        pj_stricmp(&ctype_hdr->media.subtype, &app_sdp.subtype)==0)
+    {
+        sdp_info->body.ptr = (char*)body->data;
+        sdp_info->body.slen = body->len;
+    } else if  (body && ctype_hdr &&
+                pj_stricmp2(&ctype_hdr->media.type, "multipart")==0 &&
+                (pj_stricmp2(&ctype_hdr->media.subtype, "mixed")==0 ||
+                 pj_stricmp2(&ctype_hdr->media.subtype, "alternative")==0))
+    {
+        pjsip_multipart_part *part;
+
+        part = pjsip_multipart_find_part(body, &app_sdp, NULL);
+        if (part) {
+            sdp_info->body.ptr = (char*)part->body->data;
+            sdp_info->body.slen = part->body->len;
+        }
+    }
+
+    if (sdp_info->body.ptr) {
+        pj_status_t status;
+        status = pjmedia_sdp_parse(rdata->tp_info.pool,
+                                   sdp_info->body.ptr,
+                                   sdp_info->body.slen,
+                                   &sdp_info->sdp);
+        if (status == PJ_SUCCESS)
+            status = pjmedia_sdp_validate(sdp_info->sdp);
+
+        if (status != PJ_SUCCESS) {
+            sdp_info->sdp = NULL;
+            PJ_PERROR(1,(THIS_FILE, status,
+                         "Error parsing/validating SDP body"));
+        }
+
+        sdp_info->sdp_err = status;
+    }
+
+    return sdp_info;
+}
+
+
 /*
  * Verify incoming INVITE request.
@@ -766 +828 @@
     pj_status_t status = PJ_SUCCESS;
     pjsip_hdr res_hdr_list;
+    pjsip_rdata_sdp_info *sdp_info;
 
     /* Init return arguments. */
@@ -822 +885 @@
      * only when the body hasn't been parsed before.
      */
+    if (r_sdp == NULL) {
+        sdp_info = pjsip_rdata_get_sdp_info(rdata);
+    } else {
+        sdp_info = NULL;
+    }
+
     if (r_sdp==NULL && msg->body) {
-        pjsip_msg_body *body = msg->body;
-        pj_str_t str_application = {"application", 11};
-        pj_str_t str_sdp = { "sdp", 3 };
-        pjmedia_sdp_session *sdp;
-
-        /* Check content type. */
-        if (pj_stricmp(&body->content_type.type, &str_application) != 0 ||
-            pj_stricmp(&body->content_type.subtype, &str_sdp) != 0)
-        {
-            /* Not "application/sdp" */
+
+        /* Check if body really contains SDP. */
+        if (sdp_info->body.ptr == NULL) {
+            /* Couldn't find "application/sdp" */
             code = PJSIP_SC_UNSUPPORTED_MEDIA_TYPE;
             status = PJSIP_ERRNO_FROM_SIP_STATUS(code);
@@ -849 +912 @@
         }
 
-        /* Parse and validate SDP */
-        status = pjmedia_sdp_parse(rdata->tp_info.pool, 
-                                   (char*)body->data, body->len, &sdp);
-        if (status == PJ_SUCCESS)
-            status = pjmedia_sdp_validate(sdp);
-
-        if (status != PJ_SUCCESS) {
+        if (sdp_info->sdp_err != PJ_SUCCESS) {
             /* Unparseable or invalid SDP */
             code = PJSIP_SC_BAD_REQUEST;
@@ -865 +922 @@
                 w = pjsip_warning_hdr_create_from_status(rdata->tp_info.pool,
                                                          pjsip_endpt_name(endpt),
-                                                         status);
+                                                         sdp_info->sdp_err);
                 PJ_ASSERT_RETURN(w, PJ_ENOMEM);
 
@@ -874 +931 @@
         }
 
-        r_sdp = sdp;
+        r_sdp = sdp_info->sdp;
     }
 
@@ -1164 +1221 @@
     struct tsx_inv_data *tsx_inv_data;
     pjsip_msg *msg;
-    pjmedia_sdp_session *rem_sdp = NULL;
+    pjsip_rdata_sdp_info *sdp_info;
     pj_status_t status;
 
@@ -1212 +1269 @@
     pj_ansi_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg);
 
-    /* Parse SDP in message body, if present. */
-    if (msg->body) {
-        pjsip_msg_body *body = msg->body;
-
-        /* Parse and validate SDP */
-        status = pjmedia_sdp_parse(inv->pool, (char*)body->data, body->len,
-                                   &rem_sdp);
-        if (status == PJ_SUCCESS)
-            status = pjmedia_sdp_validate(rem_sdp);
-
-        if (status != PJ_SUCCESS) {
-            pjsip_dlg_dec_lock(dlg);
-            return status;
-        }
+    /* Process SDP in message body, if present. */
+    sdp_info = pjsip_rdata_get_sdp_info(rdata);
+    if (sdp_info->sdp_err) {
+        pjsip_dlg_dec_lock(dlg);
+        return sdp_info->sdp_err;
     }
 
     /* Create negotiator. */
-    if (rem_sdp) {
-        status = pjmedia_sdp_neg_create_w_remote_offer(inv->pool, 
-                                                       local_sdp, rem_sdp, 
+    if (sdp_info->sdp) {
+        status = pjmedia_sdp_neg_create_w_remote_offer(inv->pool, local_sdp,
+                                                       sdp_info->sdp,
                                                        &inv->neg);
                                                 
@@ -1375 +1423 @@
     PJ_ASSERT_RETURN(body != NULL, PJ_ENOMEM);
 
-    body->content_type.type = STR_APPLICATION;
-    body->content_type.subtype = STR_SDP;
+    pjsip_media_type_init(&body->content_type, (pj_str_t*)&STR_APPLICATION,
+                          (pj_str_t*)&STR_SDP);
     body->data = sdp;
     body->len = 0;
@@ -1528 +1576 @@
 }
 
+
 /*
  * Initiate SDP negotiation in the SDP negotiator.
@@ -1576 +1625 @@
 {
     struct tsx_inv_data *tsx_inv_data;
-    static const pj_str_t str_application = { "application", 11 };
-    static const pj_str_t str_sdp = { "sdp", 3 };
     pj_status_t status;
     pjsip_msg *msg;
-    pjmedia_sdp_session *rem_sdp;
+    pjsip_rdata_sdp_info *sdp_info;
 
     /* Check if SDP is present in the message. */
@@ -1590 +1637 @@
     }
 
-    if (pj_stricmp(&msg->body->content_type.type, &str_application) ||
-        pj_stricmp(&msg->body->content_type.subtype, &str_sdp))
-    {
+    sdp_info = pjsip_rdata_get_sdp_info(rdata);
+    if (sdp_info->body.ptr == NULL) {
         /* Message body is not "application/sdp" */
         return PJMEDIA_SDP_EINSDP;
@@ -1661 +1707 @@
     }
 
-    /* Parse the SDP body. */
-
-    status = pjmedia_sdp_parse(rdata->tp_info.pool, 
-                               (char*)msg->body->data,
-                               msg->body->len, &rem_sdp);
-    if (status == PJ_SUCCESS)
-        status = pjmedia_sdp_validate(rem_sdp);
-
-    if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(THIS_FILE, "Error parsing SDP in %s: %s",
-                  pjsip_rx_data_get_info(rdata), errmsg));
+    /* Process the SDP body. */
+    if (sdp_info->sdp_err) {
+        PJ_PERROR(4,(THIS_FILE, sdp_info->sdp_err,
+                     "Error parsing SDP in %s",
+                     pjsip_rx_data_get_info(rdata)));
         return PJMEDIA_SDP_EINSDP;
     }
+
+    pj_assert(sdp_info->sdp != NULL);
 
     /* The SDP can be an offer or answer, depending on negotiator's state */
@@ -1690 +1730 @@
         if (inv->neg == NULL) {
             status=pjmedia_sdp_neg_create_w_remote_offer(inv->pool, NULL,
-                                                         rem_sdp, &inv->neg);
+                                                         sdp_info->sdp,
+                                                         &inv->neg);
         } else {
             status=pjmedia_sdp_neg_set_remote_offer(inv->pool_prov, inv->neg, 
-                                                    rem_sdp);
+                                                    sdp_info->sdp);
         }
 
         if (status != PJ_SUCCESS) {
-            char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(status, errmsg, sizeof(errmsg));
-            PJ_LOG(4,(THIS_FILE, "Error processing SDP offer in %s: %s",
-                      pjsip_rx_data_get_info(rdata), errmsg));
+            PJ_PERROR(4,(THIS_FILE, status, "Error processing SDP offer in %",
+                      pjsip_rx_data_get_info(rdata)));
             return PJMEDIA_SDP_EINSDP;
         }
@@ -1708 +1747 @@
         if (mod_inv.cb.on_rx_offer && inv->notify) {
 
-            (*mod_inv.cb.on_rx_offer)(inv, rem_sdp);
+            (*mod_inv.cb.on_rx_offer)(inv, sdp_info->sdp);
 
         }
@@ -1725 +1764 @@
 
         status = pjmedia_sdp_neg_set_remote_answer(inv->pool_prov, inv->neg,
-                                                   rem_sdp);
+                                                   sdp_info->sdp);
 
         if (status != PJ_SUCCESS) {
-            char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(status, errmsg, sizeof(errmsg));
-            PJ_LOG(4,(THIS_FILE, "Error processing SDP answer in %s: %s",
-                      pjsip_rx_data_get_info(rdata), errmsg));
+            PJ_PERROR(4,(THIS_FILE, status, "Error processing SDP answer in %s",
+                      pjsip_rx_data_get_info(rdata)));
             return PJMEDIA_SDP_EINSDP;
         }
@@ -3856 +3893 @@
             pjsip_tx_data *tdata;
             pj_status_t status;
+            pjsip_rdata_sdp_info *sdp_info;
             pjsip_status_code st_code;
 
@@ -3926 +3964 @@
              * Otherwise generate offer from local active SDP.
              */
-            if (rdata->msg_info.msg->body != NULL) {
+            sdp_info = pjsip_rdata_get_sdp_info(rdata);
+            if (sdp_info->sdp != NULL) {
                 status = process_answer(inv, 200, tdata, NULL);
             } else {

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -21 +21 @@
 #include <pjsip/sip_uri.h>
 #include <pjsip/sip_msg.h>
+#include <pjsip/sip_multipart.h>
 #include <pjsip/sip_auth_parser.h>
 #include <pjsip/sip_errno.h>
@@ -34 +35 @@
 #include <pj/ctype.h>
 #include <pj/assert.h>
+
+#define THIS_FILE           "sip_parser.c"
 
 #define ALNUM
@@ -269 +272 @@
 }
 
-/* Concatenate unrecognized params into single string. */
-static void concat_param( pj_str_t *param, pj_pool_t *pool, 
-                          const pj_str_t *pname, const pj_str_t *pvalue )
-{
-    pjsip_concat_param_imp(param, pool, pname, pvalue, ';');
-}
-
 /* Initialize static properties of the parser. */
 static pj_status_t init_parser()
@@ -1053 +1049 @@
          */
         if (ctype_hdr && scanner->curptr!=scanner->end) {
-            pjsip_msg_body *body = PJ_POOL_ALLOC_T(pool, pjsip_msg_body);
-            body->content_type.type = ctype_hdr->media.type;
-            body->content_type.subtype = ctype_hdr->media.subtype;
-            body->content_type.param = ctype_hdr->media.param;
-
-            body->data = scanner->curptr;
-            body->len = scanner->end - scanner->curptr;
-            body->print_body = &pjsip_print_text_body;
-            body->clone_data = &pjsip_clone_text_data;
+            /* New: if Content-Type indicates that this is a multipart
+             * message body, parse it.
+             */
+            const pj_str_t STR_MULTIPART = { "multipart", 9 };
+            pjsip_msg_body *body;
+
+            if (pj_stricmp(&ctype_hdr->media.type, &STR_MULTIPART)==0) {
+                body = pjsip_multipart_parse(pool, scanner->curptr,
+                                             scanner->end - scanner->curptr,
+                                             &ctype_hdr->media, 0);
+            } else {
+                body = PJ_POOL_ALLOC_T(pool, pjsip_msg_body);
+                body->content_type.type = ctype_hdr->media.type;
+                body->content_type.subtype = ctype_hdr->media.subtype;
+                body->content_type.param = ctype_hdr->media.param;
+
+                body->data = scanner->curptr;
+                body->len = scanner->end - scanner->curptr;
+                body->print_body = &pjsip_print_text_body;
+                body->clone_data = &pjsip_clone_text_data;
+            }
 
             msg->body = body;
@@ -1848 +1856 @@
     /* Parse media parameters */
     while (*scanner->curptr == ';') {
-        pj_str_t pname, pvalue;
-        int_parse_param(scanner, ctx->pool, &pname, &pvalue, 0);
-        concat_param(&hdr->media.param, ctx->pool, &pname, &pvalue);
+        pjsip_param *param = PJ_POOL_ALLOC_T(ctx->pool, pjsip_param);
+        int_parse_param(scanner, ctx->pool, &param->name, &param->value, 0);
+        pj_list_push_back(&hdr->media.param, param);
     }
 
@@ -2265 +2273 @@
 }
 
+/* Parse multiple header lines */
+PJ_DEF(pj_status_t) pjsip_parse_headers( pj_pool_t *pool, char *input,
+                                         pj_size_t size, pjsip_hdr *hlist,
+                                         unsigned options)
+{
+    enum { STOP_ON_ERROR = 1 };
+    pj_scanner scanner;
+    pjsip_parse_ctx ctx;
+    pj_str_t hname;
+    PJ_USE_EXCEPTION;
+
+    pj_scan_init(&scanner, input, size, PJ_SCAN_AUTOSKIP_WS_HEADER,
+                 &on_syntax_error);
+
+    pj_bzero(&ctx, sizeof(ctx));
+    ctx.scanner = &scanner;
+    ctx.pool = pool;
+
+retry_parse:
+    PJ_TRY
+    {
+        /* Parse headers. */
+        do {
+            pjsip_parse_hdr_func * handler;
+            pjsip_hdr *hdr = NULL;
+
+            /* Init hname just in case parsing fails.
+             * Ref: PROTOS #2412
+             */
+            hname.slen = 0;
+
+            /* Get hname. */
+            pj_scan_get( &scanner, &pconst.pjsip_TOKEN_SPEC, &hname);
+            if (pj_scan_get_char( &scanner ) != ':') {
+                PJ_THROW(PJSIP_SYN_ERR_EXCEPTION);
+            }
+
+            /* Find handler. */
+            handler = find_handler(&hname);
+
+            /* Call the handler if found.
+             * If no handler is found, then treat the header as generic
+             * hname/hvalue pair.
+             */
+            if (handler) {
+                hdr = (*handler)(&ctx);
+            } else {
+                hdr = parse_hdr_generic_string(&ctx);
+                hdr->name = hdr->sname = hname;
+            }
+
+            /* Single parse of header line can produce multiple headers.
+             * For example, if one Contact: header contains Contact list
+             * separated by comma, then these Contacts will be split into
+             * different Contact headers.
+             * So here we must insert list instead of just insert one header.
+             */
+            if (hdr)
+                pj_list_insert_nodes_before(hlist, hdr);
+
+            /* Parse until EOF or an empty line is found. */
+        } while (!pj_scan_is_eof(&scanner) && !IS_NEWLINE(*scanner.curptr));
+
+        /* If empty line is found, eat it. */
+        if (!pj_scan_is_eof(&scanner)) {
+            if (IS_NEWLINE(*scanner.curptr)) {
+                pj_scan_get_newline(&scanner);
+            }
+        }
+    }
+    PJ_CATCH_ANY
+    {
+        PJ_LOG(4,(THIS_FILE, "Error parsing header: '%.*s' line %d col %d",
+                  (int)hname.slen, hname.ptr, scanner.line,
+                  pj_scan_get_col(&scanner)));
+
+        /* Exception was thrown during parsing. */
+        if ((options & STOP_ON_ERROR) == STOP_ON_ERROR) {
+            pj_scan_fini(&scanner);
+            return PJSIP_EINVALIDHDR;
+        }
+
+        /* Skip until newline, and parse next header. */
+        if (!pj_scan_is_eof(&scanner)) {
+            /* Skip until next line.
+             * Watch for header continuation.
+             */
+            do {
+                pj_scan_skip_line(&scanner);
+            } while (IS_SPACE(*scanner.curptr));
+        }
+
+        /* Restore flag. Flag may be set in int_parse_sip_url() */
+        scanner.skip_ws = PJ_SCAN_AUTOSKIP_WS_HEADER;
+
+        /* Continue parse next header, if any. */
+        if (!pj_scan_is_eof(&scanner) && !IS_NEWLINE(*scanner.curptr)) {
+            goto retry_parse;
+        }
+
+    }
+    PJ_END;
+
+    return PJ_SUCCESS;
+}
+

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

@@ -646 +646 @@
     int call_id = -1;
     int sip_err_code;
-    pjmedia_sdp_session *offer, *answer;
+    pjmedia_sdp_session *offer=NULL, *answer;
     pj_status_t status;
 
@@ -766 +766 @@
     /* Parse SDP from incoming request */
     if (rdata->msg_info.msg->body) {
-        status = pjmedia_sdp_parse(rdata->tp_info.pool, 
-                                   (char*)rdata->msg_info.msg->body->data,
-                                   rdata->msg_info.msg->body->len, &offer);
-        if (status == PJ_SUCCESS) {
-            /* Validate */
-            status = pjmedia_sdp_validate(offer);
-        }
+        pjsip_rdata_sdp_info *sdp_info;
+
+        sdp_info = pjsip_rdata_get_sdp_info(rdata);
+        offer = sdp_info->sdp;
+
+        status = sdp_info->sdp_err;
+        if (status==PJ_SUCCESS && sdp_info->sdp==NULL)
+            status = PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE);
 
         if (status != PJ_SUCCESS) {

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

@@ -143 +143 @@
     pj_bzero(msg_data, sizeof(*msg_data));
     pj_list_init(&msg_data->hdr_list);
+    pjsip_media_type_init(&msg_data->multipart_ctype, NULL, NULL);
+    pj_list_init(&msg_data->multipart_parts);
 }
 
@@ -2226 +2228 @@
         tdata->msg->body = body;
     }
+
+    /* Multipart */
+    if (!pj_list_empty(&msg_data->multipart_parts) &&
+        msg_data->multipart_ctype.type.slen)
+    {
+        pjsip_msg_body *bodies;
+        pjsip_multipart_part *part;
+        pj_str_t *boundary = NULL;
+
+        bodies = pjsip_multipart_create(tdata->pool,
+                                        &msg_data->multipart_ctype,
+                                        boundary);
+        part = msg_data->multipart_parts.next;
+        while (part != &msg_data->multipart_parts) {
+            pjsip_multipart_part *part_copy;
+
+            part_copy = pjsip_multipart_clone_part(tdata->pool, part);
+            pjsip_multipart_add_part(tdata->pool, bodies, part_copy);
+            part = part->next;
+        }
+
+        if (tdata->msg->body) {
+            part = pjsip_multipart_create_part(tdata->pool);
+            part->body = tdata->msg->body;
+            pjsip_multipart_add_part(tdata->pool, bodies, part);
+
+            tdata->msg->body = NULL;
+        }
+
+        tdata->msg->body = bodies;
+    }
 }
 

pjproject/trunk/pjsip/src/test/test.c

@@ -302 +302 @@
 #endif
 
+#if INCLUDE_MULTIPART_TEST
+    DO_TEST(multipart_test());
+#endif
+
 #if INCLUDE_TXDATA_TEST
     DO_TEST(txdata_test());

pjproject/trunk/pjsip/src/test/test.h

@@ -57 +57 @@
 #define INCLUDE_URI_TEST        INCLUDE_MESSAGING_GROUP
 #define INCLUDE_MSG_TEST        INCLUDE_MESSAGING_GROUP
+#define INCLUDE_MULTIPART_TEST  INCLUDE_MESSAGING_GROUP
 #define INCLUDE_TXDATA_TEST     INCLUDE_MESSAGING_GROUP
 #define INCLUDE_TSX_BENCH       INCLUDE_MESSAGING_GROUP
@@ -72 +73 @@
 int msg_test(void);
 int msg_err_test(void);
+int multipart_test(void);
 int txdata_test(void);
 int tsx_bench(void);

pjproject/trunk/tests/pjsua/inc_sip.py

@@ -108 +108 @@
                 return msg
 
-        def create_req(self, method, sdp, branch="", extra_headers=""):
+        def create_req(self, method, sdp, branch="", extra_headers="", body=""):
                 if branch=="":
                         self.cseq = self.cseq + 1
@@ -120 +120 @@
                         msg = msg.replace("$CONTENT_LENGTH", str(len(sdp)))
                         msg = msg + "Content-Type: application/sdp\r\n"
+                        msg = msg + "\r\n"
+                        msg = msg + sdp
+                elif body!="":
+                        msg = msg.replace("$CONTENT_LENGTH", str(len(body)))
+                        msg = msg + "\r\n"
+                        msg = msg + body
                 else:
                         msg = msg.replace("$CONTENT_LENGTH", "0")
-                msg = msg + "\r\n"
-                msg = msg + sdp
                 return self.update_fields(msg)
 
@@ -139 +143 @@
                 return response
 
-        def create_invite(self, sdp, extra_headers=""):
+        def create_invite(self, sdp, extra_headers="", body=""):
                 self.inv_branch = str(random.random())
-                return self.create_req("INVITE", sdp, branch=self.inv_branch, extra_headers=extra_headers)
+                return self.create_req("INVITE", sdp, branch=self.inv_branch, extra_headers=extra_headers, body=body)
 
         def create_ack(self, sdp="", extra_headers=""):
@@ -253 +257 @@
         # List of RE patterns that must NOT exist in response
         resp_exclude = []
+        # Full (non-SDP) body
+        body = ""
         # Constructor
         def __init__(self, name, pjsua_args, sdp, resp_code, 
                      resp_inc=[], resp_exc=[], use_tcp=False,
-                     extra_headers="", complete_msg="",
+                     extra_headers="", body="", complete_msg="",
                      enable_buffer = False):
                 self.complete_msg = complete_msg
@@ -265 +271 @@
                 self.use_tcp = use_tcp
                 self.extra_headers = extra_headers
+                self.body = body
                 self.inst_param = cfg.InstanceParam("pjsua", pjsua_args)
                 self.inst_param.enable_buffer = enable_buffer 

pjproject/trunk/tests/pjsua/mod_sendto.py

@@ -22 +22 @@
                 req = dlg.update_fields(cfg.complete_msg)
         else:
-                req = dlg.create_invite(cfg.sdp, cfg.extra_headers)
+                req = dlg.create_invite(cfg.sdp, cfg.extra_headers, cfg.body)
         resp = dlg.send_request_wait(req, 10)
         if resp=="":