Changeset 5569

Timestamp:

Mar 21, 2017 7:19:43 AM (8 years ago)

Author:

nanang

Message:

Close #2003: Added API pjsip_multipart_get_raw() to get raw body of a multipart message body.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_multipart.h (modified) (1 diff)
• src/pjsip/sip_multipart.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_multipart.h

@@ -171 +171 @@
 
 /**
+ * Get the boundary string and the raw message body of the specified
+ * multipart message body. Note that raw message body will only be available
+ * if the multipart message body is generated by pjsip_multipart_parse().
+ *
+ * @param mp            The multipart message body.
+ * @param boundary      Optional parameter to receive the boundary string.
+ * @param raw_data      Optional parameter to receive the raw message body.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_multipart_get_raw(pjsip_msg_body *mp,
+                                             pj_str_t *boundary,
+                                             pj_str_t *raw_data);
+
+/**
  * @}  PJSIP_MULTIPART
  */

pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

@@ -46 +46 @@
     pj_str_t              boundary;
     pjsip_multipart_part  part_head;
+    pj_str_t              raw_data;
 };
 
@@ -609 +610 @@
     body = pjsip_multipart_create(pool, ctype, &boundary);
 
+    /* Save full raw body */
+    {
+        struct multipart_data *mp = (struct multipart_data*)body->data;
+        pj_strset(&mp->raw_data, buf, len);
+    }
+
     for (;;) {
         char *start_body, *end_body;
@@ -668 +675 @@
 }
 
+
+PJ_DEF(pj_status_t) pjsip_multipart_get_raw( pjsip_msg_body *mp,
+                                             pj_str_t *boundary,
+                                             pj_str_t *raw_data)
+{
+    struct multipart_data *m_data;
+
+    /* Must specify mandatory params */
+    PJ_ASSERT_RETURN(mp, PJ_EINVAL);
+
+    /* mp must really point to an actual multipart msg body */
+    PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, PJ_EINVAL);
+
+    m_data = (struct multipart_data*)mp->data;
+
+    if (boundary)
+        *boundary = m_data->boundary;
+
+    if (raw_data)
+        *raw_data = m_data->raw_data;
+
+    return PJ_SUCCESS;
+}