sr-dev

sr-dev@lists.kamailio.org

16 participants
45411 discussions

Changing location id from INT(10) to BIGINT
by Julius Flohr 29 Mar '23

29 Mar '23

Hi, we've been using kamailio successfully for many years now and we've noticed that the id field in the location database of our installation (userloc module) will overflow in the foreseeable future. Currently it is setup as a INT(10). Are there any reasons not to change it to BIGINT and upstream that change? Cheers Julius

2 2

git:master:ba365102: evapi: initialize internal message queue
by Daniel-Constantin Mierla 28 Mar '23

28 Mar '23

Module: kamailio Branch: master Commit: ba365102fe9faa403717eb30f36d363bad13114b URL: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-28T17:31:31+02:00 evapi: initialize internal message queue --- Modified: src/modules/evapi/evapi_dispatch.h Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… Patch: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… --- diff --git a/src/modules/evapi/evapi_dispatch.h b/src/modules/evapi/evapi_dispatch.h index 23b4c2565c..c96bcbf275 100644 --- a/src/modules/evapi/evapi_dispatch.h +++ b/src/modules/evapi/evapi_dispatch.h @@ -53,4 +53,6 @@ int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, int evapi_cfg_close(sip_msg_t *msg); int evapi_set_tag(sip_msg_t* msg, str* stag); +int evapi_queue_init(void); + #endif diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 27b3582698..708159ba3a 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -163,6 +163,10 @@ static int mod_init(void) _evapi_bind_addr = _evapi_bind_param; } + if(evapi_queue_init() < 0) { + LM_ERR("failed to init faked internal message queue\n"); + return -1; + } /* add space for one extra process */ register_procs(1 + _evapi_workers);

1 0

git:master:cc950166: ndb_redis: break on finding a server via sentinel
by Daniel-Constantin Mierla 28 Mar '23

28 Mar '23

Module: kamailio Branch: master Commit: cc9501663d6dd0fa91aef23ce00a7cdf86319201 URL: https://github.com/kamailio/kamailio/commit/cc9501663d6dd0fa91aef23ce00a7cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-28T08:12:00+02:00 ndb_redis: break on finding a server via sentinel --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cc9501663d6dd0fa91aef23ce00a7cd… Patch: https://github.com/kamailio/kamailio/commit/cc9501663d6dd0fa91aef23ce00a7cd… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index d6b7e0b95b9..a3ee1c332d4 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -156,6 +156,7 @@ int redisc_init(void) for(i= 0; i< sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -177,9 +178,9 @@ int redisc_init(void) res->element[0]->len + 1); port = atoi(res->element[1]->str); LM_DBG("sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } - } - else { + } else { res = redisCommand(redis, "SENTINEL slaves %s", sentinel_group); if( res && (res->type == REDIS_REPLY_ARRAY) ) { @@ -201,9 +202,13 @@ int redisc_init(void) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound==1) { + break; + } } }

1 0

git:master:f5bd2748: evapi: remove static specifier for evapi workers variable
by Daniel-Constantin Mierla 27 Mar '23

27 Mar '23

Module: kamailio Branch: master Commit: f5bd2748a7d06d0592fc5ab835bf970b3c023eaa URL: https://github.com/kamailio/kamailio/commit/f5bd2748a7d06d0592fc5ab835bf970… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-27T16:36:41+02:00 evapi: remove static specifier for evapi workers variable - it is exposed with extern --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f5bd2748a7d06d0592fc5ab835bf970… Patch: https://github.com/kamailio/kamailio/commit/f5bd2748a7d06d0592fc5ab835bf970… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index e5ac255691..27b3582698 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -44,7 +44,7 @@ MODULE_VERSION -static int _evapi_workers = 1; +int _evapi_workers = 1; static char *_evapi_bind_addr = "127.0.0.1"; static int _evapi_bind_port = 8448; static char *_evapi_bind_param = NULL;

1 0

git:5.5:667eed70: carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.5 Commit: 667eed709ac31589d6ed0c3bd1003babdc1152a1 URL: https://github.com/kamailio/kamailio/commit/667eed709ac31589d6ed0c3bd1003ba… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T14:22:34Z carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2 (cherry picked from commit f44e93a4171668d1c1182b186bea8c41db0a9300) (cherry picked from commit 7fcfc9ef6d624d7c817c83b5bb8008638d387e78) --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/667eed709ac31589d6ed0c3bd1003ba… Patch: https://github.com/kamailio/kamailio/commit/667eed709ac31589d6ed0c3bd1003ba… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 0e59a681e4..04e3659dfe 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,11 +335,6 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { - LM_ERR("Database does not support required raw queries capability\n"); - return -1; - } - if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) {

1 0

