Changeset 3337 for pjproject/trunk/pjsip/src/pjsip-simple/presence_body.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_body.c (modified) (2 diffs)

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;