Changeset 1272 for pjproject

Timestamp:

May 14, 2007 4:45:20 PM (18 years ago)

Author:

bennylp

Message:

Ticket #274: the From parameter on_pager() callback contains Contact instead (thanks Nicholas Xu), and also allow non-text/plain IM messages

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_im.c (modified) (8 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1676 +1676 @@
     PJ_UNUSED_ARG(mime_type);
 
-    PJ_LOG(3,(THIS_FILE,"MESSAGE from %.*s: %.*s",
+    PJ_LOG(3,(THIS_FILE,"MESSAGE from %.*s: %.*s (%.*s)",
               (int)from->slen, from->ptr,
-              (int)text->slen, text->ptr));
+              (int)text->slen, text->ptr,
+              (int)mime_type->slen, mime_type->ptr));
 }
 

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

@@ -73 +73 @@
 
 /* Check if content type is acceptable */
+#if 0
 static pj_bool_t acceptable_message(const pjsip_media_type *mime)
 {
@@ -81 +82 @@
             pj_stricmp(&mime->subtype, &STR_MIME_ISCOMPOSING)==0);
 }
-
+#endif
 
 /**
@@ -105 +106 @@
                                 pjsip_accept_hdr **p_accept_hdr)
 {
+    /* Some UA sends text/html, so this check will break */
+#if 0
     pjsip_ctype_hdr *ctype;
     pjsip_msg *msg;
@@ -124 +127 @@
         return PJ_FALSE;
     }
+#else
+    PJ_UNUSED_ARG(rdata);
+    PJ_UNUSED_ARG(p_accept_hdr);
+#endif
 
     return PJ_TRUE;
@@ -157 +164 @@
     }
 
-
-    if (pj_stricmp(&body->content_type.type, &STR_MIME_TEXT)==0 &&
-        pj_stricmp(&body->content_type.subtype, &STR_MIME_PLAIN)==0)
+    if (pj_stricmp(&body->content_type.type, &STR_MIME_APP)==0 &&
+        pj_stricmp(&body->content_type.subtype, &STR_MIME_ISCOMPOSING)==0)
     {
-        const pj_str_t mime_text_plain = pj_str("text/plain");
-        pj_str_t text_body;
-        
-        /* Save text body */
-        text_body.ptr = (char*) rdata->msg_info.msg->body->data;
-        text_body.slen = rdata->msg_info.msg->body->len;
-
-        if (pjsua_var.ua_cfg.cb.on_pager) {
-            (*pjsua_var.ua_cfg.cb.on_pager)(call_id, from, to, &contact, 
-                                            &mime_text_plain, &text_body);
-        }
-
-    } else {
         /* Expecting typing indication */
         pj_status_t status;
@@ -190 +183 @@
                                              is_typing);
         }
+
+    } else {
+        pj_str_t mime_type;
+        char buf[256];
+        pjsip_media_type *m;
+        pj_str_t text_body;
+        
+        /* Save text body */
+        text_body.ptr = 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 (pjsua_var.ua_cfg.cb.on_pager) {
+            (*pjsua_var.ua_cfg.cb.on_pager)(call_id, from, to, &contact, 
+                                            &mime_type, &text_body);
+        }
     }
 
@@ -202 +222 @@
     pj_str_t from, to;
     pjsip_accept_hdr *accept_hdr;
-    pjsip_contact_hdr *contact_hdr;
     pjsip_msg *msg;
     pj_status_t status;
@@ -243 +262 @@
      * not available, then use From header.
      */
-    from.ptr = (char*) pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
-    contact_hdr = (pjsip_contact_hdr*)
-                  pjsip_msg_find_hdr(rdata->msg_info.msg,
-                                     PJSIP_H_CONTACT, NULL);
-    if (contact_hdr) {
-        from.slen = pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR,
-                                    contact_hdr->uri, 
-                                    from.ptr, PJSIP_MAX_URL_SIZE);
-    } else {
-        from.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, 
-                                    rdata->msg_info.from->uri,
-                                    from.ptr, PJSIP_MAX_URL_SIZE);
-    }
+    from.ptr = pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
+    from.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, 
+                                rdata->msg_info.from->uri,
+                                from.ptr, PJSIP_MAX_URL_SIZE);
 
     if (from.slen < 1)