Changeset 519

Timestamp:

Jun 19, 2006 12:03:35 PM (18 years ago)

Author:

bennylp

Message:

Changed in presence: incoming NOTIFY without body will not change presence status (previously it will set status to closed)

File:

• pjproject/trunk/pjsip/src/pjsip-simple/presence.c (modified) (2 diffs)

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

@@ -898 +898 @@
     PJ_ASSERT_ON_FAIL(pres!=NULL, {return;});
 
-    /* Only process the message body if it exists, otherwise treat as
-     * presence status is closed. 
-     */
     if (rdata->msg_info.msg->body) {
         status = pres_process_rx_notify( pres, rdata, p_st_code, p_st_text,
@@ -908 +905 @@
 
     } else {
+        /* This has just been changed. Previously, we treat incoming NOTIFY
+         * with no message body as having the presence subscription closed.
+         * Now we treat it as no change in presence status (ref: EyeBeam).
+         */
+#if 1
+        *p_st_code = 200;
+        return;
+#else
         unsigned i;
-
         /* Subscription is terminated. Consider contact is offline */
         pres->tmp_status._is_valid = PJ_TRUE;
         for (i=0; i<pres->tmp_status.info_cnt; ++i)
             pres->tmp_status.info[i].basic_open = PJ_FALSE;
+#endif
     }