sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

db_cassandra help required [possible bug?]
by SamyGo 12 May '16

12 May '16

Hi devs, I'm trying to make the db_cassandra work for my kamailio specifically userblacklist module. I've cassanda keyspace and tables defined along with the db_schema directory structure defined as instructed however the debug logs keep telling me that table 'version' doesn't exist. I've taken a look inside the dbcassa_table.c file https://github.com/kamailio/kamailio/blob/master/modules/db_cassandra/dbcas… Somewhere in this function it just doesn't get hold of "tbc" and hence it throws up error. Here is how I've figured out this code. hash = core_hash(dbn, tbn, DBCASSA_TABLE_SIZE); if(!hash) LM_ERR("hash NOT FOUND\n"); hashidx = hash % DBCASSA_TABLE_SIZE; if(!hashidx) LM_ERR("hashidx NOT FOUND\n"); ref_read_data(dbcassa_tbl_htable[hashidx].lock); tbc = dbcassa_tbl_htable[hashidx].dtp; if(!tbc) LM_ERR("TBC NOT FOUND\n"); while(tbc) { LM_DBG("found dbname=%.*s, table=%.*s\n", tbc->dbname.len, tbc->dbname.s, tbc->name.len, tbc->name.s); if(tbc->hash==hash && tbc->dbname.len == dbn->len && tbc->name.len == tbn->len && !strncasecmp(tbc->dbname.s, dbn->s, dbn->len) && !strncasecmp(tbc->name.s, tbn->s, tbn->len)) { memcpy(full_path_buf + dbcassa_schema_path.len, dbn->s, dbn->len); len = dbcassa_schema_path.len + dbn->len; full_path_buf[len++] = '/'; memcpy(full_path_buf + len, tbn->s, tbn->len); full_path_buf[len + tbn->len] = '\0'; if(dbcassa_check_mtime(&tbc->mt) == 0) return tbc; old_tbc = tbc; break; } tbc = tbc->next; } unref_read_data(dbcassa_tbl_htable[hashidx].lock); if(!old_tbc) { LM_ERR("OLD_TBC NOT FOUND\n"); return NULL; } and upon starting of kamailio after recompiling the module I see these lines printed. 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:149]: db_cassa_new_connection(): opening connection: cassa:// xxxx:xxxx@127.0.0.1:9160/kamailio 0(15574) DEBUG: <core> [mem/f_malloc.c:439]: fm_malloc(): fm_malloc(0x7f9c14f8a010, 48) called from db_cassandra: dbcassa_base.cpp: db_cassa_new_connection(155) 0(15574) DEBUG: <core> [mem/f_malloc.c:514]: fm_malloc(): fm_malloc(0x7f9c14f8a010, 48) returns address 0x7f9c150055f0 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:161]: db_cassa_new_connection(): 0x7f9c150055f0=pkg_malloc(48) 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:117]: dbcassa_open(): Opened connection to Cassandra cluster 127.0.0.1:9160 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:955]: db_cassa_query(): query table=version 0(15574) ERROR: db_cassandra [dbcassa_table.c:463]: dbcassa_db_get_table(): TBC NOT FOUND 0(15574) ERROR: db_cassandra [dbcassa_table.c:486]: dbcassa_db_get_table(): OLD_TBC NOT FOUND 0(15574) ERROR: db_cassandra [dbcassa_base.cpp:449]: cassa_translate_query(): table version does not exist! 0(15574) ERROR: db_cassandra [dbcassa_base.cpp:962]: db_cassa_query(): Failed to query Cassandra cluster 0(15574) ERROR: <core> [db.c:397]: db_table_version(): error in db_query 0(15574) ERROR: <core> [db.c:436]: db_check_table_version(): querying version for table userblacklist 0(15574) ERROR: userblacklist [db_userblacklist.c:86]: userblacklist_db_init(): during table version check. 0(15574) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool 0(15574) DEBUG: <core> [mem/f_malloc.c:575]: fm_free(): fm_free(0x7f9c14f8a010, 0x7f9c150055f0), called from db_cassandra: dbcassa_base.cpp: db_cassa_free_connection(203) 0(15574) DEBUG: <core> [mem/f_malloc.c:594]: fm_free(): fm_free: freeing block alloc'ed from db_cassandra: dbcassa_base.cpp: db_cassa_new_connection(155) 0(15574) DEBUG: <core> [mem/f_malloc.c:575]: fm_free(): fm_free(0x7f9c14f8a010, 0x7f9c15005318), called from core: db.c: db_do_close(356) 0(15574) DEBUG: <core> [mem/f_malloc.c:594]: fm_free(): fm_free: freeing block alloc'ed from core: db.c: db_do_init2(298) 0(15574) ERROR: <core> [sr_module.c:968]: init_mod(): Error while initializing module userblacklist (/usr/local/lib64/kamailio/modules/userblacklist.so) ERROR: error while initializing modules Kindly look into this and let me know how to make this work. Thanks, Sammy

