sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:5f891d73: db_sqlite: free con in case of error at open time

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f891d732443dc065b89b1895601ad429d696c33 URL: https://github.com/kamailio/kamailio/commit/5f891d732443dc065b89b1895601ad4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-15T08:56:04+02:00 db_sqlite: free con in case of error at open time --- Modified: src/modules/db_sqlite/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/5f891d732443dc065b89b1895601ad4… Patch: https://github.com/kamailio/kamailio/commit/5f891d732443dc065b89b1895601ad4… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index 3fba0e911b..bba8b01639 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -65,7 +65,8 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i str db_name = str_init((char *) id->database); db_param_list_t *db_param = db_param_list_search(db_name); if (db_param && db_param->readonly) { - // The database is opened in read-only mode. If the database does not already exist, an error is returned. + /* The database is opened in read-only mode. If the database does not + * already exist, an error is returned. */ flags |= SQLITE_OPEN_READONLY; LM_DBG("[%s] opened with [SQLITE_OPEN_READONLY]\n", id->database); } else { @@ -93,9 +94,11 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i break; } else if (rc != SQLITE_ROW) { LM_ERR("sqlite3_step[%s]\n", sqlite3_errmsg(con->conn)); + pkg_free(con); return NULL; } else { rc = sqlite3_column_count(stmt); + LM_DBG("columns in result: %d\n", rc); } } if (stmt) {

7 years, 5 months

git:master:8353b034: app_python: several free of allocated vars in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8353b0341ada19d6f0611e0aa693bfa20db0b51c URL: https://github.com/kamailio/kamailio/commit/8353b0341ada19d6f0611e0aa693bfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-15T08:41:09+02:00 app_python: several free of allocated vars in case of errors --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/python_msgobj.c Modified: src/modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/8353b0341ada19d6f0611e0aa693bfa… Patch: https://github.com/kamailio/kamailio/commit/8353b0341ada19d6f0611e0aa693bfa…

7 years, 5 months

git:master:15de1f06: app_lua: safer alloc size for hdr operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 15de1f06b94588ed0764ab3a3b0cd1202b5c1cb6 URL: https://github.com/kamailio/kamailio/commit/15de1f06b94588ed0764ab3a3b0cd12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-14T14:40:15+02:00 app_lua: safer alloc size for hdr operations --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/15de1f06b94588ed0764ab3a3b0cd12… Patch: https://github.com/kamailio/kamailio/commit/15de1f06b94588ed0764ab3a3b0cd12… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index f999de3e37..86380ec6ad 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -737,7 +737,7 @@ static int lua_sr_hdr_append (lua_State *L) hf = env_L->msg->last_header; len = strlen(txt); - hdr = (char*)pkg_malloc(len); + hdr = (char*)pkg_malloc(len+1); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); @@ -823,7 +823,7 @@ static int lua_sr_hdr_insert (lua_State *L) LM_DBG("insert hf: %s\n", txt); hf = env_L->msg->headers; len = strlen(txt); - hdr = (char*)pkg_malloc(len); + hdr = (char*)pkg_malloc(len+1); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); @@ -1683,7 +1683,6 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) fname->len, fname->s); return app_lua_return_false(L); } - return app_lua_return_false(L); } /**

7 years, 5 months

git:master:beffbad6: cfg_rpc: cast void* for set-int to avoid compiler warnings in reset command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: beffbad6d0a727232599ec6d15a0d7c6c37d6ddc URL: https://github.com/kamailio/kamailio/commit/beffbad6d0a727232599ec6d15a0d7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-14T14:33:36+02:00 cfg_rpc: cast void* for set-int to avoid compiler warnings in reset command --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/beffbad6d0a727232599ec6d15a0d7c… Patch: https://github.com/kamailio/kamailio/commit/beffbad6d0a727232599ec6d15a0d7c… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index 06e775c5c1..18c16c8733 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -403,7 +403,7 @@ static void rpc_reset(rpc_t* rpc, void* c) } if (input_type == CFG_INPUT_INT) - cfg_set_now_int(ctx, &gname, group_id, &var, val); + cfg_set_now_int(ctx, &gname, group_id, &var, (int)(long)val); else if (input_type == CFG_INPUT_STRING) cfg_set_now_string(ctx, &gname, group_id, &var, val); }

7 years, 5 months

