sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:83724225: core: tcp - print reason in tcp emit closed event debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 83724225ebc3ed778e7bacb487e3d3376e47e504 URL: https://github.com/kamailio/kamailio/commit/83724225ebc3ed778e7bacb487e3d33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T15:48:54+02:00 core: tcp - print reason in tcp emit closed event debug message --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/83724225ebc3ed778e7bacb487e3d33… Patch: https://github.com/kamailio/kamailio/commit/83724225ebc3ed778e7bacb487e3d33… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index db3707b39e..f786fb2f6f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -193,7 +193,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con, enum tcp_closed_rea sr_event_param_t evp = {0}; ret = 0; - LM_DBG("TCP closed event creation triggered\n"); + LM_DBG("TCP closed event creation triggered (reason: %d)\n", reason); if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { memset(&tev, 0, sizeof(tcp_closed_event_info_t)); tev.reason = reason; @@ -201,7 +201,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con, enum tcp_closed_rea evp.data = (void*)(&tev); ret = sr_event_exec(SREV_TCP_CLOSED, &evp); } else { - LM_DBG("no callback registering for handling TCP closed event - dropping!\n"); + LM_DBG("no callback registering for handling TCP closed event\n"); } return ret; }

6 years, 8 months

[kamailio/kamailio] when using db_text, can't use relative path, only full path is working in kamailio 4.4 (#1224)

by Jurijs Ivolga

### Description when using db_text, can't use relative path, only full path is working in kamailio 4.4 modparam("lcr", "db_url", "text://dbtext") -- do not work modparam("lcr", "db_url", "text:///usr/local/etc/kamailio/dbtext") -- works as expected ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 0(1) DEBUG: db_text [dbt_file.c:104]: dbt_load_file(): db is [/usr/local/etc/kamailio/] 0(1) DEBUG: db_text [dbt_file.c:119]: dbt_load_file(): loading file [/usr/local/etc/kamailio/] 0(1) DEBUG: db_text [dbt_tb.c:181]: dbt_table_new(): mtime is 1504165928 0(1) ERROR: db_text [dbt_base.c:215]: dbt_query(): table version not loaded! (too few columns) 0(1) ERROR: db_text [dbt_base.c:357]: dbt_query(): failed to query the table! 0(1) ERROR: <core> [db.c:397]: db_table_version(): error in db_query 0(1) ERROR: <core> [db.c:436]: db_check_table_version(): querying version for table lcr_rule 0(1) ERROR: lcr [lcr_mod.c:649]: mod_init(): error during table version check 0(1) ERROR: <core> [sr_module.c:967]: init_mod(): Error while initializing module lcr (/usr/local/lib64/kamailio/modules/lcr.so) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  use full path ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (x86_64/linux) 897942 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 897942 compiled on 06:27:57 Aug 31 2017 with gcc 6.3.0 ``` * **Operating System**:  ``` Debian GNU/Linux 9 \n \l 4.4.0-87-generic #110-Ubuntu SMP Tue Jul 18 12:55:35 UTC 2017 x86_64 GNU/Linux ``` -- 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/1224

6 years, 8 months