1 0

git:master:28c44bad: Merge pull request #616 from linuxmaniac/vseva/fix_build_warnings
by Victor Seva 12 May '16

12 May '16

Module: kamailio Branch: master Commit: 28c44bad0d04cbf5c235f291f3068f58b7d81d07 URL: https://github.com/kamailio/kamailio/commit/28c44bad0d04cbf5c235f291f3068f5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-12T18:28:20+02:00 Merge pull request #616 from linuxmaniac/vseva/fix_build_warnings corex: fix compiler warning #612 --- Modified: modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/28c44bad0d04cbf5c235f291f3068f5… Patch: https://github.com/kamailio/kamailio/commit/28c44bad0d04cbf5c235f291f3068f5… --- diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index b8b047f..3c87f21 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -349,7 +349,12 @@ static int w_file_read(sip_msg_t *msg, char *fn, char *vn) fclose(f); return -1; } - fread(content, fsize, 1, f); + if(fread(content, fsize, 1, f) != fsize) { + if(ferror(f)) { + LM_ERR("error reading from file: %.*s\n", + fname.len, fname.s); + } + } fclose(f); content[fsize] = 0;

1 0

git:master:104be62b: corex: fix compiler warning #612
by Victor Seva 12 May '16

12 May '16

Module: kamailio Branch: master Commit: 104be62b493c5783ddeb17aef4753969a7b3679c URL: https://github.com/kamailio/kamailio/commit/104be62b493c5783ddeb17aef475396… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-12T17:22:53+02:00 corex: fix compiler warning #612 * show error message if error in read file > CC (clang) [M corex.so] corex_mod.o > corex_mod.c:352:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] > fread(content, fsize, 1, f); > ^~~~~ ~~~~~~~~~~~~~~~~~~~~ > 1 warning generated. --- Modified: modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/104be62b493c5783ddeb17aef475396… Patch: https://github.com/kamailio/kamailio/commit/104be62b493c5783ddeb17aef475396… --- diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index b8b047f..3c87f21 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -349,7 +349,12 @@ static int w_file_read(sip_msg_t *msg, char *fn, char *vn) fclose(f); return -1; } - fread(content, fsize, 1, f); + if(fread(content, fsize, 1, f) != fsize) { + if(ferror(f)) { + LM_ERR("error reading from file: %.*s\n", + fname.len, fname.s); + } + } fclose(f); content[fsize] = 0;

1 0

[kamailio/kamailio] corex: fix compiler warning #612 (#616)
by Victor Seva 12 May '16

12 May '16

* show error message if error in read file > CC (clang) [M corex.so] corex_mod.o > corex_mod.c:352:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] > fread(content, fsize, 1, f); > ^~~~~ ~~~~~~~~~~~~~~~~~~~~ > 1 warning generated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/616 -- Commit Summary -- * corex: fix compiler warning #612 -- File Changes -- M modules/corex/corex_mod.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/616.patch https://github.com/kamailio/kamailio/pull/616.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/616

2 2

git:master:c31bb617: nsq: fix missing bracket
by Emmanuel Schmidbauer 12 May '16

12 May '16

Module: kamailio Branch: master Commit: c31bb61739c9d38c7a489a5562861e2ee5dcf503 URL: https://github.com/kamailio/kamailio/commit/c31bb61739c9d38c7a489a5562861e2… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-12T12:13:11-04:00 nsq: fix missing bracket --- Modified: modules/nsq/nsq_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/c31bb61739c9d38c7a489a5562861e2… Patch: https://github.com/kamailio/kamailio/commit/c31bb61739c9d38c7a489a5562861e2… --- diff --git a/modules/nsq/nsq_pua.c b/modules/nsq/nsq_pua.c index f16b352..b5ff38f 100644 --- a/modules/nsq/nsq_pua.c +++ b/modules/nsq/nsq_pua.c @@ -327,7 +327,7 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { expires += (int)time(NULL); } - if (mwi_new.len > 0) + if (mwi_new.len > 0) { sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s,

1 0

git:master:c5b79b55: nsq: fix MWI NOTIFY with 0 Voice Messages
by Emmanuel Schmidbauer 12 May '16

12 May '16

