sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

git:master:8b063975: xhttp_pi: several compiler warning fixes
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 8b06397523c440fc20e509889c5fad01ed477d26 URL: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:18:24+02:00 xhttp_pi: several compiler warning fixes --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0… Patch: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0…

1 0

[kamailio/kamailio] Hello, kamailio v4.1 would not start after installation. Throws the following error even when mysql is running: (#1193)
by uchepercynnoch 28 Jul '17

28 Jul '17

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1193

2 2

git:master:f06e09b3: db_text: safety checks before memsets inside dbt_build_where()
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: f06e09b3a83f88678318f4aabeb6afdbf5a46ff0 URL: https://github.com/kamailio/kamailio/commit/f06e09b3a83f88678318f4aabeb6afd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:45:07+02:00 db_text: safety checks before memsets inside dbt_build_where() --- Modified: src/modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/f06e09b3a83f88678318f4aabeb6afd… Patch: https://github.com/kamailio/kamailio/commit/f06e09b3a83f88678318f4aabeb6afd… --- diff --git a/src/modules/db_text/dbt_raw_util.c b/src/modules/db_text/dbt_raw_util.c index 92b60287d6..f5cf756e25 100644 --- a/src/modules/db_text/dbt_raw_util.c +++ b/src/modules/db_text/dbt_raw_util.c @@ -183,13 +183,12 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) int offset = 0; int idx = -1; char int_buf[50]; + int res; *_k = NULL; *_o = NULL; *_v = NULL; - int res; - len = strlen(where); res = regcomp(&preg, _regexp, REG_EXTENDED); @@ -199,21 +198,21 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) } _k1 = pkg_malloc(sizeof(db_key_t) * MAX_CLAUSES); - memset(_k1, 0, sizeof(db_key_t) * MAX_CLAUSES); _o1 = pkg_malloc(sizeof(char*) * MAX_CLAUSES); - memset(_o1, 0, sizeof(db_op_t) * MAX_CLAUSES); _v1 = pkg_malloc(sizeof(db_val_t) * MAX_CLAUSES); - memset(_v1, 0, sizeof(db_val_t) * MAX_CLAUSES); - matches = (regmatch_t*)pkg_malloc(sizeof(regmatch_t) * MAX_MATCH); - if(matches==NULL || _k1==NULL || _o1==NULL || _v1==NULL) { + + if(_k1==NULL || _o1==NULL || _v1==NULL || matches==NULL) { LM_ERR("error getting pkg memory\n"); - pkg_free(_k1); - pkg_free(_o1); - pkg_free(_v1); - pkg_free(matches); + if(_k1) pkg_free(_k1); + if(_o1) pkg_free(_o1); + if(_v1) pkg_free(_v1); + if(matches) pkg_free(matches); return -1; } + memset(_k1, 0, sizeof(db_key_t) * MAX_CLAUSES); + memset(_o1, 0, sizeof(char*) * MAX_CLAUSES); + memset(_v1, 0, sizeof(db_val_t) * MAX_CLAUSES); while(offset < len) { char* buffer = where + offset;

1 0

git:master:2ea19b82: sipt: free pkg memory on error
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 2ea19b82b5e21d4499929cb56964ed43035c6122 URL: https://github.com/kamailio/kamailio/commit/2ea19b82b5e21d4499929cb56964ed4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 sipt: free pkg memory on error --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/2ea19b82b5e21d4499929cb56964ed4… Patch: https://github.com/kamailio/kamailio/commit/2ea19b82b5e21d4499929cb56964ed4… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index d583ca0101..f48de8d5ab 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -440,7 +440,7 @@ int sipt_parse_pv_name(pv_spec_p sp, str *in) if(spv->sub_type == 0) { LM_ERR("Unknown SIPT subtype [%.*s]\n", pvsubtype.len, pvsubtype.s); - return -1; + goto error; } break; } @@ -450,7 +450,7 @@ int sipt_parse_pv_name(pv_spec_p sp, str *in) if(spv->type == 0) { LM_ERR("Unknown SIPT type [%.*s]\n",pvtype.len, pvtype.s); - return -1; + goto error; } sp->pvp.pvn.u.dname = (void*)spv; @@ -458,8 +458,9 @@ int sipt_parse_pv_name(pv_spec_p sp, str *in) return 0; error: - LM_ERR("error at PV sipt name: %.*s\n", in->len, in->s); - return -1; + LM_ERR("error at PV sipt name: %.*s\n", in->len, in->s); + pkg_free(spv); + return -1; }

1 0

git:master:3afd4acf: db_text: free pkg memory before return on error
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 3afd4acfea655cd3ae2758a4713d977305a296f4 URL: https://github.com/kamailio/kamailio/commit/3afd4acfea655cd3ae2758a4713d977… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 db_text: free pkg memory before return on error --- Modified: src/modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/3afd4acfea655cd3ae2758a4713d977… Patch: https://github.com/kamailio/kamailio/commit/3afd4acfea655cd3ae2758a4713d977… --- diff --git a/src/modules/db_text/dbt_raw_util.c b/src/modules/db_text/dbt_raw_util.c index 89fcc803a4..92b60287d6 100644 --- a/src/modules/db_text/dbt_raw_util.c +++ b/src/modules/db_text/dbt_raw_util.c @@ -206,8 +206,12 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) memset(_v1, 0, sizeof(db_val_t) * MAX_CLAUSES); matches = (regmatch_t*)pkg_malloc(sizeof(regmatch_t) * MAX_MATCH); - if(matches==NULL) { + if(matches==NULL || _k1==NULL || _o1==NULL || _v1==NULL) { LM_ERR("error getting pkg memory\n"); + pkg_free(_k1); + pkg_free(_o1); + pkg_free(_v1); + pkg_free(matches); return -1; }

1 0

git:master:ecf1ad77: sipcapture: free allocated process memory before return
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: ecf1ad77a2b9f69d5ae4f68fdc71cb1b10ebe729 URL: https://github.com/kamailio/kamailio/commit/ecf1ad77a2b9f69d5ae4f68fdc71cb1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 sipcapture: free allocated process memory before return --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ecf1ad77a2b9f69d5ae4f68fdc71cb1… Patch: https://github.com/kamailio/kamailio/commit/ecf1ad77a2b9f69d5ae4f68fdc71cb1… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 0132090dca..8fb9deb16b 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -446,6 +446,7 @@ int parse_table_names (str table_name, str ** table_names){ names = (str*)pkg_malloc(sizeof(str) * no_tables); if(names == NULL) { LM_ERR("no more pkg memory left\n"); + pkg_free(table_name_cpy); return -1; } p = strtok (table_name_cpy,"| \t");

1 0

git:master:c8a804f5: sipcapture: fix custom field variable naming
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: c8a804f5e3c3b12b64871d3989a87d79d8627afe URL: https://github.com/kamailio/kamailio/commit/c8a804f5e3c3b12b64871d3989a87d7… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 sipcapture: fix custom field variable naming --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/c8a804f5e3c3b12b64871d3989a87d7… Patch: https://github.com/kamailio/kamailio/commit/c8a804f5e3c3b12b64871d3989a87d7… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 1c365f8168..0132090dca 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1887,7 +1887,7 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else { EMPTY_STR(sco.custom1); } /* Custom - field2 */ - if(custom_field3_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { + if(custom_field2_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { sco.custom2 = tmphdr[5]->body; } else { EMPTY_STR(sco.custom2); }

1 0

git:master:e8cd7643: siptrace: check auth_key_str.s before dereference
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: e8cd7643bbdf4b8f187a35bb0e707f4d6eda09b7 URL: https://github.com/kamailio/kamailio/commit/e8cd7643bbdf4b8f187a35bb0e707f4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 siptrace: check auth_key_str.s before dereference --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e8cd7643bbdf4b8f187a35bb0e707f4… Patch: https://github.com/kamailio/kamailio/commit/e8cd7643bbdf4b8f187a35bb0e707f4… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 987a20aed7..1969384d41 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1774,7 +1774,7 @@ static int trace_send_hep3_duplicate(str *body, str *from, str *to, struct dest_ HEP3_PACK_CHUNK_DATA (0, 0x0011, correlation_id_str->s, correlation_id_str->len); } } - if (auth_key_str.len) { + if (auth_key_str.s && auth_key_str.len > 0) { HEP3_PACK_CHUNK_DATA(0, 0x000e, auth_key_str.s, auth_key_str.len); } HEP3_PACK_CHUNK_DATA (0, 0x000f, body->s, body->len); @@ -2393,7 +2393,7 @@ static int hlog(struct sip_msg *msg, str *correlationid, str *message) { HEP3_PACK_CHUNK_UINT8 (0, 0x000b, 0x64); /* protocol type: log */ HEP3_PACK_CHUNK_UINT32(0, 0x000c, hep_capture_id); HEP3_PACK_CHUNK_DATA (0, 0x0011, correlationid->s, correlationid->len); - if (auth_key_str.len) { + if (auth_key_str.s && auth_key_str.len > 0) { HEP3_PACK_CHUNK_DATA(0, 0x000e, auth_key_str.s, auth_key_str.len); } HEP3_PACK_CHUNK_DATA (0, 0x000f, message->s, message->len);

1 0

[kamailio/kamailio] suggestions from static analyzer (#1192)
by Mikko Lehto 28 Jul '17

28 Jul '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1192 -- Commit Summary -- * siptrace: check auth_key_str.s before dereference * sipcapture: fix custom field variable naming * sipcapture: free allocated process memory before return * db_text: free pkg memory before return on error * sipt: free pkg memory on error -- File Changes -- M src/modules/db_text/dbt_raw_util.c (6) M src/modules/sipcapture/sipcapture.c (3) M src/modules/sipt/sipt.c (9) M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1192.patch https://github.com/kamailio/kamailio/pull/1192.diff -- 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/pull/1192

2 2

git:master:5ef8d7a9: registrar: restructured condition for clarity
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 5ef8d7a9f8e1120ea245084d91c00c64e836f97a URL: https://github.com/kamailio/kamailio/commit/5ef8d7a9f8e1120ea245084d91c00c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 registrar: restructured condition for clarity --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/5ef8d7a9f8e1120ea245084d91c00c6… Patch: https://github.com/kamailio/kamailio/commit/5ef8d7a9f8e1120ea245084d91c00c6… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 03be9482e5..b18fe993aa 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -277,10 +277,15 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) return -1; } aor = *ptr->aor; - /* test if un-expired and suported contact */ - if( (ptr) && !(VALID_CONTACT(ptr,act_time) - && (ret=-2) && allowed_method(_m,ptr))) - goto done; + /* test if not expired and contact with suported method */ + if(ptr) { + if(!(VALID_CONTACT(ptr,act_time))) { + goto done; + } else if(!allowed_method(_m,ptr)) { + ret=-2; + goto done; + } + } LM_DBG("contact for [%.*s] found by temp gruu [%.*s / %u]\n", aor.len, ZSW(aor.s), inst.len, inst.s, ahash); } diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index ad82262a04..e90625cdc4 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -538,6 +538,7 @@ int pv_fetch_contacts_helper(sip_msg_t* msg, udomain_t* dt, str* uri, c0->instance.len = ptr->instance.len; p += c0->instance.len; } + LM_DBG("memory block between %p - %p\n", c0, p); if ((ptr->sock) && (ptr->sock->proto == PROTO_TCP || ptr->sock->proto == PROTO_TLS || ptr->sock->proto == PROTO_WS || ptr->sock->proto == PROTO_WSS))

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017