sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

git:master:d66fc714: db_mysql: added parameter unsigend_type
by Daniel-Constantin Mierla 01 Oct '18

01 Oct '18

Module: kamailio Branch: master Commit: d66fc7146267417a7a0a0cee22a0148bf94d0b6a URL: https://github.com/kamailio/kamailio/commit/d66fc7146267417a7a0a0cee22a0148… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-01T10:45:52+02:00 db_mysql: added parameter unsigend_type - if set to 1, then the module converts unsigned column value to DB1_UINT or DB1_UBIGINT --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/km_res.c --- Diff: https://github.com/kamailio/kamailio/commit/d66fc7146267417a7a0a0cee22a0148… Patch: https://github.com/kamailio/kamailio/commit/d66fc7146267417a7a0a0cee22a0148… --- diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c index ebf85e35be..4a79a1878d 100644 --- a/src/modules/db_mysql/db_mysql.c +++ b/src/modules/db_mysql/db_mysql.c @@ -44,6 +44,7 @@ unsigned int my_retries = 1; /* Number of retries when command fails */ unsigned int my_server_timezone = 0; /* Use FROM_UNIXTIME() for date conversion */ unsigned long my_client_ver = 0; +int db_mysql_unsigned_type = 0; struct mysql_counters_h mysql_cnts_h; counter_def_t mysql_cnt_defs[] = { @@ -98,6 +99,7 @@ static param_export_t params[] = { {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, {"update_affected_found", INT_PARAM, &db_mysql_update_affected_found}, + {"unsigned_type", PARAM_INT, &db_mysql_unsigned_type}, {0, 0, 0} }; diff --git a/src/modules/db_mysql/km_res.c b/src/modules/db_mysql/km_res.c index 81f24dfc99..df7b00bce7 100644 --- a/src/modules/db_mysql/km_res.c +++ b/src/modules/db_mysql/km_res.c @@ -38,6 +38,7 @@ #include "km_my_con.h" #include "km_res.h" +extern int db_mysql_unsigned_type; /*! * \brief Get and convert columns from a result @@ -96,17 +97,19 @@ int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r) case MYSQL_TYPE_LONG: case MYSQL_TYPE_INT24: case MYSQL_TYPE_TIMESTAMP: - if (fields[col].flags & UNSIGNED_FLAG) { + if ((db_mysql_unsigned_type != 0) + && (fields[col].flags & UNSIGNED_FLAG)) { LM_DBG("use DB1_UINT result type\n"); RES_TYPES(_r)[col] = DB1_UINT; } else { LM_DBG("use DB1_INT result type\n"); - RES_TYPES(_r)[col] = DB1_UINT; + RES_TYPES(_r)[col] = DB1_INT; } break; case MYSQL_TYPE_LONGLONG: - if (fields[col].flags & UNSIGNED_FLAG) { + if ((db_mysql_unsigned_type != 0) + && (fields[col].flags & UNSIGNED_FLAG)) { LM_DBG("use DB1_UBIGINT result type\n"); RES_TYPES(_r)[col] = DB1_UBIGINT; } else {

1 0

git:master:23907981: registrar: coherent code formatting
by Daniel-Constantin Mierla 01 Oct '18

01 Oct '18

Module: kamailio Branch: master Commit: 239079819d148ac41af802a8a28929a3fff0e56b URL: https://github.com/kamailio/kamailio/commit/239079819d148ac41af802a8a28929a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-01T08:34:21+02:00 registrar: coherent code formatting --- Modified: src/modules/registrar/api.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/239079819d148ac41af802a8a28929a… Patch: https://github.com/kamailio/kamailio/commit/239079819d148ac41af802a8a28929a…

1 0

git:master:202f4b1a: lib/srdb1: cast types to get rid of compile warnings
by Daniel-Constantin Mierla 01 Oct '18

01 Oct '18

Module: kamailio Branch: master Commit: 202f4b1aeca9e8d40b8791d6de3205fa643ff9a8 URL: https://github.com/kamailio/kamailio/commit/202f4b1aeca9e8d40b8791d6de3205f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-01T08:31:29+02:00 lib/srdb1: cast types to get rid of compile warnings --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/202f4b1aeca9e8d40b8791d6de3205f… Patch: https://github.com/kamailio/kamailio/commit/202f4b1aeca9e8d40b8791d6de3205f… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 3e36628330..4a250bc819 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -445,14 +445,17 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab * Check the table version * 0 means ok, -1 means an error occurred */ -int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, const unsigned int version) +int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, + const unsigned int version) { int ver = db_table_version(dbf, dbh, table); if (ver < 0) { LM_ERR("querying version for table %.*s\n", table->len, table->s); return -1; - } else if (ver != version) { - LM_ERR("invalid version %d for table %.*s found, expected %d (check table structure and table \"version\")\n", ver, table->len, table->s, version); + } else if (ver != (int)version) { + LM_ERR("invalid version %d for table %.*s found, expected %u" + " (check table structure and table \"version\")\n", + ver, table->len, table->s, version); return -1; } return 0;

1 0

git:master:7c64387a: lib/srdb1: handle DB1_UINT and DB1_UBIGINT for db version check
by Daniel-Constantin Mierla 01 Oct '18

01 Oct '18

Module: kamailio Branch: master Commit: 7c64387ab0694c9be9f502c3bca017b0235c7716 URL: https://github.com/kamailio/kamailio/commit/7c64387ab0694c9be9f502c3bca017b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-01T08:28:38+02:00 lib/srdb1: handle DB1_UINT and DB1_UBIGINT for db version check --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/7c64387ab0694c9be9f502c3bca017b… Patch: https://github.com/kamailio/kamailio/commit/7c64387ab0694c9be9f502c3bca017b… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 305543c931..3e36628330 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -391,9 +391,9 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab VAL_TYPE(val) = DB1_STR; VAL_NULL(val) = 0; VAL_STR(val) = *table; - + col[0] = &tmp2; - + if (dbf->query(connection, key, 0, val, col, 1, 1, 0, &res) < 0) { LM_ERR("error in db_query\n"); return -1; @@ -414,7 +414,8 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab ver = ROW_VALUES(RES_ROWS(res)); val_type = VAL_TYPE(ver); - if ( (val_type!=DB1_INT && val_type!=DB1_DOUBLE && val_type!=DB1_BIGINT) + if ( (val_type!=DB1_INT && val_type!=DB1_DOUBLE && val_type!=DB1_BIGINT + && val_type!=DB1_UINT && val_type!=DB1_UBIGINT) || VAL_NULL(ver) ) { LM_ERR("invalid type (%d) or nul (%d) version " "columns for %.*s\n", VAL_TYPE(ver), VAL_NULL(ver), @@ -425,8 +426,12 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab if (val_type == DB1_INT) { ret = VAL_INT(ver); + } else if (val_type == DB1_UINT) { + ret = (int)VAL_UINT(ver); } else if (val_type == DB1_BIGINT) { ret = (int)VAL_BIGINT(ver); + } else if (val_type == DB1_UBIGINT) { + ret = (int)VAL_UBIGINT(ver); } else if (val_type == DB1_DOUBLE) { ret = (int)VAL_DOUBLE(ver); }

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 October 2018