sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:master:98f35707: crypto: fixed safety check looking up var names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 98f35707fb00c8fa3512faff3b42a56a9e45e241 URL: https://github.com/kamailio/kamailio/commit/98f35707fb00c8fa3512faff3b42a56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:04:35+01:00 crypto: fixed safety check looking up var names --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/98f35707fb00c8fa3512faff3b42a56… Patch: https://github.com/kamailio/kamailio/commit/98f35707fb00c8fa3512faff3b42a56… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 79345b7ae1..d3541ad03e 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -216,7 +216,7 @@ static int ki_crypto_aes_encrypt(sip_msg_t* msg, str *ins, str *keys, str *dpv) dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed getting pv: %.*s\n", dpv->len, dpv->s); return -1; } @@ -330,7 +330,7 @@ static int ki_crypto_aes_decrypt(sip_msg_t* msg, str *ins, str *keys, str *dpv) dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed getting pv: %.*s\n", dpv->len, dpv->s); return -1; }

7 years

git:master:1e5ea9be: auth_radius: safety check for r variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e5ea9beeb3055e0303eef992ffa87f61d8f0bf9 URL: https://github.com/kamailio/kamailio/commit/1e5ea9beeb3055e0303eef992ffa87f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:01:18+01:00 auth_radius: safety check for r variable --- Modified: src/modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/1e5ea9beeb3055e0303eef992ffa87f… Patch: https://github.com/kamailio/kamailio/commit/1e5ea9beeb3055e0303eef992ffa87f… --- diff --git a/src/modules/auth_radius/sterman.c b/src/modules/auth_radius/sterman.c index a8cf8f93cc..db50b39df6 100644 --- a/src/modules/auth_radius/sterman.c +++ b/src/modules/auth_radius/sterman.c @@ -93,7 +93,7 @@ static inline int extract_avp( name->s.len = p - vp->strvalue; name->s.s = vp->strvalue; value->n = strtol(++p, &r, 10); - } else if(p && p != r && !q) { + } else if(p && r && p != r && !q) { /* int name and int vale */ name->n = strtol(++p, &q, 10); value->n = strtol(++r, &q, 10);

7 years

git:master:4dca6d5d: core: kemi - break when matching the header name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4dca6d5d79ecea23a202727d1a9637dad15ef174 URL: https://github.com/kamailio/kamailio/commit/4dca6d5d79ecea23a202727d1a9637d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:58:20+01:00 core: kemi - break when matching the header name --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/4dca6d5d79ecea23a202727d1a9637d… Patch: https://github.com/kamailio/kamailio/commit/4dca6d5d79ecea23a202727d1a9637d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index de07f058f2..3e83c9b498 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -938,6 +938,7 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) if (cmp_hdrname_str(&hf->name, &hfm.name)!=0) continue; } + break; } hdr = (char*)pkg_malloc(txt->len); @@ -1129,9 +1130,9 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) if (cmp_hdrname_str(&hf->name, &hfm.name)!=0) continue; } + break; } - hf = msg->headers; hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { LM_ERR("no pkg memory left\n");

7 years

git:master:2fe07249: core: pvapi - set prev variable when dropping from cache

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2fe07249426b1ae9b368a1d1ffc7f2d5b881c704 URL: https://github.com/kamailio/kamailio/commit/2fe07249426b1ae9b368a1d1ffc7f2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:57:59+01:00 core: pvapi - set prev variable when dropping from cache --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe07249426b1ae9b368a1d1ffc7f2d… Patch: https://github.com/kamailio/kamailio/commit/2fe07249426b1ae9b368a1d1ffc7f2d… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 64b9fd96ff..dac770a0f3 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -289,6 +289,7 @@ int pv_cache_drop(void) pkg_free(pvi); return 1; } + pvp = pvi; pvi = pvi->next; } } @@ -310,6 +311,7 @@ int pv_cache_drop(void) pkg_free(pvi); return 1; } + pvp = pvi; pvi = pvi->next; } }

7 years

