sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master: core: new maro LOG__(...) to allow overwriting default name for log level
by Daniel-Constantin Mierla 19 Mar '14

19 Mar '14

Module: sip-router Branch: master Commit: 8a6fb78081e68c9aea461db8989232c3e69335e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a6fb78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 19 22:06:21 2014 +0100 core: new maro LOG__(...) to allow overwriting default name for log level - LOG_(...) is pinting to it now --- dprint.h | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dprint.h b/dprint.h index 59cba08..f1df108 100644 --- a/dprint.h +++ b/dprint.h @@ -163,10 +163,12 @@ void dprint_term_color(char f, char b, str *obuf); #ifdef NO_LOG # ifdef __SUNPRO_C +# define LOG__(facility, level, lname, prefix, fmt, ...) # define LOG_(facility, level, prefix, fmt, ...) # define LOG(level, fmt, ...) # define LOG_FC(facility, level, fmt, ...) # else +# define LOG__(facility, level, lname, prefix, fmt, args...) # define LOG_(facility, level, prefix, fmt, args...) # define LOG(level, fmt, args...) # define LOG_FC(facility, level, fmt, args...) @@ -185,7 +187,7 @@ void dprint_term_color(char f, char b, str *obuf); # endif # ifdef __SUNPRO_C -# define LOG_(facility, level, prefix, fmt, ...) \ +# define LOG__(facility, level, lname, prefix, fmt, ...) \ do { \ if (unlikely(get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ DPRINT_NON_CRIT)) { \ @@ -195,7 +197,7 @@ void dprint_term_color(char f, char b, str *obuf); if (unlikely(log_color)) dprint_color(level); \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ process_no, my_pid(), \ - LOG_LEVEL2NAME(level), (prefix), \ + (lname)?(lname):LOG_LEVEL2NAME(level), (prefix), \ __VA_ARGS__); \ if (unlikely(log_color)) dprint_color_reset(); \ } else { \ @@ -203,7 +205,8 @@ void dprint_term_color(char f, char b, str *obuf); (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ cfg_get(core, core_cfg, log_facility)), \ - "%s: %s" fmt, LOG_LEVEL2NAME(level),\ + "%s: %s" fmt, \ + (lname)?(lname):LOG_LEVEL2NAME(level),\ (prefix), __VA_ARGS__); \ } \ } else { \ @@ -231,7 +234,10 @@ void dprint_term_color(char f, char b, str *obuf); DPRINT_CRIT_EXIT; \ } \ } while(0) - + +# define LOG_(facility, level, lname, prefix, fmt, ...) \ + LOG__(facility, level, NULL, prefix, fmt, __VA_ARGS__) + # ifdef LOG_FUNC_NAME # define LOG(level, fmt, ...) \ LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt,\ @@ -251,7 +257,7 @@ void dprint_term_color(char f, char b, str *obuf); # endif /* LOG_FUNC_NAME */ # else /* ! __SUNPRO_C */ -# define LOG_(facility, level, prefix, fmt, args...) \ +# define LOG__(facility, level, lname, prefix, fmt, args...) \ do { \ if (get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ DPRINT_NON_CRIT) { \ @@ -261,7 +267,7 @@ void dprint_term_color(char f, char b, str *obuf); if (unlikely(log_color)) dprint_color(level); \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ process_no, my_pid(), \ - LOG_LEVEL2NAME(level), \ + (lname)?(lname):LOG_LEVEL2NAME(level), \ (prefix) , ## args);\ if (unlikely(log_color)) dprint_color_reset(); \ } else { \ @@ -269,7 +275,8 @@ void dprint_term_color(char f, char b, str *obuf); (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ cfg_get(core, core_cfg, log_facility)), \ - "%s: %s" fmt, LOG_LEVEL2NAME(level),\ + "%s: %s" fmt,\ + (lname)?(lname):LOG_LEVEL2NAME(level),\ (prefix) , ## args); \ } \ } else { \ @@ -297,7 +304,10 @@ void dprint_term_color(char f, char b, str *obuf); DPRINT_CRIT_EXIT; \ } \ } while(0) - + +# define LOG_(facility, level, prefix, fmt, args...) \ + LOG__(facility, level, NULL, prefix, fmt, ## args) + # ifdef LOG_FUNC_NAME # define LOG(level, fmt, args...) \ LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\

1 0

Controlling REGISTRAR-Cache (SBC) from Proxy
by Carsten Bock 19 Mar '14

