Module: kamailio Branch: master Commit: b8d6b99a36e57b65f7b7d9fba321e2088032178b URL: https://github.com/kamailio/kamailio/commit/b8d6b99a36e57b65f7b7d9fba321e208...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2016-10-31T20:36:13+01:00

rtjson: use json macros to retrieve int values

---

Modified: modules/rtjson/rtjson_routing.c

---

Diff: https://github.com/kamailio/kamailio/commit/b8d6b99a36e57b65f7b7d9fba321e208... Patch: https://github.com/kamailio/kamailio/commit/b8d6b99a36e57b65f7b7d9fba321e208...

---

diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index bb59da5..5542e63 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -371,8 +371,8 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) }

rj = srjson_GetObjectItem(jdoc, nj, "branch_flags"); - if(rj!=NULL && rj->type==srjson_Number && rj->valueint!=0) { - bflags = rj->valueint; + if(rj!=NULL && rj->type==srjson_Number && SRJSON_GET_UINT(rj)!=0) { + bflags = SRJSON_GET_UINT(rj);

old_bflags = 0; getbflagsval(0, &old_bflags); @@ -406,12 +406,12 @@ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj)

if(tmb.set_fr!=NULL) { rj = srjson_GetObjectItem(jdoc, nj, "fr_timer"); - if(rj!=NULL && rj->type==srjson_Number && rj->valueint!=0) { - fr = rj->valueint; + if(rj!=NULL && rj->type==srjson_Number && SRJSON_GET_UINT(rj)!=0) { + fr = SRJSON_GET_UINT(rj); } rj = srjson_GetObjectItem(jdoc, nj, "fr_inv_timer"); - if(rj!=NULL && rj->type==srjson_Number && rj->valueint!=0) { - fr_inv = rj->valueint; + if(rj!=NULL && rj->type==srjson_Number && SRJSON_GET_UINT(rj)!=0) { + fr_inv = SRJSON_GET_UINT(rj); } if(fr || fr_inv) tmb.set_fr(msg, fr_inv, fr); }