git:master:53c27ac3: app_mono: safety check beforing accessing field inside pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 53c27ac3eb3e762110bd5cf54e55ddd85a7973a1 URL: https://github.com/kamailio/kamailio/commit/53c27ac3eb3e762110bd5cf54e55ddd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:57:17+01:00 app_mono: safety check beforing accessing field inside pointer - zero terminated allocated strings --- Modified: src/modules/app_mono/app_mono_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53c27ac3eb3e762110bd5cf54e55ddd… Patch: https://github.com/kamailio/kamailio/commit/53c27ac3eb3e762110bd5cf54e55ddd… --- diff --git a/src/modules/app_mono/app_mono_api.c b/src/modules/app_mono/app_mono_api.c index 7bdfcb97a9..37ece204d2 100644 --- a/src/modules/app_mono/app_mono_api.c +++ b/src/modules/app_mono/app_mono_api.c @@ -136,7 +136,7 @@ int mono_sr_init_load(void) } mono_config_parse (NULL); mi = _sr_mono_load_list; - if(mi->domain != NULL) + if(mi && mi->domain != NULL) { LM_ERR("worker mono environment already initialized\n"); return 0; @@ -769,13 +769,14 @@ static int sr_mono_hdr_append (MonoString *hv) } hf = env_M->msg->last_header; - hdr = (char*)pkg_malloc(txt.len); + hdr = (char*)pkg_malloc(txt.len+1); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); goto error; } memcpy(hdr, txt.s, txt.len); + hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0) @@ -863,13 +864,14 @@ static int sr_mono_hdr_insert (MonoString *hv) LM_DBG("insert hf: %s\n", txt.s); hf = env_M->msg->headers; - hdr = (char*)pkg_malloc(txt.len); + hdr = (char*)pkg_malloc(txt.len+1); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); goto error; } memcpy(hdr, txt.s, txt.len); + hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0)

7 years

git:master:e30cbd00: kamctl: regenerate db creation scripts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e30cbd0010149a595ef7c11963a785ad784ea5c2 URL: https://github.com/kamailio/kamailio/commit/e30cbd0010149a595ef7c11963a785a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T08:42:00+01:00 kamctl: regenerate db creation scripts --- Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/postgres/topos-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e30cbd0010149a595ef7c11963a785a… Patch: https://github.com/kamailio/kamailio/commit/e30cbd0010149a595ef7c11963a785a… --- diff --git a/utils/kamctl/db_sqlite/topos-create.sql b/utils/kamctl/db_sqlite/topos-create.sql index d36c5b62ac..b39af68335 100644 --- a/utils/kamctl/db_sqlite/topos-create.sql +++ b/utils/kamctl/db_sqlite/topos-create.sql @@ -27,6 +27,8 @@ CREATE TABLE topos_d ( CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid); +CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid); +CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -60,6 +62,8 @@ CREATE TABLE topos_t ( CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid); +CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch); +CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid); INSERT INTO version (table_name, table_version) values ('topos_t','1'); diff --git a/utils/kamctl/mysql/topos-create.sql b/utils/kamctl/mysql/topos-create.sql index db305752c6..1d35b2b83d 100644 --- a/utils/kamctl/mysql/topos-create.sql +++ b/utils/kamctl/mysql/topos-create.sql @@ -27,6 +27,8 @@ CREATE TABLE `topos_d` ( CREATE INDEX rectime_idx ON topos_d (`rectime`); CREATE INDEX a_callid_idx ON topos_d (`a_callid`); +CREATE INDEX a_uuid_idx ON topos_d (`a_uuid`); +CREATE INDEX b_uuid_idx ON topos_d (`b_uuid`); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -60,6 +62,8 @@ CREATE TABLE `topos_t` ( CREATE INDEX rectime_idx ON topos_t (`rectime`); CREATE INDEX a_callid_idx ON topos_t (`a_callid`); +CREATE INDEX x_vbranch_idx ON topos_t (`x_vbranch`); +CREATE INDEX a_uuid_idx ON topos_t (`a_uuid`); INSERT INTO version (table_name, table_version) values ('topos_t','1'); diff --git a/utils/kamctl/oracle/topos-create.sql b/utils/kamctl/oracle/topos-create.sql index b0f0aa47d5..f7dc8097ce 100644 --- a/utils/kamctl/oracle/topos-create.sql +++ b/utils/kamctl/oracle/topos-create.sql @@ -35,6 +35,8 @@ BEGIN map2users('topos_d'); END; / CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid); +CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid); +CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -76,6 +78,8 @@ BEGIN map2users('topos_t'); END; / CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid); +CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch); +CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid); INSERT INTO version (table_name, table_version) values ('topos_t','1'); diff --git a/utils/kamctl/postgres/topos-create.sql b/utils/kamctl/postgres/topos-create.sql index d98dda3fad..a72be15622 100644 --- a/utils/kamctl/postgres/topos-create.sql +++ b/utils/kamctl/postgres/topos-create.sql @@ -27,6 +27,8 @@ CREATE TABLE topos_d ( CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid); +CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid); +CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid); INSERT INTO version (table_name, table_version) values ('topos_d','1'); @@ -60,6 +62,8 @@ CREATE TABLE topos_t ( CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid); +CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch); +CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid); INSERT INTO version (table_name, table_version) values ('topos_t','1');

