From 04fa4d457b3b584eae8c5964a48a97ec4040c94a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 30 Apr 2012 14:34:48 +0200 Subject: [PATCH] make sure registration with expires=0 is allowed --- coreapi/linphonecore.c | 4 ++-- coreapi/proxy.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index a8440a63..802afe72 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4393,7 +4393,7 @@ void linphone_core_refresh_registers(LinphoneCore* lc) { elem=linphone_core_get_proxy_config_list(lc); for(;elem!=NULL;elem=elem->next){ LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data; - if (linphone_proxy_config_register_enabled(cfg) ) { + if (linphone_proxy_config_register_enabled(cfg) && linphone_proxy_config_get_expires(cfg)>0) { linphone_proxy_config_refresh_register(cfg); } } @@ -4403,7 +4403,7 @@ void __linphone_core_invalidate_registers(LinphoneCore* lc){ const MSList *elem=linphone_core_get_proxy_config_list(lc); for(;elem!=NULL;elem=elem->next){ LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data; - if (linphone_proxy_config_register_enabled(cfg) ) { + if (linphone_proxy_config_register_enabled(cfg)) { linphone_proxy_config_edit(cfg); linphone_proxy_config_done(cfg); } diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 49e0ec3c..cf767580 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -218,7 +218,7 @@ void linphone_proxy_config_enableregister(LinphoneProxyConfig *obj, bool_t val){ * Sets the registration expiration time in seconds. **/ void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int val){ - if (val<=0) val=600; + if (val<0) val=600; obj->expires=val; } -- 2.39.2