sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:8cc0ee08: db_posgres: data converting log improvement - errors should be logged as such

by Henning Westerholt

Module: kamailio Branch: master Commit: 8cc0ee0899a6767d34b0a3b06871273b0a6f72b2 URL: https://github.com/kamailio/kamailio/commit/8cc0ee0899a6767d34b0a3b06871273… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:41:14+01:00 db_posgres: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_postgres/km_val.c --- Diff: https://github.com/kamailio/kamailio/commit/8cc0ee0899a6767d34b0a3b06871273… Patch: https://github.com/kamailio/kamailio/commit/8cc0ee0899a6767d34b0a3b06871273… --- diff --git a/src/modules/db_postgres/km_val.c b/src/modules/db_postgres/km_val.c index fdfc407ee0..35914f290c 100644 --- a/src/modules/db_postgres/km_val.c +++ b/src/modules/db_postgres/km_val.c @@ -191,7 +191,7 @@ int db_postgres_val2str( break; default: - LM_DBG("unknown data type\n"); + LM_ERR("unknown data type\n"); return -10; } }

6 years, 9 months

git:master:8c592dc5: db_mysql: data converting log improvement - errors should be logged as such

by Henning Westerholt

Module: kamailio Branch: master Commit: 8c592dc54e7e963cb608b2b71c1549d9c61bac7a URL: https://github.com/kamailio/kamailio/commit/8c592dc54e7e963cb608b2b71c1549d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:41:01+01:00 db_mysql: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_mysql/km_val.c --- Diff: https://github.com/kamailio/kamailio/commit/8c592dc54e7e963cb608b2b71c1549d… Patch: https://github.com/kamailio/kamailio/commit/8c592dc54e7e963cb608b2b71c1549d… --- diff --git a/src/modules/db_mysql/km_val.c b/src/modules/db_mysql/km_val.c index 7f832d0ad9..9ad0127082 100644 --- a/src/modules/db_mysql/km_val.c +++ b/src/modules/db_mysql/km_val.c @@ -123,7 +123,7 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le break; default: - LM_DBG("unknown data type\n"); + LM_ERR("unknown data type\n"); return -10; } }

6 years, 9 months

git:master:3aaeb350: db_berkeley: data converting log improvement - errors should be logged as such

by Henning Westerholt

Module: kamailio Branch: master Commit: 3aaeb350f3cd63ecb8662ba1087bffceeb1321ea URL: https://github.com/kamailio/kamailio/commit/3aaeb350f3cd63ecb8662ba1087bffc… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:38:15+01:00 db_berkeley: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_berkeley/bdb_lib.c Modified: src/modules/db_berkeley/km_bdb_val.c --- Diff: https://github.com/kamailio/kamailio/commit/3aaeb350f3cd63ecb8662ba1087bffc… Patch: https://github.com/kamailio/kamailio/commit/3aaeb350f3cd63ecb8662ba1087bffc… --- diff --git a/src/modules/db_berkeley/bdb_lib.c b/src/modules/db_berkeley/bdb_lib.c index 53d2a67c22..9d566b9bab 100644 --- a/src/modules/db_berkeley/bdb_lib.c +++ b/src/modules/db_berkeley/bdb_lib.c @@ -1082,7 +1082,7 @@ int bdb_val2str(db_fld_t *fld, char *sout, int *slen) break; default: - DBG("Unknown data type\n"); + ERR("Unknown data type\n"); return -8; } } diff --git a/src/modules/db_berkeley/km_bdb_val.c b/src/modules/db_berkeley/km_bdb_val.c index c2d273d1ed..d895a870c9 100644 --- a/src/modules/db_berkeley/km_bdb_val.c +++ b/src/modules/db_berkeley/km_bdb_val.c @@ -274,7 +274,7 @@ int km_bdb_val2str(db_val_t *_v, char *_s, int *_len) break; default: - LM_DBG("Unknown data type\n"); + LM_ERR("Unknown data type\n"); return -8; } }

6 years, 9 months

git:master:56cfefde: db_cassandra: fix warnings: enumeration value âDB1_UNKNOWNâ not handled in switch

by Henning Westerholt

Module: kamailio Branch: master Commit: 56cfefde6883e476ece14a8e45cc906cd9a2f015 URL: https://github.com/kamailio/kamailio/commit/56cfefde6883e476ece14a8e45cc906… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:32:52+01:00 db_cassandra: fix warnings: enumeration value âDB1_UNKNOWNâ not handled in switch - fix warnings: enumeration value âDB1_UNKNOWNâ not handled in switch - fix a C++ compilation issue related to variable declaration in a switch case --- Modified: src/modules/db_cassandra/dbcassa_base.cpp --- Diff: https://github.com/kamailio/kamailio/commit/56cfefde6883e476ece14a8e45cc906… Patch: https://github.com/kamailio/kamailio/commit/56cfefde6883e476ece14a8e45cc906… --- diff --git a/src/modules/db_cassandra/dbcassa_base.cpp b/src/modules/db_cassandra/dbcassa_base.cpp index 886073f779..873cef2d89 100644 --- a/src/modules/db_cassandra/dbcassa_base.cpp +++ b/src/modules/db_cassandra/dbcassa_base.cpp @@ -309,6 +309,9 @@ static int cassa_convert_result(db_key_t qcol, std::vector<oac::ColumnOrSuperCol return -1; } break; + default: + LM_ERR("unknown data type\n"); + return -1; } return 0; } @@ -334,6 +337,7 @@ static char* dbval_to_string(db_val_t dbval, char* pk) break; case DB1_DATETIME:pk+= sprintf(pk, "%ld", (long int)dbval.val.time_val); break; + default: LM_ERR("unknown data type\n"); } return pk; } @@ -716,6 +720,9 @@ static int cassa_convert_result_raw(db_val_t* sr_cell, str *col_val) { return -1; } break; + default: + LM_ERR("unknown data type\n"); + return -1; } return 0; } @@ -1149,7 +1156,8 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, break; case DB1_BLOB: value = std::string(_uv[i].val.blob_val.s, _uv[i].val.blob_val.len); break; - case DB1_DATETIME: unsigned int exp_time = (unsigned int)_uv[i].val.time_val; + case DB1_DATETIME: { /* own block because we declare a variable here */ + unsigned int exp_time = (unsigned int)_uv[i].val.time_val; out << exp_time; value = out.str(); if(ts_col_name.s && ts_col_name.len==_uk[i]->len && @@ -1157,7 +1165,14 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, ts = exp_time; LM_DBG("Found timestamp col [%.*s]\n", ts_col_name.len, ts_col_name.s); } - break; + } break; + case DB1_UNKNOWN: + LM_ERR("unknown data type\n"); + /* needs probably more errors handling, free at least the memory */ + if(ts_col_name.s) + pkg_free(ts_col_name.s); + ts_col_name.s = 0; + return -1; } if (cont) continue;

6 years, 9 months

git:master:24d1b3b9: db_cassandra: remove a few unused variables (compiler warnings)

by Henning Westerholt

Module: kamailio Branch: master Commit: 24d1b3b975ef82400adde37e9851143d7f1b4e4d URL: https://github.com/kamailio/kamailio/commit/24d1b3b975ef82400adde37e9851143… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:11:43+01:00 db_cassandra: remove a few unused variables (compiler warnings) --- Modified: src/modules/db_cassandra/dbcassa_table.c --- Diff: https://github.com/kamailio/kamailio/commit/24d1b3b975ef82400adde37e9851143… Patch: https://github.com/kamailio/kamailio/commit/24d1b3b975ef82400adde37e9851143… --- diff --git a/src/modules/db_cassandra/dbcassa_table.c b/src/modules/db_cassandra/dbcassa_table.c index 71e027c0eb..0585414ec1 100644 --- a/src/modules/db_cassandra/dbcassa_table.c +++ b/src/modules/db_cassandra/dbcassa_table.c @@ -186,7 +186,7 @@ dbcassa_table_p dbcassa_load_file(str* dbn, str* tbn) #define KEY_MAX_LEN 10 FILE *fin=NULL; char buf[4096]; - int c, crow, ccol, bp, max_auto; + int c, ccol, bp; dbcassa_table_p dtp = 0; dbcassa_column_p colp= 0; dbcassa_column_p key[KEY_MAX_LEN]; @@ -209,9 +209,7 @@ dbcassa_table_p dbcassa_load_file(str* dbn, str* tbn) goto done; state = DBCASSA_FLINE_ST; - crow = ccol = -1; c = fgetc(fin); - max_auto = 0; while(c!=EOF) { switch(state) { case DBCASSA_FLINE_ST:

6 years, 9 months

git:master:5b0ab6ab: db_cassandra: fix compilation, adapt Makefile for system wide thrift installation

by Henning Westerholt

Module: kamailio Branch: master Commit: 5b0ab6ab1a3c0d3b0b1c0ae0964604044c62e93c URL: https://github.com/kamailio/kamailio/commit/5b0ab6ab1a3c0d3b0b1c0ae09646040… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T07:51:22+01:00 db_cassandra: fix compilation, adapt Makefile for system wide thrift installation - fix compilation after core restructuring (timer and mem includes) - fix Makefile path, use system wide thrift installation (todo - should be probably autodetected) - improve Makefile variable naming for include dir --- Modified: src/modules/db_cassandra/Makefile Modified: src/modules/db_cassandra/dbcassa_base.cpp --- Diff: https://github.com/kamailio/kamailio/commit/5b0ab6ab1a3c0d3b0b1c0ae09646040… Patch: https://github.com/kamailio/kamailio/commit/5b0ab6ab1a3c0d3b0b1c0ae09646040… --- diff --git a/src/modules/db_cassandra/Makefile b/src/modules/db_cassandra/Makefile index 4f6288654a..4915edc579 100644 --- a/src/modules/db_cassandra/Makefile +++ b/src/modules/db_cassandra/Makefile @@ -11,9 +11,9 @@ LD=g++ auto_gen= NAME=db_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib -DEFS += -I${THRIFT_DIR} -DKAMAILIO_MOD_INTERFACE +INCLUDE_DIR = /usr/include/thrift +LIB_DIR = /usr/lib +DEFS += -I${INCLUDE_DIR} -DKAMAILIO_MOD_INTERFACE LIBS += -L${LIB_DIR} dbcassa_base.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) @@ -26,15 +26,15 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@ dbcassa_base.o: dbcassa_base.cpp dbcassa_base.h dbcassa_table.h @echo "Compiling $<" diff --git a/src/modules/db_cassandra/dbcassa_base.cpp b/src/modules/db_cassandra/dbcassa_base.cpp index bd336c1fbb..886073f779 100644 --- a/src/modules/db_cassandra/dbcassa_base.cpp +++ b/src/modules/db_cassandra/dbcassa_base.cpp @@ -39,8 +39,8 @@ #include <transport/TTransportUtils.h> extern "C" { -#include "../../timer.h" -#include "../../mem/mem.h" +#include "../../core/timer.h" +#include "../../core/mem/mem.h" #include "dbcassa_table.h" }

6 years, 9 months

git:master:30aa62a5: app_python: fix jenkins build failure, reversed arguments

by AntonyA