19 Mar '14

Hi, quick question: is there an easy way, to control the REGISTRAR-Cache? What i'd like to do, examples: - Clear Registrar-Cache from Commandline or RPC, Single Entry or all of them - append some sort of header to my REGISTER request, so SEMS would have to refresh the REGISTER to the upstream REGISTRAR-Server instead of using the current cache Anyone got an idea, how to build such feature? Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Schomburgstr. 80 D-22767 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 34927219 Fax +49 40 34927220 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

1 0

git:master: lib/kcore: link it against lib/srutils
by Daniel-Constantin Mierla 19 Mar '14

19 Mar '14

Module: sip-router Branch: master Commit: 27f2ae83d9adf59bc9158dd40bf1b960c8ffaa19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27f2ae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 19 18:37:06 2014 +0100 lib/kcore: link it against lib/srutils - reported by Carsten Bock --- lib/kcore/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/kcore/Makefile b/lib/kcore/Makefile index 4198f4e..b3f43e0 100644 --- a/lib/kcore/Makefile +++ b/lib/kcore/Makefile @@ -6,4 +6,7 @@ MINOR_VER=0 BUGFIX_VER=0 LIBS= +SERLIBPATH=.. +SER_LIBS=$(SERLIBPATH)/srutils/srutils + include ../../Makefile.libs

1 0

git:master: core: L_NPRL aliased to L_ALERT-1 to allow printing messages without level name
by Daniel-Constantin Mierla 19 Mar '14

19 Mar '14

Module: sip-router Branch: master Commit: 408d7e9bfd485d3fc6c7eb99894098283729aad0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=408d7e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 19 16:30:21 2014 +0100 core: L_NPRL aliased to L_ALERT-1 to allow printing messages without level name - new defines LM_NPRL() and NPRL() are using it --- dprint.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dprint.h b/dprint.h index 0842988..59cba08 100644 --- a/dprint.h +++ b/dprint.h @@ -86,6 +86,7 @@ /* * Log levels */ +#define L_NPRL -6 /* (L_MIN-1) to skip printing level prefix */ #define L_MIN -5 #define L_ALERT -5 #define L_BUG -4 @@ -321,6 +322,7 @@ void dprint_term_color(char f, char b, str *obuf); */ /*@ { */ #ifdef __SUNPRO_C +# define NPRL(...) LOG(L_NPRL, __VA_ARGS__) # define ALERT(...) LOG(L_ALERT, __VA_ARGS__) # define BUG(...) LOG(L_BUG, __VA_ARGS__) # define ERR(...) LOG(L_ERR, __VA_ARGS__) @@ -340,6 +342,7 @@ void dprint_term_color(char f, char b, str *obuf); # define DEBUG(...) DBG(__VA_ARGS__) #else /* ! __SUNPRO_C */ +# define NPRL(fmt, args...) LOG(L_NPRL, fmt , ## args) # define ALERT(fmt, args...) LOG(L_ALERT, fmt , ## args) # define BUG(fmt, args...) LOG(L_BUG, fmt , ## args) # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) @@ -364,6 +367,7 @@ void dprint_term_color(char f, char b, str *obuf); #define LM_GEN1 LOG #define LM_GEN2 LOG_FC +#define LM_NPRL NPRL #define LM_ALERT ALERT #define LM_CRIT CRIT #define LM_ERR ERR

1 0

git:master: pv: changes to SHA string transformations
by Lucian Balaceanu 19 Mar '14

19 Mar '14

Module: sip-router Branch: master Commit: ff91a65db150210a0c55ce57df9f476a9e0ee25e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff91a65… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Tue Mar 18 17:20:36 2014 +0200 pv: changes to SHA string transformations - addressed memset faulty usage, changed location of sha256 files, removed sha2utils.h as we can use defines in sha256.h, removed redundant code --- lib/kcore/strcommon.c | 12 +++--------- lib/kcore/strcommon.h | 2 +- sha256.c => lib/srutils/sha256.c | 14 +++++++------- sha256.h => lib/srutils/sha256.h | 0 modules/pv/pv_trans.c | 13 ++++++------- sha2utils.h | 17 ----------------- 6 files changed, 17 insertions(+), 41 deletions(-) diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c index 9401457..8e57e93 100644 --- a/lib/kcore/strcommon.c +++ b/lib/kcore/strcommon.c @@ -125,33 +125,27 @@ void compute_md5(char *dst, char *src, int src_len) void compute_sha256(char *dst, u_int8_t *src, int src_len) { SHA256_CTX ctx256; - char buf[64]; SHA256_Init(&ctx256); SHA256_Update(&ctx256, src, src_len); - SHA256_End(&ctx256, buf); - strncpy(dst, buf, 64); + SHA256_End(&ctx256, dst); } /*! \brief Compute SHA384 checksum */ void compute_sha384(char *dst, u_int8_t *src, int src_len) { SHA384_CTX ctx384; - char buf[96]; SHA384_Init(&ctx384); SHA384_Update(&ctx384, src, src_len); - SHA384_End(&ctx384, buf); - strncpy(dst, buf, 96); + SHA384_End(&ctx384, dst); } /*! \brief Compute SHA512 checksum */ void compute_sha512(char *dst, u_int8_t *src, int src_len) { SHA512_CTX ctx512; - char buf[128]; SHA512_Init(&ctx512); SHA512_Update(&ctx512, src, src_len); - SHA512_End(&ctx512, buf); - strncpy(dst, buf, 128); + SHA512_End(&ctx512, dst); } /*! \brief Unscape all printable ASCII characters */ diff --git a/lib/kcore/strcommon.h b/lib/kcore/strcommon.h index 5864ef0..9e81455 100644 --- a/lib/kcore/strcommon.h +++ b/lib/kcore/strcommon.h @@ -30,7 +30,7 @@ #include "../../str.h" #include "../../md5.h" -#include "../../sha256.h" +#include "../srutils/sha256.h" /* * add backslashes to special characters diff --git a/sha256.c b/lib/srutils/sha256.c similarity index 98% rename from sha256.c rename to lib/srutils/sha256.c index 187d11d..087736d 100644 --- a/sha256.c +++ b/lib/srutils/sha256.c @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided w627ith the distribution. * 3. Neither the name of the copyright holder nor the names of contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -624,7 +624,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { } /* Clean up state data: */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); usedspace = 0; } @@ -645,7 +645,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) { } *buffer = (char)0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH); return buffer; @@ -954,7 +954,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA512_End(SHA512_CTX* context, char buffer[]) { @@ -974,7 +974,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) { } *buffer = (char)0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); return buffer; @@ -1029,7 +1029,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA384_End(SHA384_CTX* context, char buffer[]) { @@ -1049,7 +1049,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) { } *buffer = (char)0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH); return buffer; diff --git a/sha256.h b/lib/srutils/sha256.h similarity index 100% rename from sha256.h rename to lib/srutils/sha256.h diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 5250920..868123e 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -47,7 +47,6 @@ #include "../../parser/parse_nameaddr.h" #include "../../lib/kcore/strcommon.h" -#include "../../sha2utils.h" #include "pv_trans.h" @@ -240,31 +239,31 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); compute_sha256(_tr_buffer, (u_int8_t*)val->rs.s, val->rs.len); - _tr_buffer[SHA256_LEN] = '\0'; + _tr_buffer[SHA256_DIGEST_STRING_LENGTH -1] = '\0'; val->flags = PV_VAL_STR; val->ri = 0; val->rs.s = _tr_buffer; - val->rs.len = SHA256_LEN; + val->rs.len = SHA256_DIGEST_STRING_LENGTH -1 ; break; case TR_S_SHA384: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); compute_sha384(_tr_buffer, (u_int8_t*)val->rs.s, val->rs.len); - _tr_buffer[SHA384_LEN] = '\0'; + _tr_buffer[SHA384_DIGEST_STRING_LENGTH -1] = '\0'; val->flags = PV_VAL_STR; val->ri = 0; val->rs.s = _tr_buffer; - val->rs.len = SHA384_LEN; + val->rs.len = SHA384_DIGEST_STRING_LENGTH -1; break; case TR_S_SHA512: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); compute_sha512(_tr_buffer, (u_int8_t*)val->rs.s, val->rs.len); - _tr_buffer[SHA512_LEN] = '\0'; + _tr_buffer[SHA512_DIGEST_STRING_LENGTH -1] = '\0'; val->flags = PV_VAL_STR; val->ri = 0; val->rs.s = _tr_buffer; - val->rs.len = SHA512_LEN; + val->rs.len = SHA512_DIGEST_STRING_LENGTH -1; break; case TR_S_ENCODEHEXA: if(!(val->flags&PV_VAL_STR)) diff --git a/sha2utils.h b/sha2utils.h deleted file mode 100644 index b3c5c96..0000000 --- a/sha2utils.h +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * \file - * \brief SIP-router core :: sha2 hash support - * \ingroup core - * Module: \ref core - */ - -#ifndef _SHA2UTILS_H -#define _SHA2UTILS_H - -#include "str.h" - -#define SHA256_LEN 64 -#define SHA384_LEN 96 -#define SHA512_LEN 128 - -#endif /* _SHA2UTILS_H */

3 5

[tracker] Comment added: kamailio blocking in usrloc db_mode 2
by sip-router 19 Mar '14

19 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#408 - kamailio blocking in usrloc db_mode 2 User who did this - Krischan Udelhoven (Krischan) ---------- I've tweaked the parameters by setting the hash_size to 14, timer_procs to 4 and db_ops_ruid to 1. Now only a few timeouts occur during syncing. I think that is because of my slow testing device. Thank you for the help! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=408#comment1350 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:4.1: db_cassandra: bug fixes for raw queries using sqlops
by Daniel-Constantin Mierla 19 Mar '14

19 Mar '14

Module: sip-router Branch: 4.1 Commit: 520276f856474521cb419c11fa185ce9d6a8a285 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=520276f… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 14 10:04:53 2014 -0300 db_cassandra: bug fixes for raw queries using sqlops (cherry picked from commit 2f9e8d2e122edc5b7950ee6ab0991851c9cd7bbd) --- modules/db_cassandra/dbcassa_base.cpp | 210 +++++++++++++++++++++++++++------ 1 files changed, 175 insertions(+), 35 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index e9d3a32..ffa9e3b 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -252,6 +252,7 @@ static int cassa_convert_result(db_key_t qcol, std::vector<oac::ColumnOrSuperCol res_col = result[idx_rescol].column; col_val.s = (char*)res_col.value.c_str(); + if(!col_val.s) { LM_DBG("Column not found in result %.*s- NULL\n", qcol->len, qcol->s); sr_cell->nul = 1; @@ -585,7 +586,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, * \param _r result set for storage * \return zero on success, negative value on failure */ -int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r) +int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r, dbcassa_table_p tbc) { std::vector<oac::CqlRow> res_cql_rows = _cql_res.rows; int rows_no = res_cql_rows.size(); @@ -630,14 +631,86 @@ int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r) /* The pointer that is here returned is part of the result structure. */ RES_NAMES(_r)[col]->s = (char*) res_cql_rows[0].columns[col].name.c_str(); RES_NAMES(_r)[col]->len = strlen(RES_NAMES(_r)[col]->s); - RES_TYPES(_r)[col] = DB1_STR; + /* search the column in table schema to get the type */ + dbcassa_column_p colp = cassa_search_col(tbc, (db_key_t) RES_NAMES(_r)[col]); + if(!colp) { + LM_ERR("No column with name [%.*s] found\n", RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s); + RES_COL_N(_r) = col; + db_free_columns(_r); + return -4; + } + + RES_TYPES(_r)[col] = colp->type; + + LM_DBG("Column with name [%.*s] found: %d\n", RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, colp->type); LM_DBG("RES_NAMES(%p)[%d]=[%.*s]\n", RES_NAMES(_r)[col], col, RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s); } return 0; } +static int cassa_convert_result_raw(db_val_t* sr_cell, str *col_val) { + + if(!col_val->s) { + LM_DBG("Column not found in result - NULL\n"); + sr_cell->nul = 1; + return 0; + } + col_val->len = strlen(col_val->s); + + sr_cell->nul = 0; + sr_cell->free = 0; + + switch (sr_cell->type) { + case DB1_INT: + if(str2int(col_val, (unsigned int*)&sr_cell->val.int_val) < 0) { + LM_ERR("Wrong value [%s] - len=%d, expected integer\n", col_val->s, col_val->len); + return -1; + } + break; + case DB1_BIGINT: + if(sscanf(col_val->s, "%lld", &sr_cell->val.ll_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + case DB1_DOUBLE: + if(sscanf(col_val->s, "%lf", &sr_cell->val.double_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + case DB1_STR: + pkg_str_dup(&sr_cell->val.str_val, col_val); + sr_cell->free = 1; + break; + case DB1_STRING: + col_val->len++; + pkg_str_dup(&sr_cell->val.str_val, col_val); + sr_cell->val.str_val.len--; + sr_cell->val.str_val.s[col_val->len-1]='\0'; + sr_cell->free = 1; + break; + case DB1_BLOB: + pkg_str_dup(&sr_cell->val.blob_val, col_val); + sr_cell->free = 1; + break; + case DB1_BITMAP: + if(str2int(col_val, &sr_cell->val.bitmap_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + case DB1_DATETIME: + if(sscanf(col_val->s, "%ld", (long int*)&sr_cell->val.time_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + } + return 0; +} /** @@ -649,35 +722,33 @@ int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r) * \param _r result set for storage * \return zero on success, negative value on failure */ + int cql_convert_row(oac::CqlResult& _cql_res, db1_res_t* _r) { std::vector<oac::CqlRow> res_cql_rows = _cql_res.rows; - int rows_no = res_cql_rows.size(); - int cols_no = res_cql_rows[0].columns.size(); - str col_val; - - RES_ROW_N(_r) = rows_no; - - if (db_allocate_rows(_r) < 0) { - LM_ERR("Could not allocate rows.\n"); - return -1; - } - - for(int ri=0; ri < rows_no; ri++) { - if (db_allocate_row(_r, &(RES_ROWS(_r)[ri])) != 0) { - LM_ERR("Could not allocate row.\n"); - return -2; - } - - /* complete the row with the columns */ + int rows_no = res_cql_rows.size(); + int cols_no = res_cql_rows[0].columns.size(); + str col_val; + RES_ROW_N(_r) = rows_no; + + if (db_allocate_rows(_r) < 0) { + LM_ERR("Could not allocate rows.\n"); + return -1; + } + + for(int ri=0; ri < rows_no; ri++) { + if (db_allocate_row(_r, &(RES_ROWS(_r)[ri])) != 0) { + LM_ERR("Could not allocate row.\n"); + return -2; + } + + // complete the row with the columns for(int col = 0; col< cols_no; col++) { - RES_ROWS(_r)[ri].values[col].type = DB1_STR; - col_val.s = (char*)res_cql_rows[ri].columns[col].value.c_str(); - col_val.len = strlen(col_val.s); - pkg_str_dup(&RES_ROWS(_r)[ri].values[col].val.str_val, &col_val); - RES_ROWS(_r)[ri].values[col].free = 1; - RES_ROWS(_r)[ri].values[col].nul = 0; + col_val.len = strlen(col_val.s); + + RES_ROWS(_r)[ri].values[col].type = RES_TYPES(_r)[col]; + cassa_convert_result_raw(&RES_ROWS(_r)[ri].values[col], &col_val); LM_DBG("Field index %d. %s = %s.\n", col, res_cql_rows[ri].columns[col].name.c_str(), @@ -685,13 +756,62 @@ int cql_convert_row(oac::CqlResult& _cql_res, db1_res_t* _r) } } return 0; -} - +} /* * The functions for the DB Operations: query, delete, update. * */ +/* + * Extracts table name from DML query being used + * + * */ +static int get_table_from_query(const str *cql, str *table) { + + char *ptr = cql->s, + *begin = NULL; + + if (cql->s[0] == 's' || cql->s[0] == 'S') { + ptr = strcasestr(cql->s, "from"); + ptr += sizeof(char) * 4; + } + else if (cql->s[0] == 'u' || cql->s[0] == 'U') { + ptr = cql->s + sizeof("update") - 1; + } + else if (cql->s[0] == 'd' || cql->s[0] == 'D') { + ptr = strcasestr(cql->s, "from"); + ptr += sizeof(char) * 4; + } + else if (cql->s[0] == 'i' || cql->s[0] == 'I') { + ptr = strcasestr(cql->s, "into"); + ptr += sizeof(char) * 4; + } + else + goto error; + + while (*ptr == ' ' && (ptr - cql->s) <= cql->len) { + ptr++; + } + + begin = ptr; + ptr = strchr(begin, ' '); + + if (ptr == NULL) + ptr = cql->s + cql->len; + + if (ptr - begin <= 0) + goto error; + + table->s = begin; + table->len = ptr - begin; + + return 0; + +error: + LM_ERR("Unable to determine operation in cql [%*s]\n", cql->len, cql->s); + return -1; +} + /** * Execute a raw SQL query. * \param _h handle for the database @@ -702,14 +822,29 @@ int cql_convert_row(oac::CqlResult& _cql_res, db1_res_t* _r) int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) { db1_res_t* db_res = 0; + str table_name; + dbcassa_table_p tbc; + std::vector<oac::CqlRow> res_cql_rows; - if (!_h || !CON_TABLE(_h) || !_r) { + if (!_h || !_r) { LM_ERR("Invalid parameter value\n"); return -1; } - LM_DBG("query table=%s\n", _h->table->s); + + if (get_table_from_query(_s, &table_name) < 0) { + LM_ERR("Error parsing table name in CQL string"); + return -1; + } + + LM_DBG("query table=%.*s\n", table_name.len, table_name.s); LM_DBG("CQL=%s\n", _s->s); + tbc = dbcassa_db_get_table(&CON_CASSA(_h)->db_name, &table_name); + if(!tbc) { + LM_ERR("table %.*s does not exist!\n", table_name.len, table_name.s); + return -1; + } + std::string cql_query(_s->s); oac::CqlResult cassa_cql_res; @@ -728,9 +863,11 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) if (!cassa_cql_res.__isset.rows) { LM_ERR("The resultype rows was not set, no point trying to parse result.\n"); - return -1; + goto error; } + res_cql_rows = cassa_cql_res.rows; + /* TODO Handle the other types */ switch(cassa_cql_res.type) { case 1: LM_DBG("Result set is an ROW Type.\n"); @@ -741,8 +878,6 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) break; } - std::vector<oac::CqlRow> res_cql_rows = cassa_cql_res.rows; - db_res = db_new_result(); if (!db_res) { LM_ERR("no memory left\n"); @@ -754,10 +889,10 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) RES_ROW_N(db_res) = 0; RES_COL_N(db_res)= 0; *_r = db_res; - return 0; + goto done; } - if (cql_get_columns(cassa_cql_res, db_res) < 0) { + if (cql_get_columns(cassa_cql_res, db_res, tbc) < 0) { LM_ERR("Error getting column names."); goto error; } @@ -768,12 +903,17 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) } *_r = db_res; +done: + dbcassa_lock_release(tbc); + LM_DBG("Exited with success\n"); return 0; error: if(db_res) db_free_result(db_res); + + dbcassa_lock_release(tbc); return -1; }

3 3

db_cassandra - db_cassa_raw_query & INSERT query
by jay binks 19 Mar '14

19 Mar '14

If doing a query that returns no results ( Insert etc ) db_cassa_raw_query would cause these ERRORS to be logged 0(22283) ERROR: db_cassandra [dbcassa_base.cpp:739]: db_cassa_raw_query(): The resultype rows was not set, no point trying to parse result. 0(22283) ERROR: avpops [avpops_db.c:333]: db_query_avp(): cannot do the query db_cassa_raw_query would also return -1 as a failure code which caused avpops_db to log the query failure. my patch changes the db_cassa_raw_query log message to debug level, and returns success from the function. I had a quick look to see if there was an elegant way to determine if we should expect results, so we can vary the response code based on query type, but I was unable to find anything other than doing string comparisons on the query, so I opted to not bother with this as it would be erroneous. Please find attached patch. -- Sincerely Jay

2 8

git:master: core: Minor bug-fix: Only free path vector, if it contains data
by Carsten Bock 18 Mar '14

18 Mar '14

Module: sip-router Branch: master Commit: 9e756aea4884b6e9f0dd359bb4a935fc3fed1e75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e756ae… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Mar 18 22:10:09 2014 +0100 core: Minor bug-fix: Only free path vector, if it contains data --- parser/msg_parser.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index fbd4ddb..6f72cdc 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -831,7 +831,8 @@ void reset_path_vector(struct sip_msg* const msg) { /* only free path vector from pkg IFF it is still in pkg... - ie. if msg is shm we don't free... */ if (!(msg->msg_flags&FL_SHM_CLONE)) { - pkg_free(msg->path_vec.s); + if (msg->path_vec.s) + pkg_free(msg->path_vec.s); msg->path_vec.s = 0; msg->path_vec.len = 0; }

1 0

[tracker] Comment added: mtree module causes kamilio to segfault when loading from mysql table
by sip-router 18 Mar '14

18 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#412 - mtree module causes kamilio to segfault when loading from mysql table User who did this - adeel (adeeln) ---------- turns out, this was due to me having the mtree table created using INT rather than VARCHAR for the fields. The field type requirement is not listed anywhere, nor does the error indicate the fault ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=412#comment1347 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

3 2

← Newer
1
...
8
9
10
11
12
13
14
...
30
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 2014