git:4.4:75f13d03: db_text: fix computing absolute path to db using cfg dir

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 75f13d032b44fd520216101d38a4845f9d27b12e URL: https://github.com/kamailio/kamailio/commit/75f13d032b44fd520216101d38a4845… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T12:43:46+02:00 db_text: fix computing absolute path to db using cfg dir - reported by GH #1224 (cherry picked from commit f74cddd78df3f37f6ea827fc1787796c601572b3) (cherry picked from commit 630bf041fd0530368c73a6329c894a8758484ed7) --- Modified: modules/db_text/dbt_base.c Modified: modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/75f13d032b44fd520216101d38a4845… Patch: https://github.com/kamailio/kamailio/commit/75f13d032b44fd520216101d38a4845… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index e8b3d1fc1d..c9ccb7fa43 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -52,6 +52,7 @@ db1_con_t* dbt_init(const str* _sqlurl) LM_ERR("invalid parameter value\n"); return NULL; } + LM_DBG("initializing for db url: [%.*s]\n", _sqlurl->len, _sqlurl->s); _s.s = _sqlurl->s; _s.len = _sqlurl->len; if(_s.len <= DBT_ID_LEN || strncmp(_s.s, DBT_ID, DBT_ID_LEN)!=0) @@ -68,16 +69,22 @@ db1_con_t* dbt_init(const str* _sqlurl) _s.len -= DBT_ID_LEN; if(_s.s[0]!='/') { - if(sizeof(CFG_DIR)+_s.len+2 > DBT_PATH_LEN) + if(sizeof(CFG_DIR)+_s.len+2 >= DBT_PATH_LEN) { LM_ERR("path to database is too long\n"); return NULL; } strcpy(dbt_path, CFG_DIR); - dbt_path[sizeof(CFG_DIR)] = '/'; - strncpy(&dbt_path[sizeof(CFG_DIR)+1], _s.s, _s.len); - _s.len += sizeof(CFG_DIR); + if(dbt_path[sizeof(CFG_DIR)-2]!='/') { + dbt_path[sizeof(CFG_DIR)-1] = '/'; + strncpy(&dbt_path[sizeof(CFG_DIR)], _s.s, _s.len); + _s.len += sizeof(CFG_DIR); + } else { + strncpy(&dbt_path[sizeof(CFG_DIR)-1], _s.s, _s.len); + _s.len += sizeof(CFG_DIR) - 1; + } _s.s = dbt_path; + LM_DBG("updated db url: [%.*s]\n", _s.len, _s.s); } _res = pkg_malloc(sizeof(db1_con_t)+sizeof(dbt_con_t)); diff --git a/modules/db_text/dbt_file.c b/modules/db_text/dbt_file.c index eac2b73672..af4423c081 100644 --- a/modules/db_text/dbt_file.c +++ b/modules/db_text/dbt_file.c @@ -91,17 +91,18 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) dbt_table_p dtp = NULL; dbt_column_p colp, colp0 = NULL; dbt_row_p rowp, rowp0 = NULL; - + enum {DBT_FLINE_ST, DBT_NLINE_ST, DBT_DATA_ST} state; - - LM_DBG("request for table [%.*s]\n", tbn->len, tbn->s); - + if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) return NULL; + + LM_DBG("request for table [%.*s] (len: %d)\n", tbn->len, tbn->s, tbn->len); + path[0] = 0; if(dbn && dbn->s && dbn->len>0) { - LM_DBG("db is [%.*s]\n", dbn->len, dbn->s); + LM_DBG("db is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); if(dbn->len+tbn->len<511) { strncpy(path, dbn->s, dbn->len); @@ -115,12 +116,14 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) strncpy(path, tbn->s, tbn->len); path[tbn->len] = 0; } - LM_DBG("loading file [%s]\n", path); + fin = fopen(path, "rt"); - if(!fin) - return NULL; - + if(!fin) { + LM_ERR("failed to open file [%s]\n", path); + return NULL; + } + buf = pkg_malloc(_db_text_read_buffer_size); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size);

6 years, 8 months

