Changeset 3363 for pjproject/trunk

Timestamp:

Nov 10, 2010 12:13:46 PM (14 years ago)

Author:

bennylp

Message:

Fixed #1156: New option to ignore bad NOTIFY presence message body (thanks Johan Lantz for the suggestion)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip-simple/presence.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -902 +902 @@
 
 /**
+ * Specify the status code value to respond to bad message body in NOTIFY
+ * request for presence. Scenarios that are considered bad include non-
+ * PIDF/XML and non-XPIDF/XML body, multipart message bodies without PIDF/XML
+ * nor XPIDF/XML part, and bad (parsing error) PIDF and X-PIDF bodies
+ * themselves.
+ *
+ * Default value is 488. Application may change this to 200 to ignore the
+ * unrecognised content (this is useful if the application wishes to handle
+ * the content itself). Only non-3xx final response code is allowed here.
+ *
+ * Default: 488 (Not Acceptable Here)
+ */
+#ifndef PJSIP_PRES_BAD_CONTENT_RESPONSE
+#   define PJSIP_PRES_BAD_CONTENT_RESPONSE      488
+#endif
+
+
+/**
  * Add "timestamp" information in generated PIDF document for both server
  * subscription and presence publication.

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

@@ -36 +36 @@
 #define PRES_DEFAULT_EXPIRES        PJSIP_PRES_DEFAULT_EXPIRES
 
+#if PJSIP_PRES_BAD_CONTENT_RESPONSE < 200 || \
+    PJSIP_PRES_BAD_CONTENT_RESPONSE > 699 || \
+    PJSIP_PRES_BAD_CONTENT_RESPONSE/100 == 3
+# error Invalid PJSIP_PRES_BAD_CONTENT_RESPONSE value
+#endif
+
 /*
  * Presence module (mod-presence)
@@ -760 +766 @@
     if (status != PJ_SUCCESS) {
         /* Unsupported or bad Content-Type */
-        pjsip_accept_hdr *accept_hdr;
-        pjsip_warning_hdr *warn_hdr;
-
-        *p_st_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;
-
-        /* Add Accept header */
-        accept_hdr = pjsip_accept_hdr_create(rdata->tp_info.pool);
-        accept_hdr->values[accept_hdr->count++] = STR_APP_PIDF_XML;
-        accept_hdr->values[accept_hdr->count++] = STR_APP_XPIDF_XML;
-        pj_list_push_back(res_hdr, accept_hdr);
-
-        /* Add Warning header */
-        warn_hdr = pjsip_warning_hdr_create_from_status(
-                                    rdata->tp_info.pool,
-                                    pjsip_endpt_name(pres->dlg->endpt),
-                                    status);
-        pj_list_push_back(res_hdr, warn_hdr);
-
-        return status;
+        if (PJSIP_PRES_BAD_CONTENT_RESPONSE >= 300) {
+            pjsip_accept_hdr *accept_hdr;
+            pjsip_warning_hdr *warn_hdr;
+
+            *p_st_code = PJSIP_PRES_BAD_CONTENT_RESPONSE;
+
+            /* Add Accept header */
+            accept_hdr = pjsip_accept_hdr_create(rdata->tp_info.pool);
+            accept_hdr->values[accept_hdr->count++] = STR_APP_PIDF_XML;
+            accept_hdr->values[accept_hdr->count++] = STR_APP_XPIDF_XML;
+            pj_list_push_back(res_hdr, accept_hdr);
+
+            /* Add Warning header */
+            warn_hdr = pjsip_warning_hdr_create_from_status(
+                                        rdata->tp_info.pool,
+                                        pjsip_endpt_name(pres->dlg->endpt),
+                                        status);
+            pj_list_push_back(res_hdr, warn_hdr);
+
+            return status;
+        } else {
+            pj_assert(PJSIP_PRES_BAD_CONTENT_RESPONSE/100 == 2);
+            PJ_PERROR(4,(THIS_FILE, status,
+                         "Ignoring presence error due to "
+                         "PJSIP_PRES_BAD_CONTENT_RESPONSE setting [%d]",
+                         PJSIP_PRES_BAD_CONTENT_RESPONSE));
+            *p_st_code = PJSIP_PRES_BAD_CONTENT_RESPONSE;
+            status = PJ_SUCCESS;
+        }
     }