Module: kamailio Branch: master Commit: c5b79b55f2f0cdaf7f99e5f0d8042ba6435b98c8 URL: https://github.com/kamailio/kamailio/commit/c5b79b55f2f0cdaf7f99e5f0d8042ba… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-12T12:07:59-04:00 nsq: fix MWI NOTIFY with 0 Voice Messages --- Modified: modules/nsq/defs.h Modified: modules/nsq/nsq_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/c5b79b55f2f0cdaf7f99e5f0d8042ba… Patch: https://github.com/kamailio/kamailio/commit/c5b79b55f2f0cdaf7f99e5f0d8042ba… --- diff --git a/modules/nsq/defs.h b/modules/nsq/defs.h index 0f479c1..68ab9e7 100644 --- a/modules/nsq/defs.h +++ b/modules/nsq/defs.h @@ -79,6 +79,7 @@ #define PRESENCE_BODY_BUFFER_SIZE 4096 #define MWI_BODY_VOICE_MESSAGE "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s\r\n" +#define MWI_BODY_NO_VOICE_MESSAGE "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\n" #define MWI_BODY "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s/%.*s (%.*s/%.*s)\r\n" #define PRESENCE_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%s\"> \ diff --git a/modules/nsq/nsq_pua.c b/modules/nsq/nsq_pua.c index 005d094..f16b352 100644 --- a/modules/nsq/nsq_pua.c +++ b/modules/nsq/nsq_pua.c @@ -327,14 +327,17 @@ int nsq_pua_publish_mwi_to_presentity(struct json_object *json_obj) { expires += (int)time(NULL); } - if (mwi_voice_message.len > 0) { - sprintf(body, MWI_BODY_VOICE_MESSAGE, mwi_waiting.len, mwi_waiting.s, - mwi_account.len, mwi_account.s, mwi_voice_message.len, mwi_voice_message.s); - } else { + if (mwi_new.len > 0) sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s, mwi_urgent_saved.len, mwi_urgent_saved.s); + } else if (mwi_voice_message.len > 0) { + sprintf(body, MWI_BODY_VOICE_MESSAGE, mwi_waiting.len, mwi_waiting.s, + mwi_account.len, mwi_account.s, mwi_voice_message.len, mwi_voice_message.s); + } else { + sprintf(body, MWI_BODY_NO_VOICE_MESSAGE, mwi_waiting.len, mwi_waiting.s, + mwi_account.len, mwi_account.s); } mwi_body.s = body;

1 0

[kamailio/kamailio] change answered elsewhere to call completed elsewhere (#610)
by William King 12 May '16

12 May '16

"Call completed elsewhere", RFC3326, defines this as the string to send. Author: Frank Carmickle <frank(a)silentcircle.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/610 -- Commit Summary -- * change answered elsewhere to call completed elsewhere -- File Changes -- M modules/tm/t_cancel.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/610.patch https://github.com/kamailio/kamailio/pull/610.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/610

3 6

git:master:e75837af: tm: updated the reason text for canceled branches after one is answered
by Daniel-Constantin Mierla 12 May '16

12 May '16

Module: kamailio Branch: master Commit: e75837afc7e146d0f43e637d394146c3f1d05eea URL: https://github.com/kamailio/kamailio/commit/e75837afc7e146d0f43e637d394146c… Author: Frank Carmickle <frank(a)silentcircle.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-12T18:03:04+02:00 tm: updated the reason text for canceled branches after one is answered - change answered elsewhere to call completed elsewhere - "Call completed elsewhere", RFC3326, defines this as the string to send - submited by William King <william.king(a)quentustech.com>, GH #610 --- Modified: modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/e75837afc7e146d0f43e637d394146c… Patch: https://github.com/kamailio/kamailio/commit/e75837afc7e146d0f43e637d394146c… --- diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 9db7abe..9702f65 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -43,7 +43,7 @@ typedef struct cancel_reason_map { } cancel_reason_map_t; static cancel_reason_map_t _cancel_reason_map[] = { - { 200, str_init("Answered elsewhere") }, + { 200, str_init("Call completed elsewhere") }, { 0, {0, 0} } };

1 0

git:master:1aaac266: nsq: update license
by Emmanuel Schmidbauer 12 May '16

12 May '16

Module: kamailio Branch: master Commit: 1aaac266dcafcb083311f3d9d871897c8130203a URL: https://github.com/kamailio/kamailio/commit/1aaac266dcafcb083311f3d9d871897… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-05-12T11:38:41-04:00 nsq: update license --- Modified: modules/nsq/defs.h Modified: modules/nsq/nsq_json.c Modified: modules/nsq/nsq_json.h Modified: modules/nsq/nsq_mod.c Modified: modules/nsq/nsq_mod.h Modified: modules/nsq/nsq_pua.c Modified: modules/nsq/nsq_pua.h Modified: modules/nsq/nsq_reader.c Modified: modules/nsq/nsq_reader.h Modified: modules/nsq/nsq_trans.c Modified: modules/nsq/nsq_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1aaac266dcafcb083311f3d9d871897… Patch: https://github.com/kamailio/kamailio/commit/1aaac266dcafcb083311f3d9d871897…

1 0

[kamailio/kamailio] nsq: fix segfault on module destroy (#613)
by Emmanuel Schmidbauer 12 May '16

12 May '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/613 -- Commit Summary -- * nsq: fix segfault on module destroy -- File Changes -- M modules/nsq/nsq_mod.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/613.patch https://github.com/kamailio/kamailio/pull/613.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/613

3 3

← Newer
1
...
16
17
18
19
20
21
22
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2016