make fore-subscription-expires only work on nonzero expire deltas, 0 means unscubscribe

This commit is contained in:
Anthony Minessale 2010-09-13 15:27:10 -05:00
parent 0279261b0b
commit b77518685c
1 changed files with 5 additions and 1 deletions

View File

@ -2043,7 +2043,11 @@ void sofia_presence_handle_sip_i_subscribe(int status,
from_host = "n/a";
}
exp_delta = profile->force_subscription_expires ? profile->force_subscription_expires : (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
if ((exp_delta = sip->sip_expires ? sip->sip_expires->ex_delta : 3600)) {
if (profile->force_subscription_expires) {
exp_delta = profile->force_subscription_expires;
}
}
if (exp_delta) {
exp_abs = (long) switch_epoch_time_now(NULL) + exp_delta;