make sure registration with expires=0 is allowed

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index a8440a63daf3b887a4011ccd9729025d8e15a91c..802afe7256b4e8fc79b074431f25ba49532b7e77 100644 (file)
--- 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 49e0ec3cc8c7c1a01e5e233328a8d961d107b8ed..cf767580708c861e409033de7ffb7bbd213c067e 100644 (file)
--- 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;
 }