git:5.0:630bf041: db_text: fix computing absolute path to db using cfg dir

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 630bf041fd0530368c73a6329c894a8758484ed7 URL: https://github.com/kamailio/kamailio/commit/630bf041fd0530368c73a6329c894a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T12:39:54+02:00 db_text: fix computing absolute path to db using cfg dir - reported by GH #1224 (cherry picked from commit f74cddd78df3f37f6ea827fc1787796c601572b3) --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/630bf041fd0530368c73a6329c894a8… Patch: https://github.com/kamailio/kamailio/commit/630bf041fd0530368c73a6329c894a8… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 667301268f..f965b22d24 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -52,6 +52,7 @@ db1_con_t* dbt_init(const str* _sqlurl) LM_ERR("invalid parameter value\n"); return NULL; } + LM_DBG("initializing for db url: [%.*s]\n", _sqlurl->len, _sqlurl->s); _s.s = _sqlurl->s; _s.len = _sqlurl->len; if(_s.len <= DBT_ID_LEN || strncmp(_s.s, DBT_ID, DBT_ID_LEN)!=0) @@ -68,16 +69,22 @@ db1_con_t* dbt_init(const str* _sqlurl) _s.len -= DBT_ID_LEN; if(_s.s[0]!='/') { - if(sizeof(CFG_DIR)+_s.len+2 > DBT_PATH_LEN) + if(sizeof(CFG_DIR)+_s.len+2 >= DBT_PATH_LEN) { LM_ERR("path to database is too long\n"); return NULL; } strcpy(dbt_path, CFG_DIR); - dbt_path[sizeof(CFG_DIR)] = '/'; - strncpy(&dbt_path[sizeof(CFG_DIR)+1], _s.s, _s.len); - _s.len += sizeof(CFG_DIR); + if(dbt_path[sizeof(CFG_DIR)-2]!='/') { + dbt_path[sizeof(CFG_DIR)-1] = '/'; + strncpy(&dbt_path[sizeof(CFG_DIR)], _s.s, _s.len); + _s.len += sizeof(CFG_DIR); + } else { + strncpy(&dbt_path[sizeof(CFG_DIR)-1], _s.s, _s.len); + _s.len += sizeof(CFG_DIR) - 1; + } _s.s = dbt_path; + LM_DBG("updated db url: [%.*s]\n", _s.len, _s.s); } _res = pkg_malloc(sizeof(db1_con_t)+sizeof(dbt_con_t)); diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 4dfa9f53f6..66984bae5a 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -94,14 +94,15 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) enum {DBT_FLINE_ST, DBT_NLINE_ST, DBT_DATA_ST} state; - LM_DBG("request for table [%.*s]\n", tbn->len, tbn->s); - if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) return NULL; + + LM_DBG("request for table [%.*s] (len: %d)\n", tbn->len, tbn->s, tbn->len); + path[0] = 0; if(dbn && dbn->s && dbn->len>0) { - LM_DBG("db is [%.*s]\n", dbn->len, dbn->s); + LM_DBG("db is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); if(dbn->len+tbn->len<511) { strncpy(path, dbn->s, dbn->len); @@ -118,8 +119,10 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) LM_DBG("loading file [%s]\n", path); fin = fopen(path, "rt"); - if(!fin) + if(!fin) { + LM_ERR("failed to open file [%s]\n", path); return NULL; + } buf = pkg_malloc(_db_text_read_buffer_size); if(!buf) {

6 years, 8 months

git:master:f74cddd7: db_text: fix computing absolute path to db using cfg dir

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f74cddd78df3f37f6ea827fc1787796c601572b3 URL: https://github.com/kamailio/kamailio/commit/f74cddd78df3f37f6ea827fc1787796… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T12:38:20+02:00 db_text: fix computing absolute path to db using cfg dir - reported by GH #1224 --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/f74cddd78df3f37f6ea827fc1787796… Patch: https://github.com/kamailio/kamailio/commit/f74cddd78df3f37f6ea827fc1787796… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 6db361679c..c850501952 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -52,6 +52,7 @@ db1_con_t* dbt_init(const str* _sqlurl) LM_ERR("invalid parameter value\n"); return NULL; } + LM_DBG("initializing for db url: [%.*s]\n", _sqlurl->len, _sqlurl->s); _s.s = _sqlurl->s; _s.len = _sqlurl->len; if(_s.len <= DBT_ID_LEN || strncmp(_s.s, DBT_ID, DBT_ID_LEN)!=0) @@ -68,16 +69,22 @@ db1_con_t* dbt_init(const str* _sqlurl) _s.len -= DBT_ID_LEN; if(_s.s[0]!='/') { - if(sizeof(CFG_DIR)+_s.len+2 > DBT_PATH_LEN) + if(sizeof(CFG_DIR)+_s.len+2 >= DBT_PATH_LEN) { LM_ERR("path to database is too long\n"); return NULL; } strcpy(dbt_path, CFG_DIR); - dbt_path[sizeof(CFG_DIR)] = '/'; - strncpy(&dbt_path[sizeof(CFG_DIR)+1], _s.s, _s.len); - _s.len += sizeof(CFG_DIR); + if(dbt_path[sizeof(CFG_DIR)-2]!='/') { + dbt_path[sizeof(CFG_DIR)-1] = '/'; + strncpy(&dbt_path[sizeof(CFG_DIR)], _s.s, _s.len); + _s.len += sizeof(CFG_DIR); + } else { + strncpy(&dbt_path[sizeof(CFG_DIR)-1], _s.s, _s.len); + _s.len += sizeof(CFG_DIR) - 1; + } _s.s = dbt_path; + LM_DBG("updated db url: [%.*s]\n", _s.len, _s.s); } _res = pkg_malloc(sizeof(db1_con_t)+sizeof(dbt_con_t)); diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 25dc087614..a2d35c2406 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -94,14 +94,15 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) enum {DBT_FLINE_ST, DBT_NLINE_ST, DBT_DATA_ST} state; - LM_DBG("request for table [%.*s]\n", tbn->len, tbn->s); - if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) return NULL; + + LM_DBG("request for table [%.*s] (len: %d)\n", tbn->len, tbn->s, tbn->len); + path[0] = 0; if(dbn && dbn->s && dbn->len>0) { - LM_DBG("db is [%.*s]\n", dbn->len, dbn->s); + LM_DBG("db is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); if(dbn->len+tbn->len<511) { strncpy(path, dbn->s, dbn->len); @@ -118,8 +119,10 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) LM_DBG("loading file [%s]\n", path); fin = fopen(path, "rt"); - if(!fin) + if(!fin) { + LM_ERR("failed to open file [%s]\n", path); return NULL; + } buf = pkg_malloc(_db_text_read_buffer_size); if(!buf) {

6 years, 8 months

git:4.4:40b2b43e: db_text: more details in log message when nr of columns is too small

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 40b2b43e5919f05ef07f15a5f6802d83a2d1ddb6 URL: https://github.com/kamailio/kamailio/commit/40b2b43e5919f05ef07f15a5f6802d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T11:38:55+02:00 db_text: more details in log message when nr of columns is too small (cherry picked from commit 2683b20d7b62f60ce53ed6692a42ed6b19fee972) (cherry picked from commit 4e9921d78032a850ca07bd604aa388f73bc3256a) --- Modified: modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/40b2b43e5919f05ef07f15a5f6802d8… Patch: https://github.com/kamailio/kamailio/commit/40b2b43e5919f05ef07f15a5f6802d8… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index f0ad7139ec..e8b3d1fc1d 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -210,9 +210,10 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } - if(!_tbc || _tbc->nrcols < _nc) + if(_tbc->nrcols < _nc) { - LM_ERR("table %s not loaded! (too few columns)\n", CON_TABLE(_h)->s); + LM_ERR("table %s - too few columns (%d < %d)\n", CON_TABLE(_h)->s, + _tbc->nrcols, _nc); goto error; } if(_k)

6 years, 8 months

[kamailio/kamailio] cfg grammar incompatible with Google Compute Engine's node FQDN format (#1223)

by Ivan Saldarriaga

### Description Running kamailio in kubernetes (steps [here](https://github.com/CyCoreSystems/astricon-2016/issues/1)) but getting an "invalid host or interface name" error when parsing the alias in kamailio.cfg As per https://github.com/kamailio/kamailio/blob/9df27ff7afbf1cf8ee7b3afd1741355e9… DOTS and MINUS are not allowed? GCE FQDN of server nodes currently have a format like this: ```gke-foo-cluster-default-pool-4b9e42c9-50mh.c.foo-project-0.internal``` ### Troubleshooting Doesn't exist. node names in the cloud are not customizable. #### Reproduction set the alias in kamailio.cfg to ```my-server.my-domain.internal``` #### Debugging Data N/A #### Log Messages ``` 2017-08-31T03:34:27Z gke-foo-cluster-default-pool-4b9e42c9-50mh confd[15]: INFO Backend set to env 2017-08-31T03:34:27Z gke-foo-cluster-default-pool-4b9e42c9-50mh confd[15]: INFO Starting confd 2017-08-31T03:34:27Z gke-foo-cluster-default-pool-4b9e42c9-50mh confd[15]: INFO Backend nodes set to 2017-08-31T03:34:27Z gke-foo-cluster-default-pool-4b9e42c9-50mh confd[15]: INFO /etc/kamailio/kamailio.cfg has md5sum 17481ad2235ef9698da57c6e90d5ac2b should be fb5d75c2654ab2264b11fab5802bd4b7 2017-08-31T03:34:27Z gke-foo-cluster-default-pool-4b9e42c9-50mh confd[15]: INFO Target config /etc/kamailio/kamailio.cfg out of sync 2017-08-31T03:34:27Z gke-foo-cluster-default-pool-4b9e42c9-50mh confd[15]: INFO Target config /etc/kamailio/kamailio.cfg has been updated 0(1) CRITICAL: <core> [cfg.y:3372]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 35, column 30-36: syntax error 0(1) CRITICAL: <core> [cfg.y:3372]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 35, column 30-36: invalid host or interface name 0(1) CRITICAL: <core> [cfg.y:3375]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 35, column 37: ERROR: bad config file (3 errors) ``` #### SIP Traffic N/A ### Possible Solutions Let the parser accept server and domain names with "-" ### Additional Information Kamailio version: upstream? as per the Dockerfile the image is coming from: ``` FROM debian:jessie # Debian Linux RUN apt-get update && apt-get install -y curl && apt-get clean # Install kamailio RUN curl -qO http://deb.kamailio.org/kamailiodebkey.gpg && \ apt-key add kamailiodebkey.gpg && \ echo "deb http://deb.kamailio.org/kamailio jessie main\ndeb-src http://deb.kamailio.org/kamailio jessie main" > /etc/apt/sources.list.d/kamailio.list RUN apt-get update && apt-get install -y kamailio kamailio-json-modules kamailio-postgres-modules kamailio-redis-modules kamailio-utils-modules && apt-get clean # Install confd (we need at least 0.7.0 for the "exists" function RUN curl -o /usr/sbin/confd -O -J -L "https://github.com/kelseyhightower/confd/releases/download/v0.11.0/confd-0.…" RUN chmod +x /usr/sbin/confd ``` * **Operating System**: Debian Jessie ``` Linux gke-foo-cluster-default-pool-4b9e42c9-50mh 4.4.52+ #1 SMP Thu Jun 15 15:23:01 PDT 2017 x86_64 GNU/Linux ``` Please confirm if this docker image is built from the Kamailio's upstream version in order to fix it if not. tks. -- 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/1223

6 years, 8 months

git:5.0:4e9921d7: db_text: more details in log message when nr of columns is too small

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 4e9921d78032a850ca07bd604aa388f73bc3256a URL: https://github.com/kamailio/kamailio/commit/4e9921d78032a850ca07bd604aa388f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T11:32:22+02:00 db_text: more details in log message when nr of columns is too small (cherry picked from commit 2683b20d7b62f60ce53ed6692a42ed6b19fee972) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/4e9921d78032a850ca07bd604aa388f… Patch: https://github.com/kamailio/kamailio/commit/4e9921d78032a850ca07bd604aa388f… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 425d351f15..667301268f 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -211,9 +211,10 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } - if(!_tbc || _tbc->nrcols < _nc) + if(_tbc->nrcols < _nc) { - LM_ERR("table %s not loaded! (too few columns)\n", CON_TABLE(_h)->s); + LM_ERR("table %s - too few columns (%d < %d)\n", CON_TABLE(_h)->s, + _tbc->nrcols, _nc); goto error; } if(_k)

6 years, 8 months

git:master:2683b20d: db_text: more details in log message when nr of columns is too small

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2683b20d7b62f60ce53ed6692a42ed6b19fee972 URL: https://github.com/kamailio/kamailio/commit/2683b20d7b62f60ce53ed6692a42ed6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T11:31:33+02:00 db_text: more details in log message when nr of columns is too small --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/2683b20d7b62f60ce53ed6692a42ed6… Patch: https://github.com/kamailio/kamailio/commit/2683b20d7b62f60ce53ed6692a42ed6… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index e32f0d88ec..6db361679c 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -212,9 +212,10 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } - if(!_tbc || _tbc->nrcols < _nc) + if(_tbc->nrcols < _nc) { - LM_ERR("table %s not loaded! (too few columns)\n", CON_TABLE(_h)->s); + LM_ERR("table %s - too few columns (%d < %d)\n", CON_TABLE(_h)->s, + _tbc->nrcols, _nc); goto error; } if(_k)

6 years, 8 months

git:master:1d8c6e43: tm: skip empty lists when listing transactions via rpc tm.list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d8c6e4330fc069ed6606e0b966ece76053909b8 URL: https://github.com/kamailio/kamailio/commit/1d8c6e4330fc069ed6606e0b966ece7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-31T11:20:17+02:00 tm: skip empty lists when listing transactions via rpc tm.list --- Modified: src/modules/tm/t_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/1d8c6e4330fc069ed6606e0b966ece7… Patch: https://github.com/kamailio/kamailio/commit/1d8c6e4330fc069ed6606e0b966ece7… --- diff --git a/src/modules/tm/t_stats.c b/src/modules/tm/t_stats.c index 5b1cc5fbbc..d6ae5f52e4 100644 --- a/src/modules/tm/t_stats.c +++ b/src/modules/tm/t_stats.c @@ -260,34 +260,37 @@ void tm_rpc_list(rpc_t* rpc, void* c) tm_cell_t *tcell; for (r=0; r<TABLE_ENTRIES; r++) { - if(_tm_table->entries[r].next_c!=NULL) { - if (rpc->add(c, "{", &h) < 0) { - LM_ERR("failed to add transaction structure\n"); - return; - } - lock_hash(r); - clist_foreach(&_tm_table->entries[r], tcell, next_c) - { - rpc->struct_add(h, "ddSSSSSsdddd", - "tindex", (unsigned)tcell->hash_index, - "tlabel", (unsigned)tcell->label, - "method", &tcell->method, - "from", &tcell->from, - "to", &tcell->to, - "callid", &tcell->callid, - "cseq", &tcell->cseq_n, - "uas_request", (tcell->uas.request)?"yes":"no", - "tflags", (unsigned)tcell->flags, - "outgoings", (unsigned)tcell->nr_of_outgoings, + lock_hash(r); + if(clist_empty(&_tm_table->entries[r], next_c)) { + unlock_hash(r); + continue; + } + if (rpc->add(c, "{", &h) < 0) { + LM_ERR("failed to add transaction structure\n"); + unlock_hash(r); + return; + } + clist_foreach(&_tm_table->entries[r], tcell, next_c) + { + rpc->struct_add(h, "ddSSSSSsdddd", + "tindex", (unsigned)tcell->hash_index, + "tlabel", (unsigned)tcell->label, + "method", &tcell->method, + "from", &tcell->from, + "to", &tcell->to, + "callid", &tcell->callid, + "cseq", &tcell->cseq_n, + "uas_request", (tcell->uas.request)?"yes":"no", + "tflags", (unsigned)tcell->flags, + "outgoings", (unsigned)tcell->nr_of_outgoings, #ifdef TM_DEL_UNREF - "ref_count", (unsigned)atomic_get(&tcell->ref_count), + "ref_count", (unsigned)atomic_get(&tcell->ref_count), #else - "ref_count", tcell->ref_count, + "ref_count", tcell->ref_count, #endif - "lifetime", (unsigned)TICKS_TO_S(tcell->end_of_life) - ); - } - unlock_hash(r); + "lifetime", (unsigned)TICKS_TO_S(tcell->end_of_life) + ); } + unlock_hash(r); } }

6 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017