sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

Cleanup by server id
by Konstantin Polyakov 12 Mar '18

12 Mar '18

Hello All, I would like to propose improvement for feature "server_id filter" to make possible cleaning location table records by server_id too. That could be usefull when several kamailio instances are used with the same location table and in db mode 1 or 2 (cache). Currently in such configuration there is an issue - one proxy cleans records which are created and stored in the cache by another proxy. That breaks cache of another proxy. I made a fix and would like to open pull request but I don't have permissions to push my branch with changes into the kamailio repository. Could some grant me such permissions? Thank you. Best regards Konstantin

2 1

git:master:96a1367e: app_python3: renamed main files to match module name
by Daniel-Constantin Mierla 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 96a1367ef9c0977c4b7ae378ad76ec22d393e990 URL: https://github.com/kamailio/kamailio/commit/96a1367ef9c0977c4b7ae378ad76ec2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-10T12:18:28+01:00 app_python3: renamed main files to match module name --- Added: src/modules/app_python3/app_python3_mod.c Added: src/modules/app_python3/app_python3_mod.h Modified: src/modules/app_python3/mod_Core.c Modified: src/modules/app_python3/mod_Logger.c Modified: src/modules/app_python3/mod_Ranks.c Modified: src/modules/app_python3/mod_Router.c Modified: src/modules/app_python3/python_exec.c Modified: src/modules/app_python3/python_support.c Removed: src/modules/app_python3/app_python_mod.c Removed: src/modules/app_python3/app_python_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/96a1367ef9c0977c4b7ae378ad76ec2… Patch: https://github.com/kamailio/kamailio/commit/96a1367ef9c0977c4b7ae378ad76ec2… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python3_mod.c similarity index 99% rename from src/modules/app_python3/app_python_mod.c rename to src/modules/app_python3/app_python3_mod.c index 180bb74230..5d45f3f355 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -31,7 +31,7 @@ #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "mod_Router.h" #include "mod_Core.h" diff --git a/src/modules/app_python3/app_python_mod.h b/src/modules/app_python3/app_python3_mod.h similarity index 94% rename from src/modules/app_python3/app_python_mod.h rename to src/modules/app_python3/app_python3_mod.h index 0c108e2d3f..b011036172 100644 --- a/src/modules/app_python3/app_python_mod.h +++ b/src/modules/app_python3/app_python3_mod.h @@ -19,8 +19,8 @@ * */ -#ifndef _PYTHON_MOD_H -#define _PYTHON_MOD_H +#ifndef _APP_PYTHON3_MOD_H +#define _APP_PYTHON3_MOD_H #include <Python.h> diff --git a/src/modules/app_python3/mod_Core.c b/src/modules/app_python3/mod_Core.c index 4572a1bb80..c8963b6011 100644 --- a/src/modules/app_python3/mod_Core.c +++ b/src/modules/app_python3/mod_Core.c @@ -33,7 +33,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/mod_Logger.c b/src/modules/app_python3/mod_Logger.c index b723269bb8..424ed31bc9 100644 --- a/src/modules/app_python3/mod_Logger.c +++ b/src/modules/app_python3/mod_Logger.c @@ -33,7 +33,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/mod_Ranks.c b/src/modules/app_python3/mod_Ranks.c index 80860284bd..118c2ca4f3 100644 --- a/src/modules/app_python3/mod_Ranks.c +++ b/src/modules/app_python3/mod_Ranks.c @@ -33,7 +33,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/mod_Router.c b/src/modules/app_python3/mod_Router.c index 3fe96f08f1..04183ba47d 100644 --- a/src/modules/app_python3/mod_Router.c +++ b/src/modules/app_python3/mod_Router.c @@ -32,7 +32,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index 55f40c1e47..b402a2b9d6 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -33,7 +33,7 @@ #include "../../core/locking.h" #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/python_support.c b/src/modules/app_python3/python_support.c index 2ad522901a..e7dc47d526 100644 --- a/src/modules/app_python3/python_support.c +++ b/src/modules/app_python3/python_support.c @@ -26,7 +26,7 @@ #include "../../core/dprint.h" #include "../../core/mem/mem.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_support.h" static char *make_message(const char *fmt, va_list args);

1 0

