Changeset 266 for pjproject/trunk

Timestamp:

Mar 2, 2006 9:16:00 PM (19 years ago)

Author:

bennylp

Message:

Changed pjsip_msg_body_clone(), added pjsip_msg_body_create()

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_msg.h (modified) (1 diff)
• src/pjsip/sip_msg.c (modified) (2 diffs)
• src/pjsip/sip_util.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_msg.h

@@ -611 +611 @@
  * @return              PJ_SUCCESS on success.
  */
-PJ_DECL(pj_status_t) pjsip_msg_body_clone(pj_pool_t *pool,
+PJ_DECL(pj_status_t) pjsip_msg_body_copy( pj_pool_t *pool,
                                           pjsip_msg_body *dst_body,
                                           const pjsip_msg_body *src_body );
                                            
+
+/**
+ * Create cloned message body. This will duplicate the contents of the message
+ * body using the \a clone_data member of the source message body.
+ *
+ * @param pool          Pool to use to duplicate the message body.
+ * @param body          Source message body to duplicate.
+ *
+ * @return              The cloned message body on successfull.
+ */
+PJ_DECL(pjsip_msg_body*) pjsip_msg_body_clone( pj_pool_t *pool,
+                                               const pjsip_msg_body *body );
+                                           
+
+/**
+ * Create a text message body. Use this function to create message body when
+ * the content is a simple text. For non-text message body (e.g. 
+ * pjmedia_sdp_session or pj_xml_node), application must construct the message
+ * manually.
+ *
+ * @param pool          Pool to allocate message body and its contents.
+ * @param type          MIME type (e.g. "text").
+ * @param subtype       MIME subtype (e.g. "plain").
+ * @param text          The text content to be put in the message body.
+ *
+ * @return              A new message body with the specified Content-Type and
+ *                      text.
+ */
+PJ_DECL(pjsip_msg_body*) pjsip_msg_body_create( pj_pool_t *pool,
+                                                const pj_str_t *type,
+                                                const pj_str_t *subtype,
+                                                const pj_str_t *text );
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -1759 +1759 @@
 }
 
-PJ_DEF(pj_status_t) pjsip_msg_body_clone( pj_pool_t *pool,
-                                          pjsip_msg_body *dst_body,
-                                          const pjsip_msg_body *src_body )
+PJ_DEF(pj_status_t) pjsip_msg_body_copy( pj_pool_t *pool,
+                                         pjsip_msg_body *dst_body,
+                                         const pjsip_msg_body *src_body )
 {
     /* First check if clone_data field is initialized. */
@@ -1788 +1788 @@
 }
 
+
+PJ_DEF(pjsip_msg_body*) pjsip_msg_body_clone( pj_pool_t *pool,
+                                              const pjsip_msg_body *body )
+{
+    pjsip_msg_body *new_body;
+    pj_status_t status;
+
+    new_body = pj_pool_alloc(pool, sizeof(pjsip_msg_body));
+    PJ_ASSERT_RETURN(new_body, NULL);
+
+    status = pjsip_msg_body_copy(pool, new_body, body);
+
+    return (status==PJ_SUCCESS) ? new_body : NULL;
+}
+
+
+PJ_DEF(pjsip_msg_body*) pjsip_msg_body_create( pj_pool_t *pool,
+                                               const pj_str_t *type,
+                                               const pj_str_t *subtype,
+                                               const pj_str_t *text )
+{
+    pjsip_msg_body *body;
+
+    PJ_ASSERT_RETURN(pool && type && subtype && text, NULL);
+
+    body = pj_pool_zalloc(pool, sizeof(pjsip_msg_body));
+    PJ_ASSERT_RETURN(body != NULL, NULL);
+
+    pj_strdup(pool, &body->content_type.type, type);
+    pj_strdup(pool, &body->content_type.subtype, subtype);
+    body->content_type.param.slen = 0;
+
+    body->data = pj_pool_alloc(pool, text->slen);
+    pj_memcpy(body->data, text->ptr, text->slen);
+    body->len = text->slen;
+
+    body->clone_data = &pjsip_clone_text_data;
+    body->print_body = &pjsip_print_text_body;
+
+    return body;
+}
+

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1236 +1236 @@
     /* Add the message body, if any. */
     if (body) {
-        tdata->msg->body = pj_pool_alloc(tdata->pool, sizeof(pjsip_msg_body));
-        status = pjsip_msg_body_clone( tdata->pool, tdata->msg->body, body );
-        if (status != PJ_SUCCESS) {
+        tdata->msg->body = pjsip_msg_body_clone( tdata->pool, body );
+        if (tdata->msg->body == NULL) {
             pjsip_tx_data_dec_ref(tdata);
             return status;
@@ -1296 +1295 @@
     /* Add the message body, if any. */
     if (body) {
-        tdata->msg->body = pj_pool_alloc(tdata->pool, sizeof(pjsip_msg_body));
-        status = pjsip_msg_body_clone( tdata->pool, tdata->msg->body, body );
-        if (status != PJ_SUCCESS) {
+        tdata->msg->body = pjsip_msg_body_clone( tdata->pool, body );
+        if (tdata->msg->body == NULL) {
             pjsip_tx_data_dec_ref(tdata);
             return status;
@@ -1318 +1316 @@
     if (status != PJ_SUCCESS) {
         pjsip_tx_data_dec_ref(tdata);
-    } else {
+    } else if (p_tsx) {
         *p_tsx = tsx;
     }