Changeset 3243 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.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-apps/src/pjsua/pjsua_app.c (modified) (8 diffs)

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];