git:master:ba992b12: app_python3: skip execution of child_init() for rank PROC_INIT
by Daniel-Constantin Mierla 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: ba992b122eec30c5022d4c3e77af4e2f6eb0752a URL: https://github.com/kamailio/kamailio/commit/ba992b122eec30c5022d4c3e77af4e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-10T08:24:21+01:00 app_python3: skip execution of child_init() for rank PROC_INIT - this is a particular execution in main process after all modules were initialized, not in a forked child process --- Modified: src/modules/app_python3/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba992b122eec30c5022d4c3e77af4e2… Patch: https://github.com/kamailio/kamailio/commit/ba992b122eec30c5022d4c3e77af4e2… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python_mod.c index c6f1098e60..180bb74230 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python_mod.c @@ -174,6 +174,9 @@ static int mod_init(void) */ static int child_init(int rank) { + if(rank==PROC_INIT) { + return 0; + } _apy_process_rank = rank; PyOS_AfterFork(); return apy_init_script(rank);

1 0

git:master:988cc68d: app_python: skip execution of child_init() for rank PROC_INIT
by Daniel-Constantin Mierla 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 988cc68d62b8a00a69786e43f99417c05572aef6 URL: https://github.com/kamailio/kamailio/commit/988cc68d62b8a00a69786e43f99417c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-10T08:21:20+01:00 app_python: skip execution of child_init() for rank PROC_INIT - this is a particular execution in main process after all modules were initialized, not in a forked child process --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/988cc68d62b8a00a69786e43f99417c… Patch: https://github.com/kamailio/kamailio/commit/988cc68d62b8a00a69786e43f99417c… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 3f5463bd0a..5c5278f42d 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -174,6 +174,9 @@ static int mod_init(void) */ static int child_init(int rank) { + if(rank==PROC_INIT) { + return 0; + } _apy_process_rank = rank; PyOS_AfterFork(); return apy_init_script(rank);

1 0

git:master:11e918e1: app_python: call PyOS_AfterFork() in child
by AnthonyA 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 11e918e1bb8cd1fce4ead00cc532669618b539ba URL: https://github.com/kamailio/kamailio/commit/11e918e1bb8cd1fce4ead00cc532669… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-10T10:41:31+08:00 app_python: call PyOS_AfterFork() in child --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/11e918e1bb8cd1fce4ead00cc532669… Patch: https://github.com/kamailio/kamailio/commit/11e918e1bb8cd1fce4ead00cc532669… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 98738ee66c..3f5463bd0a 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -175,6 +175,7 @@ static int mod_init(void) static int child_init(int rank) { _apy_process_rank = rank; + PyOS_AfterFork(); return apy_init_script(rank); }

1 0

git:master:60816e1e: app_python3: call PyOS_AfterFork() in child
by AnthonyA 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 60816e1eb9f83fbe4803f1096fdb15e3be390594 URL: https://github.com/kamailio/kamailio/commit/60816e1eb9f83fbe4803f1096fdb15e… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-10T10:41:31+08:00 app_python3: call PyOS_AfterFork() in child --- Modified: src/modules/app_python3/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60816e1eb9f83fbe4803f1096fdb15e… Patch: https://github.com/kamailio/kamailio/commit/60816e1eb9f83fbe4803f1096fdb15e… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python_mod.c index c3229b181d..c6f1098e60 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python_mod.c @@ -175,6 +175,7 @@ static int mod_init(void) static int child_init(int rank) { _apy_process_rank = rank; + PyOS_AfterFork(); return apy_init_script(rank); }

1 0

Re: [sr-dev] [kamailio/kamailio] db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection (cdbee5a)
by kelchy 09 Mar '18

09 Mar '18

looks good daniel, i will test more -- 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/commit/cdbee5a536920c4fab3ec619c8467c1…

1 0

