Changeset 1311 for pjproject/trunk

Timestamp:

May 29, 2007 12:33:09 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #91: timer to re-subscribe buddy's presence when subscription failed

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -207 +207 @@
     pjsua_buddy          buddy[PJSUA_MAX_BUDDIES];  /**< Buddy array.   */
 
+    /* Presence: */
+    pj_timer_entry       pres_timer;/**< Presence refresh timer.        */
+
     /* Media: */
     pjsua_media_config   media_cfg; /**< Media config.                  */

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

@@ -23 +23 @@
 #define THIS_FILE   "pjsua_pres.c"
 
+#ifndef PJSUA_PRES_TIMER
+#   define PJSUA_PRES_TIMER     120
+#endif
+
 
 /*
@@ -1134 +1138 @@
 }
 
+/* Timer callback to re-create client subscription */
+static void pres_timer_cb(pj_timer_heap_t *th,
+                          pj_timer_entry *entry)
+{
+    pj_time_val delay = { PJSUA_PRES_TIMER, 0 };
+
+    PJ_UNUSED_ARG(th);
+
+    PJSUA_LOCK();
+
+    entry->id = PJ_FALSE;
+    refresh_client_subscriptions();
+
+    pjsip_endpt_schedule_timer(pjsua_var.endpt, entry, &delay);
+    entry->id = PJ_TRUE;
+
+    PJSUA_UNLOCK();
+}
+
 
 /*
@@ -1162 +1185 @@
 pj_status_t pjsua_pres_start(void)
 {
-    /* Nothing to do (is it?) */
+    /* Start presence timer to re-subscribe to buddy's presence when
+     * subscription has failed.
+     */
+    if (pjsua_var.pres_timer.id == PJ_FALSE) {
+        pj_time_val pres_interval = {PJSUA_PRES_TIMER, 0};
+
+        pjsua_var.pres_timer.cb = &pres_timer_cb;
+        pjsip_endpt_schedule_timer(pjsua_var.endpt, &pjsua_var.pres_timer,
+                                   &pres_interval);
+    }
+
     return PJ_SUCCESS;
 }
@@ -1189 +1222 @@
 {
     unsigned i;
+
+    if (pjsua_var.pres_timer.id != 0) {
+        pjsip_endpt_cancel_timer(pjsua_var.endpt, &pjsua_var.pres_timer);
+        pjsua_var.pres_timer.id = PJ_FALSE;
+    }
 
     for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {