sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:5.0:96b8bfdb: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Mar '18

05 Mar '18

Module: kamailio Branch: 5.0 Commit: 96b8bfdbe0ff978e13961e04a251470007d945fe URL: https://github.com/kamailio/kamailio/commit/96b8bfdbe0ff978e13961e04a251470… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-05T09:46:27+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/96b8bfdbe0ff978e13961e04a251470… Patch: https://github.com/kamailio/kamailio/commit/96b8bfdbe0ff978e13961e04a251470… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 06a5728ca6..8378f333e2 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -86,6 +86,7 @@ Carsten Bock 3.40. db_insert_null (int) 3.41. skip_remote_socket (int) 3.42. db_timer_clean (int) + 3.43. server_id_filter (int) 4. RPC Commands @@ -175,6 +176,7 @@ Carsten Bock 1.40. Set db_insert_null parameter 1.41. Set skip_remote_socket parameter 1.42. Set db_timer_clean parameter + 1.43. Set server_id_filter parameter Chapter 1. Admin Guide @@ -233,6 +235,7 @@ Chapter 1. Admin Guide 3.40. db_insert_null (int) 3.41. skip_remote_socket (int) 3.42. db_timer_clean (int) + 3.43. server_id_filter (int) 4. RPC Commands @@ -355,6 +358,7 @@ Chapter 1. Admin Guide 3.40. db_insert_null (int) 3.41. skip_remote_socket (int) 3.42. db_timer_clean (int) + 3.43. server_id_filter (int) 3.1. nat_bflag (integer) @@ -931,6 +935,17 @@ modparam("usrloc", "skip_remote_socket", 1) modparam("usrloc", "db_timer_clean", 1) ... +3.43. server_id_filter (int) + + Enable (1) or disable (0) filter records by server_id on load. + + Default value is “0”. + + Example 1.43. Set server_id_filter parameter +... +modparam("usrloc", "server_id_filter", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:5.0:15858a69: srloc: missing documentation for module parameter 'server_id_filter'
by Victor Seva 05 Mar '18

05 Mar '18

Module: kamailio Branch: 5.0 Commit: 15858a69a18633ff9ee16a1c3cb61fede805dd83 URL: https://github.com/kamailio/kamailio/commit/15858a69a18633ff9ee16a1c3cb61fe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-05T09:44:36+01:00 srloc: missing documentation for module parameter 'server_id_filter' (cherry picked from commit fa9947c7295f364235f9f6417fc44fa486bf0c87) (cherry picked from commit 0928fa7ef1652e0646b08a118592094753ec18c6) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/15858a69a18633ff9ee16a1c3cb61fe… Patch: https://github.com/kamailio/kamailio/commit/15858a69a18633ff9ee16a1c3cb61fe… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 2f7ab8042f..0a5c65676b 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1115,6 +1115,26 @@ modparam("usrloc", "db_timer_clean", 1) </example> </section> + <section id="usrloc.p.server_id_filter"> + <title><varname>server_id_filter</varname> (int)</title> + <para> + Enable (1) or disable (0) filter records by server_id on load. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>server_id_filter</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "server_id_filter", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:5.1:0928fa7e: srloc: missing documentation for module parameter 'server_id_filter'
by Victor Seva 05 Mar '18

05 Mar '18

Module: kamailio Branch: 5.1 Commit: 0928fa7ef1652e0646b08a118592094753ec18c6 URL: https://github.com/kamailio/kamailio/commit/0928fa7ef1652e0646b08a118592094… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-05T09:43:23+01:00 srloc: missing documentation for module parameter 'server_id_filter' (cherry picked from commit fa9947c7295f364235f9f6417fc44fa486bf0c87) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0928fa7ef1652e0646b08a118592094… Patch: https://github.com/kamailio/kamailio/commit/0928fa7ef1652e0646b08a118592094… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 96ff750f97..177a5aef80 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1177,6 +1177,26 @@ modparam("usrloc", "db_timer_clean", 1) </example> </section> + <section id="usrloc.p.server_id_filter"> + <title><varname>server_id_filter</varname> (int)</title> + <para> + Enable (1) or disable (0) filter records by server_id on load. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>server_id_filter</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "server_id_filter", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:fa9947c7: usrloc: missing documentation for module parameter 'server_id_filter'
by Victor Seva 05 Mar '18

05 Mar '18

Module: kamailio Branch: master Commit: fa9947c7295f364235f9f6417fc44fa486bf0c87 URL: https://github.com/kamailio/kamailio/commit/fa9947c7295f364235f9f6417fc44fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-05T09:34:36+01:00 usrloc: missing documentation for module parameter 'server_id_filter' --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fa9947c7295f364235f9f6417fc44fa… Patch: https://github.com/kamailio/kamailio/commit/fa9947c7295f364235f9f6417fc44fa… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index bceb11c9f1..5de9b82c08 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1198,6 +1198,26 @@ modparam("usrloc", "rm_expired_delay", 30) </example> </section> + <section id="usrloc.p.server_id_filter"> + <title><varname>server_id_filter</varname> (int)</title> + <para> + Enable (1) or disable (0) filter records by server_id on load. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>server_id_filter</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "server_id_filter", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

[kamailio/kamailio] db_cassandra can't find table version (#618)
by goharahmed 03 Mar '18

03 Mar '18

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 --- 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/issues/618

3 14

git:master:1bf9eac9: misc/db script: change e-mail adress in ser database scripts
by Henning Westerholt 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 1bf9eac9d1531cf8e7492ba6c21f60493c309cee URL: https://github.com/kamailio/kamailio/commit/1bf9eac9d1531cf8e7492ba6c21f604… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-03T19:28:25+01:00 misc/db script: change e-mail adress in ser database scripts - change e-mail adress in ser database scripts to sr-dev list - these scripts are probably obselete - but this way we will at least notice if somebody tries to use them --- Modified: misc/scripts/dbtext/ser_dbtext.sh Modified: misc/scripts/mysql/sip-router_mysql.sh Modified: misc/scripts/postgres/ser_postgres.sh --- Diff: https://github.com/kamailio/kamailio/commit/1bf9eac9d1531cf8e7492ba6c21f604… Patch: https://github.com/kamailio/kamailio/commit/1bf9eac9d1531cf8e7492ba6c21f604… --- diff --git a/misc/scripts/dbtext/ser_dbtext.sh b/misc/scripts/dbtext/ser_dbtext.sh index ce34142184..d572dca06c 100755 --- a/misc/scripts/dbtext/ser_dbtext.sh +++ b/misc/scripts/dbtext/ser_dbtext.sh @@ -104,7 +104,7 @@ FILES ${SRCDB_DIR}/${SRCDB} REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage diff --git a/misc/scripts/mysql/sip-router_mysql.sh b/misc/scripts/mysql/sip-router_mysql.sh index 3b40132ecd..aba468c7aa 100755 --- a/misc/scripts/mysql/sip-router_mysql.sh +++ b/misc/scripts/mysql/sip-router_mysql.sh @@ -175,7 +175,7 @@ FILES ${SCRIPT_DIR}/${DROP_SCRIPT} REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage diff --git a/misc/scripts/postgres/ser_postgres.sh b/misc/scripts/postgres/ser_postgres.sh index 9412ba0d21..cca43e1eee 100755 --- a/misc/scripts/postgres/ser_postgres.sh +++ b/misc/scripts/postgres/ser_postgres.sh @@ -53,7 +53,7 @@ Usage: $COMMAND create [database] to create databases, tables, and users) PSQL Full path to mysql command (${PSQL}) -Report bugs to <ser-bugs(a)iptel.org> +Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage

1 0

git:master:52a8def8: utils: kamdbctl - updated help message for migrate command
by Daniel-Constantin Mierla 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 52a8def8d2a3e83170ab554a85b26d977d99f51a URL: https://github.com/kamailio/kamailio/commit/52a8def8d2a3e83170ab554a85b26d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-14T11:24:37+01:00 utils: kamdbctl - updated help message for migrate command --- Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/52a8def8d2a3e83170ab554a85b26d9… Patch: https://github.com/kamailio/kamailio/commit/52a8def8d2a3e83170ab554a85b26d9… --- diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 2abde29d26..13af37e7c6 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -97,7 +97,7 @@ usage: $COMMAND create <db name or db_path, optional> ...(creates a new database $COMMAND backup <file> ...........................(dumps current database to file) $COMMAND restore <file> ..........................(restores tables from a file) $COMMAND copy <new_db> ...........................(creates a new db from an existing one) - $COMMAND migrate <old_db> <new_db> ...............(migrates DB from 1.2 to 1.3, not implemented yet!) + $COMMAND migrate <old_db> <new_db> ...............(migrates DB - no longer maintained!) $COMMAND presence ................................(adds the presence related tables) $COMMAND extra ...................................(adds the extra tables) $COMMAND dbuid ...................................(adds the uid tables)

2 3

git:master:4d447560: kamdbctl: remove not working db migrate command
by Henning Westerholt 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 4d447560ccfb253e5b5627c9900d46458bfcbe5d URL: https://github.com/kamailio/kamailio/commit/4d447560ccfb253e5b5627c9900d464… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-03T19:08:30+01:00 kamdbctl: remove not working db migrate command - remove db migrate implementation in kamdbctl, .base, .mysql and .db_berkley files - it was not working for mysql anyway, and not implemented for berkleydb - this state was already documtend some weeks ago in commit 52a8def8d2a3e831 --- Modified: utils/kamctl/kamdbctl Modified: utils/kamctl/kamdbctl.base Modified: utils/kamctl/kamdbctl.db_berkeley Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/4d447560ccfb253e5b5627c9900d464… Patch: https://github.com/kamailio/kamailio/commit/4d447560ccfb253e5b5627c9900d464…

1 0

git:master:06480434: Merge pull request #1467 from que273/master
by GitHub 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 064804347421088e01c9f702933aa76ed59c7c13 URL: https://github.com/kamailio/kamailio/commit/064804347421088e01c9f702933aa76… Author: henningw <henningw(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2018-03-03T19:03:27+01:00 Merge pull request #1467 from que273/master sqlops: sqlops_do_query - Make result parameter optional in C API --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/064804347421088e01c9f702933aa76… Patch: https://github.com/kamailio/kamailio/commit/064804347421088e01c9f702933aa76… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 16492300bc..21fbfa950f 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -697,17 +697,27 @@ int sqlops_do_query(str *scon, str *squery, str *sres) sql_con_t *con = NULL; sql_result_t *res = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) { LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); goto error; } - res = sql_get_result(sres); - if(res==NULL) + /* Result parameter is optional */ + if (sres && sres->s) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); - goto error; + res = sql_get_result(sres); + if(res==NULL) + { + LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + goto error; + } } if(sql_do_query(con, squery, res)<0) goto error; @@ -724,6 +734,12 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -754,6 +770,12 @@ int sqlops_is_null(str *sres, int i, int j) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -784,6 +806,12 @@ int sqlops_get_column(str *sres, int i, str *col) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -808,6 +836,12 @@ int sqlops_num_columns(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -826,6 +860,12 @@ int sqlops_num_rows(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -844,6 +884,12 @@ void sqlops_reset_result(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + return; + } + res = sql_get_result(sres); if(res==NULL) { @@ -862,6 +908,12 @@ int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) { sql_con_t *con = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) {

1 0

git:master:53e1326f: sqlops: Add NULL parameter check to C/KEMI API functions
by Hugh Waite 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 53e1326f25e57491343a86a52b7ddf7919acce12 URL: https://github.com/kamailio/kamailio/commit/53e1326f25e57491343a86a52b7ddf7… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-03-01T22:54:18Z sqlops: Add NULL parameter check to C/KEMI API functions - Check for NULL string parameters to prevent crashes sqlops_do_query, sqlops_get_value, sqlops_is_null, sqlops_get_column, sqlops_reset_result, sqlops_num_rows, sqlops_num_columns, sqlops_do_xquery --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53e1326f25e57491343a86a52b7ddf7… Patch: https://github.com/kamailio/kamailio/commit/53e1326f25e57491343a86a52b7ddf7… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 825f77602a..21fbfa950f 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -697,16 +697,27 @@ int sqlops_do_query(str *scon, str *squery, str *sres) sql_con_t *con = NULL; sql_result_t *res = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) { LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); goto error; } - if (sres && ((res = sql_get_result(sres)) == NULL)) + /* Result parameter is optional */ + if (sres && sres->s) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); - goto error; + res = sql_get_result(sres); + if(res==NULL) + { + LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + goto error; + } } if(sql_do_query(con, squery, res)<0) goto error; @@ -723,6 +734,12 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -753,6 +770,12 @@ int sqlops_is_null(str *sres, int i, int j) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -783,6 +806,12 @@ int sqlops_get_column(str *sres, int i, str *col) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -807,6 +836,12 @@ int sqlops_num_columns(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -825,6 +860,12 @@ int sqlops_num_rows(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -843,6 +884,12 @@ void sqlops_reset_result(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + return; + } + res = sql_get_result(sres); if(res==NULL) { @@ -861,6 +908,12 @@ int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) { sql_con_t *con = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) {

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
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