git:master:d12eba62: db_redis: Fix free(0) on update
by Andreas Granig 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: d12eba62bfaefa0db85e66cb21678c9cccda658b URL: https://github.com/kamailio/kamailio/commit/d12eba62bfaefa0db85e66cb21678c9… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-09T11:54:34+01:00 db_redis: Fix free(0) on update --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/d12eba62bfaefa0db85e66cb21678c9… Patch: https://github.com/kamailio/kamailio/commit/d12eba62bfaefa0db85e66cb21678c9… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 247627189d..48bcf343d3 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -28,7 +28,7 @@ #include "redis_table.h" static void db_redis_dump_reply(redisReply *reply) { - int i; + int i; if (reply->type == REDIS_REPLY_STRING) { LM_DBG("%s\n", reply->str); } else if (reply->type == REDIS_REPLY_INTEGER) { @@ -218,7 +218,7 @@ static int db_redis_return_version(const db1_con_t* _h, km_redis_con_t *con, con } static int db_redis_build_entry_manual_keys(redis_table_t *table, const db_key_t *_k, - const db_val_t *_v, const int _n, int **manual_keys, int *manual_key_count) { + const db_val_t *_v, const int _n, int **manual_keys, int *manual_key_count) { // TODO: we also put keys here which are already part of type mapping! // there must be removed for performance reasons @@ -264,8 +264,8 @@ static int db_redis_build_entry_manual_keys(redis_table_t *table, const db_key_t } static int db_redis_find_query_key(redis_key_t *key, const str *table_name, - str *type_name, const db_key_t *_k, const db_val_t *_v, const int _n, - str *key_name, int *key_found) { + str *type_name, const db_key_t *_k, const db_val_t *_v, const int _n, + str *key_name, int *key_found) { unsigned int len; str val = {NULL, 0}; @@ -564,7 +564,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, db_redis_free_reply(&reply); break; } else { - int i; + int i; LM_DBG("populating query keys list with result of type query\n"); *query_keys_count = reply->elements; for (i = 0; i < reply->elements; ++i) { @@ -1597,7 +1597,8 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con LM_ERR("Failed to add key to update query\n"); goto error; } - pkg_free(v.s); + if (v.s) + pkg_free(v.s); } update_queries++; if (db_redis_append_command_argv(con, query_v, 1) != REDIS_OK) {

1 0

git:master:cdbee5a5: db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: cdbee5a536920c4fab3ec619c8467c152d6f110a URL: https://github.com/kamailio/kamailio/commit/cdbee5a536920c4fab3ec619c8467c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T10:39:40+01:00 db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection - reported by GH #1479 --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cdbee5a536920c4fab3ec619c8467c1… Patch: https://github.com/kamailio/kamailio/commit/cdbee5a536920c4fab3ec619c8467c1… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aee5a1ba0a..72d6647689 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -316,7 +316,9 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) int col; db_mongodb_result_t *mgres; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_t *cdoc; const char *colname; @@ -360,6 +362,7 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) } if(cdocproj == 1) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -373,6 +376,12 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } else { if (!bson_iter_init (&citer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); @@ -506,7 +515,9 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -527,6 +538,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } } else { cdoc = (bson_t*)mgres->colsdoc; +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -540,6 +552,12 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } if(mgres->colsdoc) { @@ -864,7 +882,9 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op km_mongodb_con_t *mgcon; mongoc_client_t *client; bson_t *seldoc = NULL; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_t bcols; +#endif char *cname; char b1; char *jstr; @@ -944,23 +964,31 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op LM_ERR("cannot initialize columns bson document\n"); goto error; } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_begin (mgcon->colsdoc, "projection", 10, &bcols)) { LM_ERR("failed to start projection of fields\n"); goto error; } +#endif for(i = 0; i < _nc; i++) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_int32(&bcols, _c[i]->s, _c[i]->len, 1)) +#else + if(!bson_append_int32(mgcon->colsdoc, _c[i]->s, _c[i]->len, 1)) +#endif { LM_ERR("failed to append int to columns bson %.*s = %d [%d]\n", _c[i]->len, _c[i]->s, 1, i); goto error; } } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_end (mgcon->colsdoc, &bcols)) { LM_ERR("failed to end projection of fields\n"); goto error; } +#endif if(is_printable(L_DBG)) { jstr = bson_as_json (mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr);

1 0

git:master:cb2e9029: db_redis: Fix null free in delete
by Andreas Granig 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: cb2e90295695432dc7b984e1f68abee01a6469de URL: https://github.com/kamailio/kamailio/commit/cb2e90295695432dc7b984e1f68abee… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-09T10:10:52+01:00 db_redis: Fix null free in delete --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cb2e90295695432dc7b984e1f68abee… Patch: https://github.com/kamailio/kamailio/commit/cb2e90295695432dc7b984e1f68abee… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 2fba2c5f54..247627189d 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1393,7 +1393,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con //db_redis_key_free(&type_keys); LM_DBG("+++ done with loop '%.*s'\n", k->key.len, k->key.s); } - pkg_free(query_v); db_redis_key_free(&type_keys); db_redis_key_free(&all_type_keys);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018