Module: kamailio Branch: master Commit: 30aa62a5b66a1b16f9012466385bf235688b332e URL: https://github.com/kamailio/kamailio/commit/30aa62a5b66a1b16f9012466385bf23… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: AntonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-06T03:30:55Z app_python: fix jenkins build failure, reversed arguments --- Modified: src/modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/30aa62a5b66a1b16f9012466385bf23… Patch: https://github.com/kamailio/kamailio/commit/30aa62a5b66a1b16f9012466385bf23… --- diff --git a/src/modules/app_python/python_support.c b/src/modules/app_python/python_support.c index 8db77af937..7b1a93017e 100644 --- a/src/modules/app_python/python_support.c +++ b/src/modules/app_python/python_support.c @@ -51,7 +51,7 @@ void python_handle_exception(const char *fmt, ...) if (fmt == NULL) srcbuf = NULL; else { - va_start(fmt, ap); + va_start(ap, fmt); srcbuf = make_message(fmt, ap); va_end(ap); }

6 years, 9 months

Question: kemi cfgengine function never sees rtype == ONSEND_ROUTE being triggered

by Anthony Alba

Hi list, When I set cfgengine to app_python/app_python3 I never see the ONSEND_ROUTE rtype being hit. 1. when I make use of the native config engine onsend_route{} is invoked 2. In app_python/apy_kemi.c I instrument a log message: int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, str *rparam) { int ret; ret = -1; LM_NOTICE("executing route type %d\n", rtype); // look for ONSEND_ROUTE if(rtype==REQUEST_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = apy_exec(msg, rname->s, ONSEND_ROUTE == (1 << 4) but the cfgengine function never sees rtype == 16. In a simple call I see rtype == 1, 4, 8, 128 but never 16. Thanks Anthony

6 years, 9 months

git:master:795edca9: app_perl: do dlerror() after dlsym() fails to find exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 795edca9215391f7c8f646895c083f8ac8853341 URL: https://github.com/kamailio/kamailio/commit/795edca9215391f7c8f646895c083f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-05T21:56:04+01:00 app_perl: do dlerror() after dlsym() fails to find exports - some OSes do not reset dlerror after a successful dlsym(), pointing to an older error case - reported by GH #1465 --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/795edca9215391f7c8f646895c083f8… Patch: https://github.com/kamailio/kamailio/commit/795edca9215391f7c8f646895c083f8… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 8a195fc12d..f04d486908 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -619,6 +619,9 @@ int load_module(char* mod_path) } exp = (union module_exports_u*)dlsym(handle, "exports"); if(exp==NULL) { + error =(char*)dlerror(); + LM_DBG("attempt to lookup exports structure failed - dlerror: %s\n", + (error)?error:"none"); /* 'exports' structure not found, look up for '_modulename_exports' */ mdir = strrchr(mod_path, '/'); if (!mdir) {

6 years, 9 months

git:master:2c828e19: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2c828e19fe6e054681f234129aa70d0daab404f8 URL: https://github.com/kamailio/kamailio/commit/2c828e19fe6e054681f234129aa70d0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-05T09:47:22+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/2c828e19fe6e054681f234129aa70d0… Patch: https://github.com/kamailio/kamailio/commit/2c828e19fe6e054681f234129aa70d0… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 579b1ff5d6..ffd557e563 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -90,6 +90,7 @@ Carsten Bock 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) + 3.47. server_id_filter (int) 4. RPC Commands @@ -183,6 +184,7 @@ Carsten Bock 1.44. Set skip_remote_socket parameter 1.45. Set db_timer_clean parameter 1.46. Set rm_expired_delay parameter + 1.47. Set server_id_filter parameter Chapter 1. Admin Guide @@ -245,6 +247,7 @@ Chapter 1. Admin Guide 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) + 3.47. server_id_filter (int) 4. RPC Commands @@ -370,6 +373,7 @@ Chapter 1. Admin Guide 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) + 3.47. server_id_filter (int) 3.1. nat_bflag (integer) @@ -995,6 +999,17 @@ modparam("usrloc", "db_timer_clean", 1) modparam("usrloc", "rm_expired_delay", 30) ... +3.47. server_id_filter (int) + + Enable (1) or disable (0) filter records by server_id on load. + + Default value is “0”. + + Example 1.47. Set server_id_filter parameter +... +modparam("usrloc", "server_id_filter", 1) +... + 4. RPC Commands 4.1. ul.dump

6 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018