Changeset 2264 for pjproject/trunk

Timestamp:

Sep 8, 2008 12:46:29 PM (16 years ago)

Author:

bennylp

Message:

Ticket #615: Error adding new buddy in the on_incoming_subscribe() callback (thanks Joseph Maiquez for reporting the error)

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (1 diff)

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

@@ -1180 +1180 @@
 
         pjsip_pres_get_status(uapres->sub, &pres_status);
-        if (force || pres_status.info[0].basic_open != acc->online_status) {
+
+        /* Only send NOTIFY once subscription is active. Some subscriptions
+         * may still be in NULL (when app is adding a new buddy while in the
+         * on_incoming_subscribe() callback) or PENDING (when user approval is
+         * being requested) state and we don't send NOTIFY to these subs until
+         * the user accepted the request.
+         */
+        if (pjsip_evsub_get_state(uapres->sub)==PJSIP_EVSUB_STATE_ACTIVE &&
+            (force || pres_status.info[0].basic_open != acc->online_status)) 
+        {
 
             pres_status.info[0].basic_open = acc->online_status;