sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:master:b8d6b99a: rtjson: use json macros to retrieve int values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b8d6b99a36e57b65f7b7d9fba321e2088032178b URL: https://github.com/kamailio/kamailio/commit/b8d6b99a36e57b65f7b7d9fba321e20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)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/b8d6b99a36e57b65f7b7d9fba321e20… Patch: https://github.com/kamailio/kamailio/commit/b8d6b99a36e57b65f7b7d9fba321e20… --- 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); }

7 years, 6 months

git:master:114ec80c: htable: switched to json macros for numbers in dmq operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 114ec80c58f06c876fc76d884b73095c5dcc8bff URL: https://github.com/kamailio/kamailio/commit/114ec80c58f06c876fc76d884b73095… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T20:25:13+01:00 htable: switched to json macros for numbers in dmq operations --- Modified: modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/114ec80c58f06c876fc76d884b73095… Patch: https://github.com/kamailio/kamailio/commit/114ec80c58f06c876fc76d884b73095… --- diff --git a/modules/htable/ht_dmq.c b/modules/htable/ht_dmq.c index 0983f61..975daf0 100644 --- a/modules/htable/ht_dmq.c +++ b/modules/htable/ht_dmq.c @@ -142,7 +142,7 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq { LM_DBG("found field: %s\n", it->string); if (strcmp(it->string, "action")==0) { - action = it->valueint; + action = SRJSON_GET_INT(it); } else if (strcmp(it->string, "htname")==0) { htname.s = it->valuestring; htname.len = strlen(htname.s); @@ -150,14 +150,14 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq cname.s = it->valuestring; cname.len = strlen(cname.s); } else if (strcmp(it->string, "type")==0) { - type = it->valueint; + type = SRJSON_GET_INT(it); } else if (strcmp(it->string, "strval")==0) { val.s.s = it->valuestring; val.s.len = strlen(val.s.s); } else if (strcmp(it->string, "intval")==0) { - val.n = it->valueint; + val.n = SRJSON_GET_INT(it); } else if (strcmp(it->string, "mode")==0) { - mode = it->valueint; + mode = SRJSON_GET_INT(it); } else { LM_ERR("unrecognized field in json object\n"); goto invalid;

7 years, 6 months

git:master:f68f0864: dmq_usrloc: use usigned int for contact info values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f68f0864c77e8556e48db4d5681ba8dc3ea06f62 URL: https://github.com/kamailio/kamailio/commit/f68f0864c77e8556e48db4d5681ba8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T20:18:34+01:00 dmq_usrloc: use usigned int for contact info values - switched to using json helper macros for numbers --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/f68f0864c77e8556e48db4d5681ba8d… Patch: https://github.com/kamailio/kamailio/commit/f68f0864c77e8556e48db4d5681ba8d… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 9fd6322..5cc7cf5 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -316,10 +316,12 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* srjson_t *it = NULL; static ucontact_info_t ci; - int action, expires, cseq, flags, cflags, q, last_modified, methods, reg_id; + unsigned int action, expires, cseq, flags, cflags, q, last_modified, + methods, reg_id; str aor, ruid, c, received, path, callid, user_agent, instance; - action = expires = cseq = flags = cflags = q = last_modified = methods = reg_id = 0; + action = expires = cseq = flags = cflags = q = last_modified + = methods = reg_id = 0; parse_from_header(msg); body = ((struct to_body*)msg->from->parsed)->uri; @@ -360,7 +362,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* if (it->string == NULL) continue; if (strcmp(it->string, "action")==0) { - action = it->valueint; + action = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "aor")==0) { aor.s = it->valuestring; aor.len = strlen(aor.s); @@ -386,21 +388,21 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* instance.s = it->valuestring; instance.len = strlen(instance.s); } else if (strcmp(it->string, "expires")==0) { // - expires = it->valueint; + expires = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "cseq")==0) { - cseq = it->valueint; + cseq = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "flags")==0) { - flags = it->valueint; + flags = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "cflags")==0) { - cflags = it->valueint; + cflags = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "q")==0) { - q = it->valueint; + q = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "last_modified")==0) { - last_modified = it->valueint; + last_modified = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "methods")==0) { - methods = it->valueint; + methods = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "reg_id")==0) { - reg_id = it->valueint; + reg_id = SRJSON_GET_UINT(it); } else { LM_ERR("unrecognized field in json object\n"); }

7 years, 6 months

git:master:3ab5a9e5: dialog: fixed conditions for dmq addition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ab5a9e51f2ed4d50a2382dc4a42ece4ff2597e1 URL: https://github.com/kamailio/kamailio/commit/3ab5a9e51f2ed4d50a2382dc4a42ece… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T20:13:19+01:00 dialog: fixed conditions for dmq addition - switched to use the helper json macros --- Modified: modules/dialog/dlg_dmq.c Modified: modules/dialog/dlg_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/3ab5a9e51f2ed4d50a2382dc4a42ece… Patch: https://github.com/kamailio/kamailio/commit/3ab5a9e51f2ed4d50a2382dc4a42ece…

