FS-3685 --resolve

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 6c228edb1ddc4149d314e10e1889718150deda5e..55900b92d7e4927afbe5a99e4307f79350004f63 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -2788,7 +2788,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
        }
 
        if ((exp_delta = sip->sip_expires ? sip->sip_expires->ex_delta : 3600)) {
-               if (profile->force_subscription_expires) {
+               if ((profile->force_subscription_expires > 0) && (profile->force_subscription_expires < (uint32_t)exp_delta)) {
                        exp_delta = profile->force_subscription_expires;
                }
        }
@@ -2840,7 +2840,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
                sql = switch_mprintf("update sip_subscriptions "
                                                         "set expires=%ld "
                                                         "where call_id='%q' and event='dialog' and hostname='%q' ",
-                                                        (long) switch_epoch_time_now(NULL) + (exp_delta * 2),
+                                                        (long) switch_epoch_time_now(NULL) + exp_delta,
                                                         call_id,
                                                         mod_sofia_globals.hostname);
                
@@ -2888,7 +2888,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
                                                                 proto, from_user, from_host, to_user, to_host, profile->presence_hosts ? profile->presence_hosts : to_host,
                                                                 event, contact_str, call_id, full_from, full_via,
                                                                 //sofia_test_pflag(profile, PFLAG_MULTIREG) ? switch_epoch_time_now(NULL) + exp_delta : exp_delta * -1,
-                                                                (long) switch_epoch_time_now(NULL) + (exp_delta * 2),
+                                                                (long) switch_epoch_time_now(NULL) + exp_delta,
                                                                 full_agent, accept, profile->name, mod_sofia_globals.hostname, np.network_port, np.network_ip, orig_proto);
 
                        switch_assert(sql != NULL);
@@ -2948,7 +2948,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
                        
                if (nh && nh->nh_ds && nh->nh_ds->ds_usage) {
                        /* nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); */
-                       nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta * 2, exp_delta * 2);
+                       nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta, exp_delta);
                }
 
                if (contactstr && (p = strchr(contactstr, '@'))) {
@@ -3323,7 +3323,7 @@ void sofia_presence_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, n
        }
                
        exp_delta = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
-       if (profile->force_publish_expires) {
+       if ((profile->force_publish_expires > 0) && (profile->force_publish_expires < (uint32_t)exp_delta)) {
                exp_delta = profile->force_publish_expires;
        }