sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1311 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2007-05-29 00:33:09 +00:00
parent b6e8bd4e90
commit 7a5f5106af
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pjsip/include/pjsua-lib/pjsua_internal.h
View File

@ -206,6 +206,9 @@ struct pjsua_data
unsigned buddy_cnt; /**< Buddy count. */
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. */
pjmedia_endpt *med_endpt; /**< Media endpoint. */

40
pjsip/src/pjsua-lib/pjsua_pres.c
View File

@ -22,6 +22,10 @@
#define THIS_FILE "pjsua_pres.c"
#ifndef PJSUA_PRES_TIMER
# define PJSUA_PRES_TIMER 120
#endif
/*
* Get total number of buddies.
@ -1133,6 +1137,25 @@ static void refresh_client_subscriptions(void)
}
}
/* 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();
}
/*
* Init presence
@ -1161,7 +1184,17 @@ pj_status_t pjsua_pres_init()
*/
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,6 +1222,11 @@ void pjsua_pres_shutdown(void)
{
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) {
if (!pjsua_var.acc[i].valid)
continue;