git:master:15aaff16: core: cfg ctx - formatting for cfg reset

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 15aaff16dd0c6d290885cd39390813d183851f35 URL: https://github.com/kamailio/kamailio/commit/15aaff16dd0c6d290885cd39390813d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-14T14:32:14+02:00 core: cfg ctx - formatting for cfg reset --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/15aaff16dd0c6d290885cd39390813d… Patch: https://github.com/kamailio/kamailio/commit/15aaff16dd0c6d290885cd39390813d… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 4c07996950..02dd9145dd 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -1284,8 +1284,8 @@ int cfg_rollback(cfg_ctx_t *ctx) * -1 - error * 1 - variable exists, but it is not readable */ -int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, - void **val, unsigned int *val_type) +int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, + str *var_name, void **val, unsigned int *val_type) { cfg_group_t *group; cfg_mapping_t *var; @@ -1365,8 +1365,9 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str * -1 - error * 1 - variable exists, but it is not readable */ -int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, - void **val, unsigned int *val_type) +int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, + unsigned int *group_id, str *var_name, void **val, + unsigned int *val_type) { cfg_group_t *group; cfg_mapping_t *var; @@ -1384,11 +1385,11 @@ int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int } /* look-up the group and the variable */ - if (cfg_lookup_var(group_name, var_name, &group, &var)) + if (cfg_lookup_var(group_name, var_name, &group, &var)) { return -1; - else - { - if(var->def->type & CFG_READONLY) /* if variables exist then prevents resetting the read-only ones */ + } else { + /* if variables exist then prevents resetting the read-only ones */ + if(var->def->type & CFG_READONLY) return -1; } @@ -1399,7 +1400,8 @@ int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int return 1; } - /* use the module's orig_handle to access the default registered value of the variable for any group*/ + /* use the module's orig_handle to access the default registered value of + * the variable for any group*/ p = (group->orig_handle) + var->offset; switch (CFG_VAR_TYPE(var)) {

7 years, 5 months

git:master:7c795ada: pdb: avoid unaligned pointer address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7c795adaf0f3899567a9769fecbbb300387837be URL: https://github.com/kamailio/kamailio/commit/7c795adaf0f3899567a9769fecbbb30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-14T14:25:57+02:00 pdb: avoid unaligned pointer address --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/7c795adaf0f3899567a9769fecbbb30… Patch: https://github.com/kamailio/kamailio/commit/7c795adaf0f3899567a9769fecbbb30… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 3142ba26f9..e4ef6758d9 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -198,6 +198,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct struct timeval tstart, tnow; struct server_item_t *server; short int carrierid, *_id; + short int _idv; char buf[sizeof(struct pdb_msg)]; size_t reqlen; int_str avp_val; @@ -324,7 +325,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct } return -1; } - + ret=poll(server_list->fds, server_list->nserver, timeout-td); for (i=0; i<server_list->nserver; i++) { if (server_list->fds[i].revents & POLLIN) { @@ -334,8 +335,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct memcpy(&msg, buf, bytes_received); pdb_msg_dbg(msg, "Kamailio pdb client receives:"); - _id = (short int *)&(msg.hdr.id); /* make gcc happy */ - msg.hdr.id = ntohs(*_id); + _idv = msg.hdr.id; /* make gcc happy */ + msg.hdr.id = ntohs(_idv); switch (msg.hdr.code) { case PDB_CODE_OK:

7 years, 5 months

git:master:dc0765c0: core: set its own id for EVENT_ROUTE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dc0765c04c3cb5d8981551e3f28ee6871fc803ff URL: https://github.com/kamailio/kamailio/commit/dc0765c04c3cb5d8981551e3f28ee68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-14T14:11:14+02:00 core: set its own id for EVENT_ROUTE - having it as alias to REQURST_ROUTE can hide execution of undexpected script callbacks --- Modified: src/core/route.h --- Diff: https://github.com/kamailio/kamailio/commit/dc0765c04c3cb5d8981551e3f28ee68… Patch: https://github.com/kamailio/kamailio/commit/dc0765c04c3cb5d8981551e3f28ee68… --- diff --git a/src/core/route.h b/src/core/route.h index b711c2a6d4..67663d307f 100644 --- a/src/core/route.h +++ b/src/core/route.h @@ -54,7 +54,7 @@ #define CORE_ONREPLY_ROUTE (1 << 7) #define BRANCH_FAILURE_ROUTE (1 << 8) #define ONREPLY_ROUTE (TM_ONREPLY_ROUTE|CORE_ONREPLY_ROUTE) -#define EVENT_ROUTE REQUEST_ROUTE +#define EVENT_ROUTE (1 << 9) #define ANY_ROUTE (0xFFFFFFFF) /* The value of this variable is one of the route types defined above and it @@ -74,7 +74,7 @@ extern int route_type; struct route_list{ struct action** rlist; - int idx; /* first empty entry */ + int idx; /* first empty entry */ int entries; /* total number of entries */ struct str_hash_table names; /* name to route index mappings */ };

7 years, 5 months