7 years, 6 months

git:master:d7653eb9: dialog: converted to use json helper macros for dlg profile

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7653eb9e7e6ffe21988f2a616deae0c01083c57 URL: https://github.com/kamailio/kamailio/commit/d7653eb9e7e6ffe21988f2a616deae0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T20:12:58+01:00 dialog: converted to use json helper macros for dlg profile --- Modified: modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/d7653eb9e7e6ffe21988f2a616deae0… Patch: https://github.com/kamailio/kamailio/commit/d7653eb9e7e6ffe21988f2a616deae0… --- diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index a6c1434..174be97 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -1280,9 +1280,9 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) puid.s = jt->valuestring; puid.len = strlen(puid.s); } else if(strcmp(jt->string, "expires")==0) { - expires = (time_t)jt->valueint; + expires = (time_t)SRJSON_GET_ULONG(jt); } else if(strcmp(jt->string, "flags")==0) { - flags = jt->valueint; + flags = SRJSON_GET_UINT(jt); } } if(name.s==NULL)

7 years, 6 months

git:master:ecd22245: lib/srutils: removed valueint field from json struct

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ecd22245336f2d3d6d2f9404ebfdd4369f19bd97 URL: https://github.com/kamailio/kamailio/commit/ecd22245336f2d3d6d2f9404ebfdd43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T20:10:36+01:00 lib/srutils: removed valueint field from json struct - numbers are stored in the valuedouble - helper macros added to retrivie fixed type numbers --- Modified: lib/srutils/srjson.c Modified: lib/srutils/srjson.h --- Diff: https://github.com/kamailio/kamailio/commit/ecd22245336f2d3d6d2f9404ebfdd43… Patch: https://github.com/kamailio/kamailio/commit/ecd22245336f2d3d6d2f9404ebfdd43… --- diff --git a/lib/srutils/srjson.c b/lib/srutils/srjson.c index b8c1945..fdaf87a 100644 --- a/lib/srutils/srjson.c +++ b/lib/srutils/srjson.c @@ -193,7 +193,6 @@ static const char *parse_number(srjson_doc_t *doc, srjson_t *item, const char *n * 10^+/- exponent */ item->valuedouble = n; - item->valueint = (int) n; item->type = srjson_Number; return num; } @@ -203,12 +202,13 @@ static char *print_number(srjson_doc_t *doc, srjson_t *item) { char *str; double d = item->valuedouble; - if (fabs(((double) item->valueint) - d) <= DBL_EPSILON && d <= INT_MAX && d >= INT_MIN) { + int i = (int)d; + if (fabs(((double) i) - d) <= DBL_EPSILON && d <= INT_MAX && d >= INT_MIN) { str = (char *) doc->malloc_fn(21); /* 2^64+1 can be * represented in 21 * chars. */ if (str) - sprintf(str, "%d", item->valueint); + sprintf(str, "%d", i); } else { str = (char *) doc->malloc_fn(64); /* This is a nice * tradeoff. */ @@ -452,7 +452,6 @@ static const char *parse_value(srjson_doc_t *doc, srjson_t *item, const char *va } if (!strncmp(value, "true", 4)) { item->type = srjson_True; - item->valueint = 1; return value + 4; } if (*value == '\"') { @@ -956,7 +955,6 @@ srjson_t *srjson_CreateNumber(srjson_doc_t *doc, double num) { if (item) { item->type = srjson_Number; item->valuedouble = num; - item->valueint = (int) num; } return item; } diff --git a/lib/srutils/srjson.h b/lib/srutils/srjson.h index 02d65d7..c46f121 100644 --- a/lib/srutils/srjson.h +++ b/lib/srutils/srjson.h @@ -47,6 +47,13 @@ extern "C" #define srjson_IsReference 256 +/* helper macros */ + +#define SRJSON_GET_INT(sj) ((int)((sj)->valuedouble)) +#define SRJSON_GET_UINT(sj) ((unsigned int)((sj)->valuedouble)) +#define SRJSON_GET_LONG(sj) ((long)((sj)->valuedouble)) +#define SRJSON_GET_ULONG(sj) ((unsigned long)((sj)->valuedouble)) + /* The srjson node structure: */ typedef struct srjson { struct srjson *parent; @@ -64,8 +71,6 @@ typedef struct srjson { int type; /* The type of the item, as above. */ char *valuestring; /* The item's string, if * type==srjson_String */ - int valueint; /* The item's number, if - * type==srjson_Number */ double valuedouble; /* The item's number, if * type==srjson_Number */ char *string; /* The item's name string, if this

7 years, 6 months

