Changeset 3339 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Oct 12, 2010 12:45:15 PM (14 years ago)

Author:

bennylp

Message:

Closed #1144: New presence callback to report subscription state (thanks Johan Lantz for the suggestion):

• added on_buddy_evsub_state() callback
• added sample implementation in pjsua_app.c

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (3 diffs)

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

@@ -1558 +1558 @@
         }
 
-        /* Call callback */
+        /* Call callbacks */
+        if (pjsua_var.ua_cfg.cb.on_buddy_evsub_state)
+            (*pjsua_var.ua_cfg.cb.on_buddy_evsub_state)(buddy->index, sub,
+                                                        event);
+
         if (pjsua_var.ua_cfg.cb.on_buddy_state)
             (*pjsua_var.ua_cfg.cb.on_buddy_state)(buddy->index);
@@ -1657 +1661 @@
 
 
-/* Event subscription callback. */
-static pjsip_evsub_user pres_callback = 
-{
-    &pjsua_evsub_on_state,  
-    &pjsua_evsub_on_tsx_state,
-
-    NULL,   /* on_rx_refresh: don't care about SUBSCRIBE refresh, unless 
-             * we want to authenticate 
-             */
-
-    &pjsua_evsub_on_rx_notify,
-
-    NULL,   /* on_client_refresh: Use default behaviour, which is to 
-             * refresh client subscription. */
-
-    NULL,   /* on_server_timeout: Use default behaviour, which is to send 
-             * NOTIFY to terminate. 
-             */
-};
-
-
 /* It does what it says.. */
 static void subscribe_buddy_presence(pjsua_buddy_id buddy_id)
 {
+    pjsip_evsub_user pres_callback;
     pj_pool_t *tmp_pool = NULL;
     pjsua_buddy *buddy;
@@ -1688 +1672 @@
     pjsip_tx_data *tdata;
     pj_status_t status;
+
+    /* Event subscription callback. */
+    pj_bzero(&pres_callback, sizeof(pres_callback));
+    pres_callback.on_evsub_state = &pjsua_evsub_on_state;
+    pres_callback.on_tsx_state = &pjsua_evsub_on_tsx_state;
+    pres_callback.on_rx_notify = &pjsua_evsub_on_rx_notify;
 
     buddy = &pjsua_var.buddy[buddy_id];