git:master:666c9d1f: pua_dialoginfo: fixed condition in mod init checking avp names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 666c9d1fcdde00dbdd2e87ff797e554af6d72b5c URL: https://github.com/kamailio/kamailio/commit/666c9d1fcdde00dbdd2e87ff797e554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-14T08:22:20+02:00 pua_dialoginfo: fixed condition in mod init checking avp names --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/666c9d1fcdde00dbdd2e87ff797e554… Patch: https://github.com/kamailio/kamailio/commit/666c9d1fcdde00dbdd2e87ff797e554… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 6141e3bdec..ab6569b2a8 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -618,7 +618,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) struct sip_msg *request = _params->req; struct dlginfo_cell *dlginfo; - if (request->REQ_METHOD != METHOD_INVITE) + if (request==NULL || request->REQ_METHOD != METHOD_INVITE) return; if(send_publish_flag > -1 && !(request->flags & (1<<send_publish_flag))) @@ -719,8 +719,8 @@ static int mod_init(void) if(use_pubruri_avps) { - if(!(pubruri_caller_avp && *pubruri_caller_avp) - && (pubruri_callee_avp && *pubruri_callee_avp)) { + if((pubruri_caller_avp==NULL || *pubruri_caller_avp==0) + || (pubruri_callee_avp==NULL || *pubruri_callee_avp==0)) { LM_ERR("pubruri_caller_avp and pubruri_callee_avp must be set," " if use_pubruri_avps is enabled\n"); return -1;

7 years, 5 months

git:5.0:e7ebdcfe: htable: improve some error logs

by Ovidiu Sas

Module: kamailio Branch: 5.0 Commit: e7ebdcfee72d0d54c375383565fd1fcd3816c7c1 URL: https://github.com/kamailio/kamailio/commit/e7ebdcfee72d0d54c375383565fd1fc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-07-13T18:27:00-04:00 htable: improve some error logs (cherry picked from commit 9dadfe9234d26d3b8b8ea0603b3f8fa13f96913c) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/e7ebdcfee72d0d54c375383565fd1fc… Patch: https://github.com/kamailio/kamailio/commit/e7ebdcfee72d0d54c375383565fd1fc… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index fd5ec46c0e..5cdecb1814 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -276,7 +276,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) for(i=0; i<RES_ROW_N(db_res); i++) { if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key value must not be null\n"); + LM_ERR("htable [%.*s] row [%d] has NULL key value\n", + ht->name.len, ht->name.s, i); goto error; } @@ -284,7 +285,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) case DB1_STR: kname.s = (RES_ROWS(db_res)[i].values[0].val.str_val.s); if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); + LM_ERR("htable [%.*s] row [%d] has NULL key\n", + ht->name.len, ht->name.s, i); goto error; } kname.len = (RES_ROWS(db_res)[i].values[0].val.str_val.len); @@ -292,7 +294,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) case DB1_BLOB: kname.s = (RES_ROWS(db_res)[i].values[0].val.blob_val.s); if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); + LM_ERR("htable [%.*s] row [%d] has NULL key\n", + ht->name.len, ht->name.s, i); goto error; } kname.len = (RES_ROWS(db_res)[i].values[0].val.blob_val.len); @@ -300,7 +303,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) case DB1_STRING: kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); + LM_ERR("htable [%.*s] row [%d] has NULL key\n", + ht->name.len, ht->name.s, i); goto error; } kname.len = strlen(kname.s);

7 years, 5 months

git:master:9dadfe92: htable: improve some error logs

by Ovidiu Sas

Module: kamailio Branch: master Commit: 9dadfe9234d26d3b8b8ea0603b3f8fa13f96913c URL: https://github.com/kamailio/kamailio/commit/9dadfe9234d26d3b8b8ea0603b3f8fa… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-07-13T18:23:43-04:00 htable: improve some error logs --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/9dadfe9234d26d3b8b8ea0603b3f8fa… Patch: https://github.com/kamailio/kamailio/commit/9dadfe9234d26d3b8b8ea0603b3f8fa… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index fd5ec46c0e..5cdecb1814 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -276,7 +276,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) for(i=0; i<RES_ROW_N(db_res); i++) { if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key value must not be null\n"); + LM_ERR("htable [%.*s] row [%d] has NULL key value\n", + ht->name.len, ht->name.s, i); goto error; } @@ -284,7 +285,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) case DB1_STR: kname.s = (RES_ROWS(db_res)[i].values[0].val.str_val.s); if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); + LM_ERR("htable [%.*s] row [%d] has NULL key\n", + ht->name.len, ht->name.s, i); goto error; } kname.len = (RES_ROWS(db_res)[i].values[0].val.str_val.len); @@ -292,7 +294,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) case DB1_BLOB: kname.s = (RES_ROWS(db_res)[i].values[0].val.blob_val.s); if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); + LM_ERR("htable [%.*s] row [%d] has NULL key\n", + ht->name.len, ht->name.s, i); goto error; } kname.len = (RES_ROWS(db_res)[i].values[0].val.blob_val.len); @@ -300,7 +303,8 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) case DB1_STRING: kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); + LM_ERR("htable [%.*s] row [%d] has NULL key\n", + ht->name.len, ht->name.s, i); goto error; } kname.len = strlen(kname.s);

7 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017