7 years

git:master:a4201bce: Merge pull request #1355 from sergey-vb/master

by GitHub

Module: kamailio Branch: master Commit: a4201bce416be015eae5534aaaa816f9926eacd4 URL: https://github.com/kamailio/kamailio/commit/a4201bce416be015eae5534aaaa816f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-08T08:17:49+01:00 Merge pull request #1355 from sergey-vb/master schema: add indexes to topos Mysql tables --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/a4201bce416be015eae5534aaaa816f… Patch: https://github.com/kamailio/kamailio/commit/a4201bce416be015eae5534aaaa816f… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 85984faf9c..5b13333d62 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -225,4 +225,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + + <index> + <name>b_uuid_idx</name> + <colref linkend="b_uuid"/> + </index> + </table> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index 793fed4d1e..c6bc095aeb 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -232,4 +232,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>x_vbranch_idx</name> + <colref linkend="x_vbranch"/> + </index> + + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + </table>

7 years

git:master:66718c2a: schema: add indexes to topos Mysql tables (#13)

by GitHub

Module: kamailio Branch: master Commit: 66718c2a77ae4cc427d8a06b4fa308224a5b3d48 URL: https://github.com/kamailio/kamailio/commit/66718c2a77ae4cc427d8a06b4fa3082… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-08T08:50:11+02:00 schema: add indexes to topos Mysql tables (#13) * topos: update topos_d.xml To optimize DB query speedup I propose to add few indexes. * topos: update topos_t.xml To optimize DB query speedup I propose to add few indexes. --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/66718c2a77ae4cc427d8a06b4fa3082… Patch: https://github.com/kamailio/kamailio/commit/66718c2a77ae4cc427d8a06b4fa3082… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 85984faf9c..5b13333d62 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -225,4 +225,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + + <index> + <name>b_uuid_idx</name> + <colref linkend="b_uuid"/> + </index> + </table> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index 793fed4d1e..c6bc095aeb 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -232,4 +232,14 @@ <colref linkend="a_callid"/> </index> + <index> + <name>x_vbranch_idx</name> + <colref linkend="x_vbranch"/> + </index> + + <index> + <name>a_uuid_idx</name> + <colref linkend="a_uuid"/> + </index> + </table>

7 years

[kamailio/kamailio] schema: add indexes to topos Mysql tables (#1355)

by sergey-vb

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Using topos module in production I have found slow queries in MySQL. After analyzing it I have add indexes to topos_t and topos_d tables. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1355 -- Commit Summary -- * schema: add indexes to topos Mysql tables (#13) -- File Changes -- M src/lib/srdb1/schema/topos_d.xml (10) M src/lib/srdb1/schema/topos_t.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1355.patch https://github.com/kamailio/kamailio/pull/1355.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/1355

7 years

git:5.1:56a9993c: log_systemd: fixed typo in previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 56a9993c81123c4ee95ecc347aee28abbecb7e2a URL: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:25:40+01:00 log_systemd: fixed typo in previous commit (cherry picked from commit 41d66fa2293386bcc3765d6025c2f9b1bd89cd16) --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… Patch: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… --- diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index eac379c0ab..d948b9a60b 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -106,7 +106,7 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) /* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, * LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */ ilev = LOG_DEBUG; - if(slev->len==9 && strncasecmp(slev->1s, "LOG_EMERG", slev->len)==0) { + if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) { ilev = LOG_EMERG; } else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) { ilev = LOG_ALERT;

7 years

← Newer
1
...
36
37
38
39
40
41
42
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017