[sr-dev] git:master:51c558c9: ims_registrar_scscf: Refactor expire calculation

[Federico Favaro]

Module: kamailio
Branch: master
Commit: 51c558c94293e1430e271c3772658a671c26960d
URL: https://github.com/kamailio/kamailio/commit/51c558c94293e1430e271c3772658a671c26960d

Author: Federico Favaro <federico at aereo.lan.athonet.com>
Committer: Federico Favaro <federico at aereo.lan.athonet.com>
Date: 2016-07-07T12:01:50+02:00

ims_registrar_scscf: Refactor expire calculation

Now the expire values is searched on the contact
If no expires parameter is present, a fallaback
on Expires header is done. If both are not found
the default value is chosen

---

Modified: modules/ims_registrar_scscf/save.c

---

Diff:  https://github.com/kamailio/kamailio/commit/51c558c94293e1430e271c3772658a671c26960d.diff
Patch: https://github.com/kamailio/kamailio/commit/51c558c94293e1430e271c3772658a671c26960d.patch

---

diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c
index 624e0a9..15d2571 100644
--- a/modules/ims_registrar_scscf/save.c
+++ b/modules/ims_registrar_scscf/save.c
@@ -109,39 +109,35 @@ static inline int randomize_expires(int expires, int range) {
  *    the default value
  */
 static inline int calc_contact_expires(contact_t *c, int expires_hdr, int sos_reg) {
-    unsigned int r;
-
-    if (expires_hdr >= 0U)
-        r = expires_hdr;
-    else {
-        r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires;
-        goto end;
-    }
-    if (c && c->expires)
-        str2int(&(c->expires->body), (unsigned int*) &r);
-    if (r > 0) {
-        if (!sos_reg && r < default_registrar_cfg.min_expires) {
-            r = default_registrar_cfg.min_expires;
-            goto end;
-        }
-        if (sos_reg && r < default_registrar_cfg.em_min_expires) {
-            r = default_registrar_cfg.em_min_expires;
-            goto end;
-        }
-    }
-    if (!sos_reg && r > default_registrar_cfg.max_expires) {
-        r = default_registrar_cfg.max_expires;
-        goto end;
-    }
-    if (sos_reg && r > default_registrar_cfg.em_max_expires)
-        r = default_registrar_cfg.em_min_expires;
-
+	int r;
+	if(c && c->expires)
+		str2int(&(c->expires->body), (unsigned int*) &r);
+	else if (expires_hdr >= 0)
+		r = expires_hdr;
+	else {
+		r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires;
+		goto end;
+	}
+	if (!sos_reg && r < default_registrar_cfg.min_expires) {
+		r = default_registrar_cfg.min_expires;
+		goto end;
+	}
+	if (sos_reg && r < default_registrar_cfg.em_min_expires) {
+		r = default_registrar_cfg.em_min_expires;
+		goto end;
+	}
+	if (!sos_reg && r > default_registrar_cfg.max_expires) {
+		r = default_registrar_cfg.max_expires;
+		goto end;
+	}
+	if (sos_reg && r > default_registrar_cfg.em_max_expires) {
+		r = default_registrar_cfg.em_min_expires;
+		goto end;
+	}
 end:
-
-    r = randomize_expires(r, default_registrar_cfg.default_expires_range);
-
-    LM_DBG("Calculated expires for contact is %d\n", r);
-    return time(NULL) + r;
+	r = randomize_expires(r, default_registrar_cfg.default_expires_range);
+	LM_DBG("Calculated expires for contact is %d\n", r);
+	return time(NULL) + r;
 }
 
 /*! \brief