Changeset 3243 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

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

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

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;
+    }
 }