Changeset 3337

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

Location:

pjproject/trunk

Files:

• pjsip/include/pjsip-simple/presence.h (modified) (4 diffs)
• pjsip/src/pjsip-simple/presence.c (modified) (3 diffs)
• pjsip/src/pjsip-simple/presence_body.c (modified) (2 diffs)
• tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.xml (added)

pjproject/trunk/pjsip/include/pjsip-simple/presence.h

@@ -329 +329 @@
  *
  * @return              PJ_SUCCESS on success.
+ *
+ * @see pjsip_pres_parse_pidf2()
  */
 PJ_DECL(pj_status_t) pjsip_pres_parse_pidf(pjsip_rx_data *rdata,
@@ -334 +336 @@
                                            pjsip_pres_status *status);
 
+/**
+ * This is a utility function to parse PIDF body into PJSIP presence status.
+ *
+ * @param body          Text body, with one extra space at the end to place
+ *                      NULL character temporarily during parsing.
+ * @param body_len      Length of the body, not including the NULL termination
+ *                      character.
+ * @param pool          Pool to allocate memory to copy the strings into
+ *                      the presence status structure.
+ * @param status        The presence status to be initialized.
+ *
+ * @return              PJ_SUCCESS on success.
+ *
+ * @see pjsip_pres_parse_pidf()
+ */
+PJ_DECL(pj_status_t) pjsip_pres_parse_pidf2(char *body, unsigned body_len,
+                                            pj_pool_t *pool,
+                                            pjsip_pres_status *status);
 
 
@@ -345 +365 @@
  *
  * @return              PJ_SUCCESS on success.
+ *
+ * @see pjsip_pres_parse_xpidf2()
  */
 PJ_DECL(pj_status_t) pjsip_pres_parse_xpidf(pjsip_rx_data *rdata,
@@ -351 +373 @@
 
 
+/**
+ * This is a utility function to parse X-PIDF body into PJSIP presence status.
+ *
+ * @param body          Text body, with one extra space at the end to place
+ *                      NULL character temporarily during parsing.
+ * @param body_len      Length of the body, not including the NULL termination
+ *                      character.
+ * @param pool          Pool to allocate memory to copy the strings into
+ *                      the presence status structure.
+ * @param status        The presence status to be initialized.
+ *
+ * @return              PJ_SUCCESS on success.
+ *
+ * @see pjsip_pres_parse_xpidf()
+ */
+PJ_DECL(pj_status_t) pjsip_pres_parse_xpidf2(char *body, unsigned body_len,
+                                             pj_pool_t *pool,
+                                             pjsip_pres_status *status);
+
+
 
 /**

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)

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

@@ -200 +200 @@
                                            pjsip_pres_status *pres_status)
 {
+    return pjsip_pres_parse_pidf2((char*)rdata->msg_info.msg->body->data,
+                                  rdata->msg_info.msg->body->len,
+                                  pool, pres_status);
+}
+
+PJ_DEF(pj_status_t) pjsip_pres_parse_pidf2(char *body, unsigned body_len,
+                                           pj_pool_t *pool,
+                                           pjsip_pres_status *pres_status)
+{
     pjpidf_pres *pidf;
     pjpidf_tuple *pidf_tuple;
 
-    pidf = pjpidf_parse(rdata->tp_info.pool, 
-                        (char*)rdata->msg_info.msg->body->data,
-                        rdata->msg_info.msg->body->len);
+    pidf = pjpidf_parse(pool, body, body_len);
     if (pidf == NULL)
         return PJSIP_SIMPLE_EBADPIDF;
@@ -252 +259 @@
                                            pjsip_pres_status *pres_status)
 {
+    return pjsip_pres_parse_xpidf2((char*)rdata->msg_info.msg->body->data,
+                                   rdata->msg_info.msg->body->len,
+                                   pool, pres_status);
+}
+
+PJ_DEF(pj_status_t) pjsip_pres_parse_xpidf2(char *body, unsigned body_len,
+                                            pj_pool_t *pool,
+                                            pjsip_pres_status *pres_status)
+{
     pjxpidf_pres *xpidf;
 
-    xpidf = pjxpidf_parse(rdata->tp_info.pool, 
-                          (char*)rdata->msg_info.msg->body->data,
-                          rdata->msg_info.msg->body->len);
+    xpidf = pjxpidf_parse(pool, body, body_len);
     if (xpidf == NULL)
         return PJSIP_SIMPLE_EBADXPIDF;