sr-dev

sr-dev@lists.kamailio.org

22 participants
45189 discussions

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

[kamailio/kamailio] carrierroute: crush when database is not initialized (Issue #3405)
by sergey-safarov 23 Mar '23

23 Mar '23

### Description When I start Kamailio with not initialized Redis database I expect an error message but catch a crush. #### Debugging Data bt ``` (gdb) bt #0 0x0000000000000000 in ?? () #1 0x0000fffff24b64e4 in load_route_data_db (rd=0xfffff32243e0) at cr_db.c:314 #2 0x0000fffff24a718c in reload_route_data () at cr_data.c:178 #3 0x0000fffff2498340 in mod_init () at carrierroute.c:239 #4 0x00000000006996bc in init_mod (m=0xfffff76336e8) at core/sr_module.c:971 #5 0x0000000000699b24 in init_modules () at core/sr_module.c:1002 #6 0x000000000043e36c in main (argc=5, argv=0xfffffffff438) at main.c:3024 ``` bt full ``` (gdb) bt full #0 0x0000000000000000 in ?? () No symbol table info available. #1 0x0000fffff24b64e4 in load_route_data_db (rd=0xfffff32243e0) at cr_db.c:314 res = 0x0 row = 0x0 i = 0 j = -215858208 ret = 56 tmp_carrier_data = 0xfffff2fb96c8 query_str = {s = 0xfffff2521d60 <query> "SELECT DISTINCT domain FROM carrierroute WHERE carrier=1", len = 56} tmp_scan_prefix = {s = 0x8 <error: Cannot access memory at address 0x8>, len = 1} tmp_rewrite_host = {s = 0xfffff24f55b0 <__func__.12> "init_route_data", len = -218392888} tmp_rewrite_prefix = {s = 0xfffff24f39e8 "carrierroute", len = 8763264} tmp_rewrite_suffix = {s = 0xfffff7ed1520 <_IO_2_1_stderr_> "\207(\255", <incomplete sequence \373>, len = 0} tmp_host_name = {s = 0x40 <error: Cannot access memory at address 0x40>, len = -218628096} tmp_reply_code = {s = 0xfffff24f5608 <__func__.8> "reload_route_data", len = -229688464} tmp_comment = {s = 0xfffff24f39e8 "carrierroute", len = 9832376} p_tmp_comment = 0xffffffffeb80 __func__ = "load_route_data_db" n = 65535 #2 0x0000fffff24a718c in reload_route_data () at cr_data.c:178 old_data = 0x2008e4e98 new_data = 0xfffff32243e0 i = 3 __func__ = "reload_route_data" #3 0x0000fffff2498340 in mod_init () at carrierroute.c:239 fs = {st_dev = 9547688, st_ino = 268435456, st_mode = 0, st_nlink = 0, st_uid = 4294962480, st_gid = 65535, st_rdev = 268435456, __pad1 = 0, st_size = 281474976706104, st_blksize = -4768, __pad2 = 65535, st_blocks = 6918840, st_atim = {tv_sec = 969, tv_nsec = 5}, st_mtim = {tv_sec = 37199812, tv_nsec = 281474831794664}, st_ctim = {tv_sec = 4294967295, tv_nsec = 281474839572424}, __glibc_reserved = {-134251712, 65535}} uid = 4 gid = 261 __func__ = "mod_init" #4 0x00000000006996bc in init_mod (m=0xfffff76336e8) at core/sr_module.c:971 ret = -134225920 __func__ = "init_mod" #5 0x0000000000699b24 in init_modules () at core/sr_module.c:1002 t = 0x20ffffffff i = -1 __func__ = "init_modules" #6 0x000000000043e36c in main (argc=5, argv=0xfffffffff438) at main.c:3024 cfg_stream = 0xab3380 c = -1 r = 0 tmp = 0xfffff7fccde4 <_dl_fixup+244> "\367\003" tmp_len = 65535 port = -3376 proto = 65535 ahost = 0x0 aport = 0 options = 0x8d0fe0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 160181580 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0xfffff7ff0760 p = 0xfffff7d4b544 <__libc_start_call_main+52> "\237$\003\325 \002" st = {st_dev = 26, st_ino = 1030, st_mode = 16832, st_nlink = 2, st_uid = 977, st_gid = 977, st_rdev = 0, __pad1 = 0, st_size = 40, st_blksize = 4096, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1679590104, tv_nsec = 869999991}, st_mtim = {tv_sec = 1679590104, tv_nsec = 869999991}, st_ctim = {tv_sec = 1679590104, tv_nsec = 869999991}, __glibc_reserved = {0, 0}} tbuf = "\254\202\226\006\000\000\000\000(\315\375\367\377\377\000\000\030\315\375\367\377\377\000\000\205\317c\t\000\000\000\000\000\367\377\367\377\377\000\000\240\357\377\377\377\377\000\000\bb\345\367\377\377\000\000\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\200\002\000\000\000\000\000g\303\317*\031z\n\360\357\377\377\377\377\000\000Xt\375\367\377\377\000\000\000\340\377\367\377\377\000\000\000\000\000\000\000\000\000\000\360\357\377\377\377\377\000\000\204t\375\367\377\377\000\000\250\361\377\367\377\377", '\000' <repeats 26 times>, "\340\362\377\377\377\377\000\000DB\375\367\377\377\000\000(\333\377\367\377\377\000\000\000\320\377\367\377\377\000\000"... option_index = 0 long_options = {{name = 0x8d3520 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ce2d0 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x8d3528 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8d3530 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8d3538 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8d3548 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8d3558 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8d3568 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8d3578 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8d3588 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8d3598 "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x8d35a0 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8d35b0 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` info locals ``` (gdb) f 1 #1 0x0000fffff24b64e4 in load_route_data_db (rd=0xfffff32243e0) at cr_db.c:314 314 if (carrierroute_dbf.raw_query(carrierroute_dbh, &query_str, &res) < 0) { (gdb) info locals res = 0x0 row = 0x0 i = 0 j = -215858208 ret = 56 tmp_carrier_data = 0xfffff2fb96c8 query_str = {s = 0xfffff2521d60 <query> "SELECT DISTINCT domain FROM carrierroute WHERE carrier=1", len = 56} tmp_scan_prefix = {s = 0x8 <error: Cannot access memory at address 0x8>, len = 1} tmp_rewrite_host = {s = 0xfffff24f55b0 <__func__.12> "init_route_data", len = -218392888} tmp_rewrite_prefix = {s = 0xfffff24f39e8 "carrierroute", len = 8763264} tmp_rewrite_suffix = {s = 0xfffff7ed1520 <_IO_2_1_stderr_> "\207(\255", <incomplete sequence \373>, len = 0} tmp_host_name = {s = 0x40 <error: Cannot access memory at address 0x40>, len = -218628096} tmp_reply_code = {s = 0xfffff24f5608 <__func__.8> "reload_route_data", len = -229688464} tmp_comment = {s = 0xfffff24f39e8 "carrierroute", len = 9832376} p_tmp_comment = 0xffffffffeb80 __func__ = "load_route_data_db" n = 65535 ``` list ``` (gdb) list 309 goto errout; 310 } 311 query_str.s = query; 312 query_str.len = ret; 313 314 if (carrierroute_dbf.raw_query(carrierroute_dbh, &query_str, &res) < 0) { 315 LM_ERR("Failed to query database.\n"); 316 goto errout; 317 } 318 LM_INFO("carrier '%.*s' (id %i) has %i domains\n", rd->carrier_map[i].name.len, rd->carrier_map[i].name.s, rd->carrier_map[i].id, RES_ROW_N(res)); ``` #### Log Messages ``` 0(969) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 158.51.225.1:5060 name ipv4_udp udp: 2605:84c0:40:2:278a:4bc8:76c1:1585:5060 name ipv6_udp tcp: 158.51.225.1:5060 name ipv4_tcp tcp: 158.51.225.1:2855 name ipv4_msrp tcp: 2605:84c0:40:2:278a:4bc8:76c1:1585:5060 name ipv6_tcp Aliases: tcp: linux.local:5060 tcp: linux:5060 tcp: localhost:2855 tcp: localhost:5060 udp: linux.local:5060 udp: linux:5060 udp: localhost:5060 0(969) INFO: <core> [core/tcp_main.c:5071]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(969) NOTICE: regex [regex_mod.c:168]: mod_init(): 'file' parameter is not set, group matching disabled 0(969) INFO: carrierroute [carrierroute.c:185]: mod_init(): use database as configuration source Program received signal SIGSEGV, Segmentation fault. ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` here is cutomized 54a9c15a5ebdaa1df82e4526534be930e0f8ca71 ``` [root@localhost sipagg2]# kamailio -v version: kamailio 5.6.2 (aarch64/linux) 42c09c-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 42c09c -dirty compiled on 00:00:00 Sep 13 2022 with gcc 12.2.1 ``` * **Operating System**: ``` [root@sbc-stage-a0 kamailio]# cat /etc/os-release NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3405 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3405(a)github.com>

2 6

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

23 Mar '23

Module: kamailio Branch: master Commit: cf147ab7888c4e2b26db9dd44e494001bb71a61c URL: https://github.com/kamailio/kamailio/commit/cf147ab7888c4e2b26db9dd44e49400… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-23T18:21:26Z carrierroute: check during startup for required DB capabilities (GH #3405) --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/db_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/cf147ab7888c4e2b26db9dd44e49400… Patch: https://github.com/kamailio/kamailio/commit/cf147ab7888c4e2b26db9dd44e49400… --- 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