sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:ee548d8c: db_mysql: add support for unsigned integers in INT and BIGINT DB1 API
by Henning Westerholt 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: ee548d8c5c0e5dc0be09edcacac70a33e205b693 URL: https://github.com/kamailio/kamailio/commit/ee548d8c5c0e5dc0be09edcacac70a3… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-28T15:22:56+02:00 db_mysql: add support for unsigned integers in INT and BIGINT DB1 API --- Modified: src/modules/db_mysql/km_res.c --- Diff: https://github.com/kamailio/kamailio/commit/ee548d8c5c0e5dc0be09edcacac70a3… Patch: https://github.com/kamailio/kamailio/commit/ee548d8c5c0e5dc0be09edcacac70a3… --- diff --git a/src/modules/db_mysql/km_res.c b/src/modules/db_mysql/km_res.c index 19af450fab..81f24dfc99 100644 --- a/src/modules/db_mysql/km_res.c +++ b/src/modules/db_mysql/km_res.c @@ -96,13 +96,23 @@ 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: - LM_DBG("use DB1_INT result type\n"); - RES_TYPES(_r)[col] = DB1_INT; + if (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; + } break; case MYSQL_TYPE_LONGLONG: - LM_DBG("use DB1_BIGINT result type\n"); - RES_TYPES(_r)[col] = DB1_BIGINT; + if (fields[col].flags & UNSIGNED_FLAG) { + LM_DBG("use DB1_UBIGINT result type\n"); + RES_TYPES(_r)[col] = DB1_UBIGINT; + } else { + LM_DBG("use DB1_BIGINT result type\n"); + RES_TYPES(_r)[col] = DB1_BIGINT; + } break; case MYSQL_TYPE_FLOAT:

1 0

git:master:c66bb0b5: db_redis: handle DB1_UINT and DB1_UBIGINT DB APIv1 types
by Daniel-Constantin Mierla 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: c66bb0b5594def785edab0fe9a8101f1c126fdb1 URL: https://github.com/kamailio/kamailio/commit/c66bb0b5594def785edab0fe9a8101f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-28T15:22:03+02:00 db_redis: handle DB1_UINT and DB1_UBIGINT DB APIv1 types --- Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/c66bb0b5594def785edab0fe9a8101f… Patch: https://github.com/kamailio/kamailio/commit/c66bb0b5594def785edab0fe9a8101f… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 46bf38b7ee..c4cd696ead 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -96,6 +96,13 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { snprintf(_str->s, _str->len, "%d", VAL_INT(v)); _str->len = strlen(_str->s); break; + case DB1_UINT: + LM_DBG("converting uint value %u to str\n", VAL_UINT(v)); + _str->s = (char*)pkg_malloc(_str->len); + if (!_str->s) goto memerr; + snprintf(_str->s, _str->len, "%u", VAL_UINT(v)); + _str->len = strlen(_str->s); + break; case DB1_BIGINT: LM_DBG("converting bigint value %lld to str\n", VAL_BIGINT(v)); _str->s = (char*)pkg_malloc(_str->len); @@ -103,6 +110,13 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { snprintf(_str->s, _str->len, "%lld", VAL_BIGINT(v)); _str->len = strlen(_str->s); break; + case DB1_UBIGINT: + LM_DBG("converting ubigint value %llu to str\n", VAL_UBIGINT(v)); + _str->s = (char*)pkg_malloc(_str->len); + if (!_str->s) goto memerr; + snprintf(_str->s, _str->len, "%llu", VAL_UBIGINT(v)); + _str->len = strlen(_str->s); + break; case DB1_STRING: s = VAL_STRING(v); _str->len = strlen(s); diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index fb7c06cac0..e9db44458e 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -448,6 +448,15 @@ static struct str_hash_entry* db_redis_create_column(str *col, str *type) { case 'I': e->u.n = DB1_INT; break; + case 'u': + case 'U': + /* uint and ubigint */ + if(type->len>1 && (type->s[1]=='b' || type->s[1]=='B')) { + e->u.n = DB1_UBIGINT; + } else { + e->u.n = DB1_UINT; + } + break; case 't': case 'T': e->u.n = DB1_DATETIME; @@ -458,7 +467,12 @@ static struct str_hash_entry* db_redis_create_column(str *col, str *type) { break; case 'b': case 'B': - e->u.n = DB1_BLOB; + /* blob and bigint */ + if(type->len>1 && (type->s[1]=='i' || type->s[1]=='I')) { + e->u.n = DB1_BIGINT; + } else { + e->u.n = DB1_BLOB; + } break; default: LM_ERR("Invalid schema column type '%.*s', expecting one of string, int, timestamp, double, blob\n",

1 0

git:master:fd023a9d: db_mongodb: handle DB1_UINT and DB1_UBIGINT DB APIv1 types
by Daniel-Constantin Mierla 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: fd023a9d4408ed9138e25b3bebf91f4ccccd6599 URL: https://github.com/kamailio/kamailio/commit/fd023a9d4408ed9138e25b3bebf91f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-28T15:05:14+02:00 db_mongodb: handle DB1_UINT and DB1_UBIGINT DB APIv1 types --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/fd023a9d4408ed9138e25b3bebf91f4… Patch: https://github.com/kamailio/kamailio/commit/fd023a9d4408ed9138e25b3bebf91f4… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 5e8e63d618..8d88049919 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -119,6 +119,15 @@ int db_mongodb_bson_filter_add(bson_t *doc, const db_key_t* _k, const db_op_t* _ } break; + case DB1_UINT: + if(!bson_append_int32(&mdoc, ocmp.s, ocmp.len, + (int)VAL_UINT(tval))) { + LM_ERR("failed to append uint to bson doc %.*s %s %u [%d]\n", + tkey->len, tkey->s, ocmp.s, VAL_UINT(tval), idx); + goto error; + } + break; + case DB1_BIGINT: if(!bson_append_int64(&mdoc, ocmp.s, ocmp.len, VAL_BIGINT(tval ))) { @@ -126,7 +135,16 @@ int db_mongodb_bson_filter_add(bson_t *doc, const db_key_t* _k, const db_op_t* _ tkey->len, tkey->s, ocmp.s, VAL_BIGINT(tval), idx); goto error; } - return -1; + break; + + case DB1_UBIGINT: + if(!bson_append_int64(&mdoc, ocmp.s, ocmp.len, + (long long int)VAL_UBIGINT(tval ))) { + LM_ERR("failed to append ubigint to bson doc %.*s %s %llu [%d]\n", + tkey->len, tkey->s, ocmp.s, VAL_UBIGINT(tval), idx); + goto error; + } + break; case DB1_DOUBLE: if(!bson_append_double(&mdoc, ocmp.s, ocmp.len, @@ -226,6 +244,15 @@ int db_mongodb_bson_add(bson_t *doc, const db_key_t _k, const db_val_t *_v, int } break; + case DB1_UINT: + if(!bson_append_int32(doc, _k->s, _k->len, + (int)VAL_INT(_v))) { + LM_ERR("failed to append uint to bson doc %.*s = %u [%d]\n", + _k->len, _k->s, VAL_INT(_v), idx); + goto error; + } + break; + case DB1_BIGINT: if(!bson_append_int64(doc, _k->s, _k->len, VAL_BIGINT(_v ))) { @@ -233,7 +260,16 @@ int db_mongodb_bson_add(bson_t *doc, const db_key_t _k, const db_val_t *_v, int _k->len, _k->s, VAL_BIGINT(_v), idx); goto error; } - return -1; + break; + + case DB1_UBIGINT: + if(!bson_append_int64(doc, _k->s, _k->len, + (long long int)VAL_BIGINT(_v ))) { + LM_ERR("failed to append ubigint to bson doc %.*s = %llu [%d]\n", + _k->len, _k->s, VAL_UBIGINT(_v), idx); + goto error; + } + break; case DB1_DOUBLE: if(!bson_append_double(doc, _k->s, _k->len,

1 0

git:master:2f2761e4: http_async_client: fix module export
by Victor Seva 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: 2f2761e47f38f704f213349c254823f9df6a9698 URL: https://github.com/kamailio/kamailio/commit/2f2761e47f38f704f213349c254823f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-09-28T14:50:18+02:00 http_async_client: fix module export --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f2761e47f38f704f213349c254823f… Patch: https://github.com/kamailio/kamailio/commit/2f2761e47f38f704f213349c254823f… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index dbd2ecf449..96d428cb6d 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -198,7 +198,7 @@ struct module_exports exports = { cmds, /* exported functions */ params, /* exported parameters */ 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ + pvs, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ child_init, /* per-child init function */

1 0

[kamailio/kamailio] Non blocking async socket (#1654)
by Federico Cabiddu 28 Sep '18

28 Sep '18

#### Pre-Submission Checklist    - [ X] Commit message has the format required by CONTRIBUTING guide - [ X] Commits are split per component (core, individual modules, libs, utils, ...) - [ X] Each component has a single commit (if not, squash them into one commit) - [ X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Operations performed in async workers can be blocking (e.g. DB inserts). Sometimes, under high load, this can lead the unix socket queues to be full, thus blocking the main workers. With this new parameter we can have the choice to open the socket pair in non blocking mode, so returning an error if the task cannot be sent to the async workers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1654 -- Commit Summary -- * core: new parameter async_nonblock * async,db_mysql,db_unixodbc: return -1 and free memory if sending task to the async worker fails -- File Changes -- M src/core/async_task.c (16) M src/core/async_task.h (1) M src/core/cfg.lex (2) M src/core/cfg.y (3) M src/modules/async/async_sleep.c (7) M src/modules/db_mysql/km_dbase.c (5) M src/modules/db_unixodbc/dbase.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1654.patch https://github.com/kamailio/kamailio/pull/1654.diff -- 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/pull/1654

1 1

git:master:ecb8ab2d: Merge pull request #1654 from grumvalski/non_blocking_async_socket
by GitHub 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: ecb8ab2d71b7f427583179f5d4fac83c0ba738a2 URL: https://github.com/kamailio/kamailio/commit/ecb8ab2d71b7f427583179f5d4fac83… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-28T14:45:47+02:00 Merge pull request #1654 from grumvalski/non_blocking_async_socket Non blocking async socket --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/modules/async/async_sleep.c Modified: src/modules/db_mysql/km_dbase.c Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/ecb8ab2d71b7f427583179f5d4fac83… Patch: https://github.com/kamailio/kamailio/commit/ecb8ab2d71b7f427583179f5d4fac83…

1 0

git:master:474fa9df: async, db_mysql, db_unixodbc: return -1 and free memory if sending task to the async worker fails
by grumvalski 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: 474fa9dffd60058cfaad8362d96f0d65ed5f828b URL: https://github.com/kamailio/kamailio/commit/474fa9dffd60058cfaad8362d96f0d6… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2018-09-28T14:36:14+02:00 async,db_mysql,db_unixodbc: return -1 and free memory if sending task to the async worker fails --- Modified: src/modules/async/async_sleep.c Modified: src/modules/db_mysql/km_dbase.c Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/474fa9dffd60058cfaad8362d96f0d6… Patch: https://github.com/kamailio/kamailio/commit/474fa9dffd60058cfaad8362d96f0d6… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 66de747f07..097237f4c0 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -298,6 +298,11 @@ int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname) atp->cbname[cbname->len] = '\0'; atp->cbname_len = cbname->len; } - async_task_push(at); + + if (async_task_push(at)<0) { + shm_free(at); + return -1; + } + return 0; } diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 693d510bcf..ad02746c67 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -186,7 +186,10 @@ int db_mysql_submit_query_async(const db1_con_t* _h, const str* _s) p[1].len = _s->len; strncpy(p[1].s, _s->s, _s->len); - async_task_push(atask); + if (async_task_push(atask)<0) { + shm_free(atask); + return -1; + } return 0; } diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index a7b2c61901..5ebe9c3b0b 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -227,7 +227,11 @@ int db_unixodbc_submit_query_async(const db1_con_t* _h, const str* _s) p[1].len = _s->len; strncpy(p[1].s, _s->s, _s->len); - async_task_push(atask); + + if (async_task_push(atask)<0) { + shm_free(atask); + return -1; + } return 0; }

1 0

git:master:f24ea7d3: core: new parameter async_nonblock
by grumvalski 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: f24ea7d3a5482b4e74e0bd682e2f10cca06e615e URL: https://github.com/kamailio/kamailio/commit/f24ea7d3a5482b4e74e0bd682e2f10c… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2018-09-28T14:36:14+02:00 core: new parameter async_nonblock --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/f24ea7d3a5482b4e74e0bd682e2f10c… Patch: https://github.com/kamailio/kamailio/commit/f24ea7d3a5482b4e74e0bd682e2f10c… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index ab2376a446..a6b9d4ef8d 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -47,6 +47,7 @@ static int _async_task_workers = 0; static int _async_task_sockets[2]; static int _async_task_usleep = 0; +static int _async_nonblock = 0; int async_task_run(int idx); @@ -78,6 +79,10 @@ int async_task_init_sockets(void) LM_ERR("opening tasks dgram socket pair\n"); return -1; } + + if (_async_nonblock) + fcntl(_async_task_sockets[1], F_SETFL, fcntl(_async_task_sockets[1], F_GETFL, 0) | O_NONBLOCK); + LM_DBG("inter-process event notification sockets initialized\n"); return 0; } @@ -194,6 +199,17 @@ int async_task_set_workers(int n) return 0; } +/** + * + */ +int async_task_set_nonblock(int n) +{ + if(n>0) + _async_nonblock = 1; + + return 0; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index 55c558c30d..5faa884570 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -35,6 +35,7 @@ int async_task_init(void); int async_task_child_init(int rank); int async_task_initialized(void); int async_task_set_workers(int n); +int async_task_set_nonblock(int n); int async_task_push(async_task_t *task); int async_task_set_usleep(int n); int async_task_workers_get(void); diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ddef8a03ea..4a49cc1d11 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -348,6 +348,7 @@ CHILDREN children SOCKET_WORKERS socket_workers ASYNC_WORKERS async_workers ASYNC_USLEEP async_usleep +ASYNC_NONBLOCK async_nonblock CHECK_VIA check_via PHONE2TEL phone2tel MEMLOG "memlog"|"mem_log" @@ -780,6 +781,7 @@ IMPORTFILE "import_file" <INITIAL>{SOCKET_WORKERS} { count(); yylval.strval=yytext; return SOCKET_WORKERS; } <INITIAL>{ASYNC_WORKERS} { count(); yylval.strval=yytext; return ASYNC_WORKERS; } <INITIAL>{ASYNC_USLEEP} { count(); yylval.strval=yytext; return ASYNC_USLEEP; } +<INITIAL>{ASYNC_NONBLOCK} { count(); yylval.strval=yytext; return ASYNC_NONBLOCK; } <INITIAL>{CHECK_VIA} { count(); yylval.strval=yytext; return CHECK_VIA; } <INITIAL>{PHONE2TEL} { count(); yylval.strval=yytext; return PHONE2TEL; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } diff --git a/src/core/cfg.y b/src/core/cfg.y index e77a42cd6e..66833cde09 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -376,6 +376,7 @@ extern char *default_routename; %token SOCKET_WORKERS %token ASYNC_WORKERS %token ASYNC_USLEEP +%token ASYNC_NONBLOCK %token CHECK_VIA %token PHONE2TEL %token MEMLOG @@ -909,6 +910,8 @@ assign_stm: | ASYNC_WORKERS EQUAL error { yyerror("number expected"); } | ASYNC_USLEEP EQUAL NUMBER { async_task_set_usleep($3); } | ASYNC_USLEEP EQUAL error { yyerror("number expected"); } + | ASYNC_NONBLOCK EQUAL NUMBER { async_task_set_nonblock($3); } + | ASYNC_NONBLOCK EQUAL error { yyerror("number expected"); } | CHECK_VIA EQUAL NUMBER { check_via=$3; } | CHECK_VIA EQUAL error { yyerror("boolean value expected"); } | PHONE2TEL EQUAL NUMBER { phone2tel=$3; }

1 0

git:master:8b66dcb3: topos_redis: fix module export
by Victor Seva 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: 8b66dcb321f7ea16a5a7a6d776706a8ce428e0f7 URL: https://github.com/kamailio/kamailio/commit/8b66dcb321f7ea16a5a7a6d776706a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-09-28T14:43:11+02:00 topos_redis: fix module export --- Modified: src/modules/topos_redis/topos_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8b66dcb321f7ea16a5a7a6d776706a8… Patch: https://github.com/kamailio/kamailio/commit/8b66dcb321f7ea16a5a7a6d776706a8… --- diff --git a/src/modules/topos_redis/topos_redis_mod.c b/src/modules/topos_redis/topos_redis_mod.c index 0027761035..22bdd5a135 100644 --- a/src/modules/topos_redis/topos_redis_mod.c +++ b/src/modules/topos_redis/topos_redis_mod.c @@ -63,9 +63,8 @@ struct module_exports exports = { params, /* exported parameters */ 0, /* exported rpc functions */ 0, /* exported pseudo-variables */ - 0, /* extra processes */ - mod_init, /* module init function */ 0, /* response handling function */ + mod_init, /* module init function */ child_init, /* per child init function */ mod_destroy /* destroy function */ };

1 0

git:master:71299f04: utils: fix format truncation warning
by Victor Seva 28 Sep '18

28 Sep '18

Module: kamailio Branch: master Commit: 71299f04850e52835fa59872403b541448a18145 URL: https://github.com/kamailio/kamailio/commit/71299f04850e52835fa59872403b541… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-09-28T14:42:44+02:00 utils: fix format truncation warning > conf.c: In function 'update_filter': > conf.c:211:31: warning: ':' directive output may be truncated writing 1 byte into a region of size between 0 and 1000 [-Wformat-truncation=] > snprintf(buf, BUFSIZE, "%s:%s", tmp, token); > ^ > conf.c:211:5: note: 'snprintf' output 2 or more bytes (assuming 1002) into a destination of size 1000 > snprintf(buf, BUFSIZE, "%s:%s", tmp, token); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- Modified: src/modules/utils/conf.c --- Diff: https://github.com/kamailio/kamailio/commit/71299f04850e52835fa59872403b541… Patch: https://github.com/kamailio/kamailio/commit/71299f04850e52835fa59872403b541… --- diff --git a/src/modules/utils/conf.c b/src/modules/utils/conf.c index 822cd9206d..4836afa9e4 100644 --- a/src/modules/utils/conf.c +++ b/src/modules/utils/conf.c @@ -208,7 +208,9 @@ static int update_filter(int id, char *flist) /* no special filter! */ if (buf[0]) { strcpy(tmp, buf); - snprintf(buf, BUFSIZE, "%s:%s", tmp, token); + if(snprintf(buf, BUFSIZE, "%s:%s", tmp, token)>BUFSIZE) { + LM_BUG("output was truncated\n"); + } buf[BUFSIZE]='\0'; } else { snprintf(buf, BUFSIZE, "%s", token);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018