Changeset 2651 for pjproject

Timestamp:

Apr 27, 2009 2:30:10 PM (16 years ago)

Author:

bennylp

Message:

Ticket #693: Allow incoming MESSAGE request without message body

• also added SIPp scenario to test this

Location:

pjproject/trunk

Files:

• pjsip/src/pjsua-lib/pjsua_im.c (modified) (5 diffs)
• tests/pjsua/scripts-sipp/uac-message-no-body.xml (added)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c

@@ -128 +128 @@
         return PJ_FALSE;
     }
-#else
+#elif 0
     pjsip_msg *msg;
 
@@ -139 +139 @@
         return PJ_FALSE;
     }
+#else
+    /* Ticket #693: allow incoming MESSAGE without message body */
+    PJ_UNUSED_ARG(rdata);
+    PJ_UNUSED_ARG(p_accept_hdr);
 #endif
 
@@ -155 +159 @@
     pjsip_msg_body *body = rdata->msg_info.msg->body;
 
+#if 0
+    /* Ticket #693: allow incoming MESSAGE without message body */
     /* Body MUST have been checked before */
     pj_assert(body != NULL);
+#endif
 
 
@@ -173 +180 @@
     }
 
-    if (pj_stricmp(&body->content_type.type, &STR_MIME_APP)==0 &&
+    if (body && pj_stricmp(&body->content_type.type, &STR_MIME_APP)==0 &&
         pj_stricmp(&body->content_type.subtype, &STR_MIME_ISCOMPOSING)==0)
     {
@@ -215 +222 @@
         
         /* Save text body */
-        text_body.ptr = (char*)rdata->msg_info.msg->body->data;
-        text_body.slen = rdata->msg_info.msg->body->len;
-
-        /* Get mime type */
-        m = &rdata->msg_info.msg->body->content_type;
-        mime_type.ptr = buf;
-        mime_type.slen = pj_ansi_snprintf(buf, sizeof(buf),
-                                          "%.*s/%.*s",
-                                          (int)m->type.slen,
-                                          m->type.ptr,
-                                          (int)m->subtype.slen,
-                                          m->subtype.ptr);
-        if (mime_type.slen < 1)
-            mime_type.slen = 0;
+        if (body) {
+            text_body.ptr = (char*)rdata->msg_info.msg->body->data;
+            text_body.slen = rdata->msg_info.msg->body->len;
+
+            /* Get mime type */
+            m = &rdata->msg_info.msg->body->content_type;
+            mime_type.ptr = buf;
+            mime_type.slen = pj_ansi_snprintf(buf, sizeof(buf),
+                                              "%.*s/%.*s",
+                                              (int)m->type.slen,
+                                              m->type.ptr,
+                                              (int)m->subtype.slen,
+                                              m->subtype.ptr);
+            if (mime_type.slen < 1)
+                mime_type.slen = 0;
+
+
+        } else {
+            text_body.ptr = mime_type.ptr = "";
+            text_body.slen = mime_type.slen = 0;
+        }
 
         if (pjsua_var.ua_cfg.cb.on_pager) {