git:master:c5681600: ndb_redis: get the srv structure after checking parameter sanity

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5681600a5fdd650a4830e77aca2b4804766ccfa URL: https://github.com/kamailio/kamailio/commit/c5681600a5fdd650a4830e77aca2b48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T15:28:22+01:00 ndb_redis: get the srv structure after checking parameter sanity --- Modified: modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/c5681600a5fdd650a4830e77aca2b48… Patch: https://github.com/kamailio/kamailio/commit/c5681600a5fdd650a4830e77aca2b48… --- diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index dff2ef2..274c165 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -364,7 +364,6 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) va_start(ap, cmd); va_copy(ap2, ap); - rsrv = redisc_get_server(srv); if(srv==NULL || cmd==NULL || res==NULL) { LM_ERR("invalid parameters"); @@ -375,6 +374,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) LM_ERR("invalid parameters"); goto error_exec; } + rsrv = redisc_get_server(srv); if(rsrv==NULL) { LM_ERR("no redis server found: %.*s\n", srv->len, srv->s);

7 years, 6 months

[kamailio/kamailio] uac rewrites from user with non valid string (#833)

by vinzens

While making an basic call with uac_reg User though kamailio, the FROM Uri gets re-written within the Bye message. Here according code it should xor the old uri with new uri. But it seems the old uri is damaged or read from non valid string. We have this issue in Live environment and in DEV. Funny part is the string seems to be always the same on one system, but different between the systems. In our DEV the string Contains a " which brings the from URI Parser to crash. On Live there are only valid letters so it's just damaged, but the Bye is working. Attached you can find a trace from that scenario Basic call A to B and B Answers the call and Hangs up. The bye is sedn OK to Kamailio and the Bye from Kamailio to A is broken (from uri). Logs with debug level 1 and 5 are also attached. We are able to reproduce it in our development setup so we can make retests all the time. [kamailio_prob.zip](https://github.com/kamailio/kamailio/files/555579/kamail… -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/833

7 years, 6 months

git:master:49dd3315: uac: safety check for new uri to include only printable characters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49dd3315b7298addeaa85dd1628cd0a25ddef5b1 URL: https://github.com/kamailio/kamailio/commit/49dd3315b7298addeaa85dd1628cd0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T13:54:21+01:00 uac: safety check for new uri to include only printable characters - related to GH #833 --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/49dd3315b7298addeaa85dd1628cd0a… Patch: https://github.com/kamailio/kamailio/commit/49dd3315b7298addeaa85dd1628cd0a… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index 05304b1..2fb09aa 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -527,8 +527,8 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, str param_val; str add_to_rr = {0, 0}; struct to_body* old_body; - str old_uri; - str new_uri; + str old_uri = {0, 0}; + str new_uri = {0, 0}; char *p; int i; int_str avp_value; @@ -570,16 +570,16 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, pkg_free(add_to_rr.s); add_to_rr.s = NULL; - /* dencrypt parameter ;) */ - if (uac_passwd.len) + /* decrypt parameter */ + if (uac_passwd.len) { for( i=0 ; i<new_uri.len ; i++) new_uri.s[i] ^= uac_passwd.s[i%uac_passwd.len]; + } /* check the request direction */ - if ( - (check_from && uac_rrb.is_direction( msg, RR_FLOW_UPSTREAM)==0) || - (!check_from && uac_rrb.is_direction( msg,RR_FLOW_DOWNSTREAM)==0) - ) { + if ( (check_from && uac_rrb.is_direction(msg, RR_FLOW_UPSTREAM)==0) + || (!check_from && uac_rrb.is_direction(msg, RR_FLOW_DOWNSTREAM)==0) + ) { /* replace the TO URI */ if ( msg->to==0 && (parse_headers(msg,HDR_TO_F,0)!=0 || msg->to==0) ) { LM_ERR("failed to parse TO hdr\n"); @@ -637,6 +637,16 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, goto failed; } + /* check if new uri has valid characters */ + for(i=0; i<new_uri.len; i++) { + if(!isprint(new_uri.s[i])) { + LM_WARN("invalid char found in the new uri at pos %d (%c) [%.*s]\n", + i, new_uri.s[i], new_uri.len, new_uri.s); + LM_WARN("this can happen when URI values are altered by end points" + " - skipping the update\n"); + goto failed; + } + } LM_DBG("decoded uris are: new=[%.*s] old=[%.*s]\n", new_uri.len, new_uri.s, old_uri.len, old_uri.s);

7 years, 6 months

git:master:00571fd1: uac: coherent indentation of code for replace from/to values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 00571fd1d07edbfb5950ca6786e898ecbc0b33f5 URL: https://github.com/kamailio/kamailio/commit/00571fd1d07edbfb5950ca6786e898e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T13:21:27+01:00 uac: coherent indentation of code for replace from/to values --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/00571fd1d07edbfb5950ca6786e898e… Patch: https://github.com/kamailio/kamailio/commit/00571fd1d07edbfb5950ca6786e898e…

7 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016