Changeset 3337 for pjproject/trunk/pjsip/src/pjsip-simple/presence.c

Timestamp:

Oct 12, 2010 11:35:55 AM (14 years ago)

Author:

bennylp

Message:

Closed #1146: support for multipart message bodies in incoming NOTIFY requests

File:

• pjproject/trunk/pjsip/src/pjsip-simple/presence.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/presence.c

@@ -22 +22 @@
 #include <pjsip-simple/evsub_msg.h>
 #include <pjsip/sip_module.h>
+#include <pjsip/sip_multipart.h>
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_dialog.h>
@@ -683 +684 @@
                                            pjsip_hdr *res_hdr)
 {
+    const pj_str_t STR_MULTIPART = { "multipart", 9 };
     pjsip_ctype_hdr *ctype_hdr;
     pj_status_t status;
@@ -708 +710 @@
 
     /* Parse content. */
-
+    if (pj_stricmp(&ctype_hdr->media.type, &STR_MULTIPART)==0) {
+        pjsip_multipart_part *mpart;
+        pjsip_media_type ctype;
+
+        pjsip_media_type_init(&ctype, (pj_str_t*)&STR_APPLICATION,
+                              (pj_str_t*)&STR_PIDF_XML);
+        mpart = pjsip_multipart_find_part(rdata->msg_info.msg->body,
+                                          &ctype, NULL);
+        if (mpart) {
+            status = pjsip_pres_parse_pidf2((char*)mpart->body->data,
+                                            mpart->body->len, pres->tmp_pool,
+                                            &pres->tmp_status);
+        }
+
+        if (mpart==NULL) {
+            pjsip_media_type_init(&ctype, (pj_str_t*)&STR_APPLICATION,
+                                  (pj_str_t*)&STR_XPIDF_XML);
+            mpart = pjsip_multipart_find_part(rdata->msg_info.msg->body,
+                                              &ctype, NULL);
+            if (mpart) {
+                status = pjsip_pres_parse_xpidf2((char*)mpart->body->data,
+                                                 mpart->body->len,
+                                                 pres->tmp_pool,
+                                                 &pres->tmp_status);
+            } else {
+                status = PJSIP_SIMPLE_EBADCONTENT;
+            }
+        }
+    }
+    else
     if (pj_stricmp(&ctype_hdr->media.type, &STR_APPLICATION)==0 &&
         pj_stricmp(&ctype_hdr->media.subtype, &STR_PIDF_XML)==0)