git:5.6:7fcfc9ef: carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.6 Commit: 7fcfc9ef6d624d7c817c83b5bb8008638d387e78 URL: https://github.com/kamailio/kamailio/commit/7fcfc9ef6d624d7c817c83b5bb80086… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T14:21:19Z carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2 (cherry picked from commit f44e93a4171668d1c1182b186bea8c41db0a9300) --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/7fcfc9ef6d624d7c817c83b5bb80086… Patch: https://github.com/kamailio/kamailio/commit/7fcfc9ef6d624d7c817c83b5bb80086… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 0e59a681e4..04e3659dfe 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,11 +335,6 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { - LM_ERR("Database does not support required raw queries capability\n"); - return -1; - } - if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) {

1 0

git:master:f44e93a4: carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: master Commit: f44e93a4171668d1c1182b186bea8c41db0a9300 URL: https://github.com/kamailio/kamailio/commit/f44e93a4171668d1c1182b186bea8c4… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T14:20:49Z carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2 --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/f44e93a4171668d1c1182b186bea8c4… Patch: https://github.com/kamailio/kamailio/commit/f44e93a4171668d1c1182b186bea8c4… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 0e59a681e4..04e3659dfe 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,11 +335,6 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { - LM_ERR("Database does not support required raw queries capability\n"); - return -1; - } - if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) {

1 0

git:master:ef94da7b: app_lua: fix crash on exausted memory scenario
by Victor Seva 24 Mar '23

24 Mar '23

Module: kamailio Branch: master Commit: ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6 URL: https://github.com/kamailio/kamailio/commit/ef94da7bac8e2aaf5a452d7b7dc3e2b… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-24T10:33:41+01:00 app_lua: fix crash on exausted memory scenario --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ef94da7bac8e2aaf5a452d7b7dc3e2b… Patch: https://github.com/kamailio/kamailio/commit/ef94da7bac8e2aaf5a452d7b7dc3e2b… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index b808d229d5a..df192b2b64e 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -912,6 +912,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -951,6 +955,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 0

git:5.5:3fed16c6: carrierroute: check during startup for required DB capabilities (GH #3405)
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.5 Commit: 3fed16c6eccbde99f4161af59318c94f6fa24a22 URL: https://github.com/kamailio/kamailio/commit/3fed16c6eccbde99f4161af59318c94… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T08:56:19Z carrierroute: check during startup for required DB capabilities (GH #3405) (cherry picked from commit cf147ab7888c4e2b26db9dd44e494001bb71a61c) (cherry picked from commit ce9c0e6715010c4403463b6d664b6e4a5632c04a) --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/db_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/3fed16c6eccbde99f4161af59318c94… Patch: https://github.com/kamailio/kamailio/commit/3fed16c6eccbde99f4161af59318c94… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 04e3659dfe8..0e59a681e40 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,6 +335,11 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("Database does not support required raw queries capability\n"); + return -1; + } + if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) { diff --git a/src/modules/carrierroute/db_carrierroute.c b/src/modules/carrierroute/db_carrierroute.c index 99636b9c4d3..8d31f53008c 100644 --- a/src/modules/carrierroute/db_carrierroute.c +++ b/src/modules/carrierroute/db_carrierroute.c @@ -111,6 +111,10 @@ int carrierroute_db_init(void) { LM_ERR("can't connect to database.\n"); return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("database does not support required raw queries capability\n"); + return -1; + } if (db_check_table_version(&carrierroute_dbf, carrierroute_dbh, &carrierroute_table, carrierroute_version) < 0) { DB_TABLE_VERSION_ERROR(carrierroute_table);

1 0

git:5.6:ce9c0e67: carrierroute: check during startup for required DB capabilities (GH #3405)
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.6 Commit: ce9c0e6715010c4403463b6d664b6e4a5632c04a URL: https://github.com/kamailio/kamailio/commit/ce9c0e6715010c4403463b6d664b6e4… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T08:55:18Z carrierroute: check during startup for required DB capabilities (GH #3405) (cherry picked from commit cf147ab7888c4e2b26db9dd44e494001bb71a61c) --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/db_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/ce9c0e6715010c4403463b6d664b6e4… Patch: https://github.com/kamailio/kamailio/commit/ce9c0e6715010c4403463b6d664b6e4… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 04e3659dfe8..0e59a681e40 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,6 +335,11 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("Database does not support required raw queries capability\n"); + return -1; + } + if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) { diff --git a/src/modules/carrierroute/db_carrierroute.c b/src/modules/carrierroute/db_carrierroute.c index 99636b9c4d3..8d31f53008c 100644 --- a/src/modules/carrierroute/db_carrierroute.c +++ b/src/modules/carrierroute/db_carrierroute.c @@ -111,6 +111,10 @@ int carrierroute_db_init(void) { LM_ERR("can't connect to database.\n"); return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("database does not support required raw queries capability\n"); + return -1; + } if (db_check_table_version(&carrierroute_dbf, carrierroute_dbh, &carrierroute_table, carrierroute_version) < 0) { DB_TABLE_VERSION_ERROR(carrierroute_table);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev