sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
307 discussions

git:master:ad136593: kamctl: dbtextdb/dbtextdb_test - do not store unused result of query

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad1365935e2f021095e6e14aca03da54d3862d5b URL: https://github.com/kamailio/kamailio/commit/ad1365935e2f021095e6e14aca03da5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-04T12:20:56+01:00 kamctl: dbtextdb/dbtextdb_test - do not store unused result of query --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/ad1365935e2f021095e6e14aca03da5… Patch: https://github.com/kamailio/kamailio/commit/ad1365935e2f021095e6e14aca03da5… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb_test.py b/utils/kamctl/dbtextdb/dbtextdb_test.py index 54ce274c725..8762de1b3da 100644 --- a/utils/kamctl/dbtextdb/dbtextdb_test.py +++ b/utils/kamctl/dbtextdb/dbtextdb_test.py @@ -500,7 +500,7 @@ def testExecute(self): db_conn.CleanUp() query = ('delete from unsorted_table where id = 5;') - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'id': 1, 'user': 'fred', 'domain': 'test.com', 'number': 2125551234}, {'id': 4, 'user': 'alex', 'domain': @@ -514,7 +514,7 @@ def testExecute(self): # test insert with auto increment query = ("insert into unsorted_table set user='jake', domain='test.com'," 'number = 2125551456;') - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'id': 1, 'user': 'fred', 'domain': 'test.com', 'number': 2125551234}, {'id': 4, 'user': 'alex', 'domain': @@ -531,7 +531,7 @@ def testExecute(self): # test insert with null value query = ("insert into test set col1='asdf';") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -543,7 +543,7 @@ def testExecute(self): # test insert with null value alternate syntax query = ("insert test ( col1) values ('asdf');") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -555,7 +555,7 @@ def testExecute(self): # test insert with colon inside value query = ("insert into test set col1='as:df';") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -567,7 +567,7 @@ def testExecute(self): # test insert with escaped colon inside value query = ("insert into test set col1='as\:df';") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -589,7 +589,7 @@ def testExecute(self): # test update with null value query = ("update test set col2='' where id = 3;") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1':

6 months, 1 week

git:master:42b22b6e: lcr: added module prefix to db_url global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42b22b6e2d91d907cbf80b499b9e4380def2e652 URL: https://github.com/kamailio/kamailio/commit/42b22b6e2d91d907cbf80b499b9e438… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-03T22:18:58+01:00 lcr: added module prefix to db_url global variable - safety for symbols overlapping --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42b22b6e2d91d907cbf80b499b9e438… Patch: https://github.com/kamailio/kamailio/commit/42b22b6e2d91d907cbf80b499b9e438… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 4f0cfae70a9..242054ebaa4 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -135,7 +135,7 @@ gen_lock_t *reload_lock; /* database variables */ /* clang-format off */ -static str db_url = str_init(DEFAULT_RODB_URL); +static str lcr_db_url = str_init(DEFAULT_RODB_URL); static str lcr_rule_table = str_init(LCR_RULE_TABLE); static str lcr_rule_target_table = str_init(LCR_RULE_TARGET_TABLE); static str lcr_gw_table = str_init(LCR_GW_TABLE); @@ -313,7 +313,7 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"db_url", PARAM_STR, &db_url}, + {"db_url", PARAM_STR, &lcr_db_url}, {"lcr_rule_table", PARAM_STR, &lcr_rule_table}, {"lcr_rule_target_table", PARAM_STR, &lcr_rule_target_table}, {"lcr_gw_table", PARAM_STR, &lcr_gw_table}, @@ -455,7 +455,7 @@ static int mod_init(void) } /* Bind database */ - if(lcr_db_bind(&db_url)) { + if(lcr_db_bind(&lcr_db_url)) { LM_ERR("no database module found\n"); return -1; } @@ -692,7 +692,7 @@ static int mod_init(void) } /* Check table version */ - if(lcr_db_init(&db_url) < 0) { + if(lcr_db_init(&lcr_db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; } @@ -1484,7 +1484,7 @@ int reload_tables() request_uri_re = from_uri_re = 0; - if(lcr_db_init(&db_url) < 0) { + if(lcr_db_init(&lcr_db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; }

6 months, 2 weeks

git:master:f0fbf4d7: dmq: rename global variables with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0fbf4d74b8090614469b2a6a16f187275c4f067 URL: https://github.com/kamailio/kamailio/commit/f0fbf4d74b8090614469b2a6a16f187… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-03T22:14:32+01:00 dmq: rename global variables with short name - safety for symbols overlapping --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/f0fbf4d74b8090614469b2a6a16f187… Patch: https://github.com/kamailio/kamailio/commit/f0fbf4d74b8090614469b2a6a16f187…

6 months, 2 weeks

git:master:ae90cb48: xhttp_rpc: rename global variable with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ae90cb489cd07aac42994fbaa124966a34cd4514 URL: https://github.com/kamailio/kamailio/commit/ae90cb489cd07aac42994fbaa124966… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-02T16:20:59+01:00 xhttp_rpc: rename global variable with short name --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ae90cb489cd07aac42994fbaa124966… Patch: https://github.com/kamailio/kamailio/commit/ae90cb489cd07aac42994fbaa124966… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 1e305a91909..3b43469fd16 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -72,7 +72,7 @@ static int xhttp_rpc_dispatch(sip_msg_t *msg, char *s1, char *s2); * being currently processed. * @sa rpc_ctx */ -static rpc_ctx_t ctx; +static rpc_ctx_t _xhttp_rpc_ctx; static xhttp_api_t xhttp_api; @@ -841,64 +841,65 @@ static int ki_xhttp_rpc_dispatch(sip_msg_t *msg) } /* Init xhttp_rpc context */ - if(ctx.reply.buf.s) - LM_ERR("Unexpected buf value [%p][%d]\n", ctx.reply.buf.s, - ctx.reply.buf.len); - memset(&ctx, 0, sizeof(rpc_ctx_t)); - ctx.msg = msg; - ctx.mod = ctx.cmd = -1; - if(init_xhttp_rpc_reply(&ctx) < 0) + if(_xhttp_rpc_ctx.reply.buf.s) + LM_ERR("Unexpected buf value [%p][%d]\n", _xhttp_rpc_ctx.reply.buf.s, + _xhttp_rpc_ctx.reply.buf.len); + memset(&_xhttp_rpc_ctx, 0, sizeof(rpc_ctx_t)); + _xhttp_rpc_ctx.msg = msg; + _xhttp_rpc_ctx.mod = _xhttp_rpc_ctx.cmd = -1; + if(init_xhttp_rpc_reply(&_xhttp_rpc_ctx) < 0) goto send_reply; /* Extract arguments from url */ if(0 - != xhttp_rpc_parse_url( - &msg->first_line.u.request.uri, &ctx.mod, &ctx.cmd, &arg)) { - rpc_fault(&ctx, 500, "Bad URL"); + != xhttp_rpc_parse_url(&msg->first_line.u.request.uri, + &_xhttp_rpc_ctx.mod, &_xhttp_rpc_ctx.cmd, &arg)) { + rpc_fault(&_xhttp_rpc_ctx, 500, "Bad URL"); goto send_reply; } if(arg.s) { if(arg.len) { /* Unescape args */ - ctx.arg.s = pkg_malloc((arg.len + 1) * sizeof(char)); - if(ctx.arg.s == NULL) { + _xhttp_rpc_ctx.arg.s = pkg_malloc((arg.len + 1) * sizeof(char)); + if(_xhttp_rpc_ctx.arg.s == NULL) { PKG_MEM_ERROR; - rpc_fault(&ctx, 500, "Internal Server Error (oom)"); + rpc_fault(&_xhttp_rpc_ctx, 500, "Internal Server Error (oom)"); goto send_reply; } for(i = 0; i < arg.len; i++) if(arg.s[i] == '+') arg.s[i] = ' '; - if(0 > un_escape(&arg, &ctx.arg)) { + if(0 > un_escape(&arg, &_xhttp_rpc_ctx.arg)) { LM_ERR("unable to escape [%.*s]\n", arg.len, arg.s); - rpc_fault(&ctx, 500, "Bad arg in URL"); + rpc_fault(&_xhttp_rpc_ctx, 500, "Bad arg in URL"); goto send_reply; } - ctx.arg.s[ctx.arg.len] = '\0'; - ctx.arg.len++; - ctx.arg2scan = ctx.arg; + _xhttp_rpc_ctx.arg.s[_xhttp_rpc_ctx.arg.len] = '\0'; + _xhttp_rpc_ctx.arg.len++; + _xhttp_rpc_ctx.arg2scan = _xhttp_rpc_ctx.arg; } - ctx.arg_received = 1; + _xhttp_rpc_ctx.arg_received = 1; } else { goto send_reply; } /* - rpc_e=find_rpc_export((char*)rpc_sarray[xhttp_rpc_mod_cmds[ctx.mod].rpc_e_index+ctx.cmd]->name, 0); + rpc_e=find_rpc_export((char*)rpc_sarray[xhttp_rpc_mod_cmds[_xhttp_rpc_ctx.mod].rpc_e_index+_xhttp_rpc_ctx.cmd]->name, 0); if ((rpc_e==NULL) || (rpc_e->function==NULL)){ LM_ERR("Unable to find rpc command [%s]\n", - rpc_sarray[xhttp_rpc_mod_cmds[ctx.mod].rpc_e_index+ctx.cmd]->name); - rpc_fault(&ctx, 500, "Method not found"); + rpc_sarray[xhttp_rpc_mod_cmds[_xhttp_rpc_ctx.mod].rpc_e_index+_xhttp_rpc_ctx.cmd]->name); + rpc_fault(&_xhttp_rpc_ctx, 500, "Method not found"); goto send_reply; } */ - rpc_e = rpc_sarray[xhttp_rpc_mod_cmds[ctx.mod].rpc_e_index + ctx.cmd]; - rpc_e->r.function(&func_param, &ctx); + rpc_e = rpc_sarray[xhttp_rpc_mod_cmds[_xhttp_rpc_ctx.mod].rpc_e_index + + _xhttp_rpc_ctx.cmd]; + rpc_e->r.function(&func_param, &_xhttp_rpc_ctx); send_reply: - if(!ctx.reply_sent) { - ret = rpc_send(&ctx); + if(!_xhttp_rpc_ctx.reply_sent) { + ret = rpc_send(&_xhttp_rpc_ctx); } if(ret < 0) return -1;

6 months, 2 weeks

git:master:b48c5662: p_usrloc: rename global variable with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b48c566218b15cac62cd1cc9dc838d241de73efd URL: https://github.com/kamailio/kamailio/commit/b48c566218b15cac62cd1cc9dc838d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-02T10:41:17+01:00 p_usrloc: rename global variable with short name --- Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db.h Modified: src/modules/p_usrloc/ul_db_watch.c --- Diff: https://github.com/kamailio/kamailio/commit/b48c566218b15cac62cd1cc9dc838d2… Patch: https://github.com/kamailio/kamailio/commit/b48c566218b15cac62cd1cc9dc838d2…

6 months, 2 weeks

git:master:4af2452f: sms: renamed short global variables with common names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4af2452fa9362f4df913003370b0a5279070f372 URL: https://github.com/kamailio/kamailio/commit/4af2452fa9362f4df913003370b0a52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-02T10:24:50+01:00 sms: renamed short global variables with common names --- Modified: src/modules/sms/sms.c Modified: src/modules/sms/sms_funcs.c Modified: src/modules/sms/sms_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/4af2452fa9362f4df913003370b0a52… Patch: https://github.com/kamailio/kamailio/commit/4af2452fa9362f4df913003370b0a52…

6 months, 2 weeks

git:master:05bcd7a8: uac: global variable made static

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 05bcd7a893d2f607943eaa5ab65293e7e273de8d URL: https://github.com/kamailio/kamailio/commit/05bcd7a893d2f607943eaa5ab65293e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-01T22:23:07+01:00 uac: global variable made static - renamed to avoid symbol conflicts --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/05bcd7a893d2f607943eaa5ab65293e… Patch: https://github.com/kamailio/kamailio/commit/05bcd7a893d2f607943eaa5ab65293e… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index b2cdaad9066..c29e9b4b90e 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -50,7 +50,7 @@ #define MAX_UACD_SIZE 128 /** TM bind */ -struct tm_binds tmb; +static struct tm_binds _uac_send_tmb = {0}; typedef struct _uac_send_info { @@ -120,7 +120,7 @@ uac_send_info_t *uac_send_info_clone(uac_send_info_t *ur) int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - if(param == NULL || tmb.t_request == NULL) + if(param == NULL || _uac_send_tmb.t_request == NULL) return -1; switch(param->pvn.u.isname.name.n) { @@ -191,7 +191,7 @@ int pv_set_uac_req( { pv_value_t *tval; - if(param == NULL || tmb.t_request == NULL) + if(param == NULL || _uac_send_tmb.t_request == NULL) return -1; tval = val; @@ -545,9 +545,9 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) void uac_req_init(void) { /* load the TM API */ - if(load_tm_api(&tmb) != 0) { + if(load_tm_api(&_uac_send_tmb) != 0) { LM_DBG("can't load TM API - disable it\n"); - memset(&tmb, 0, sizeof(struct tm_binds)); + memset(&_uac_send_tmb, 0, sizeof(struct tm_binds)); return; } memset(&_uac_req, 0, sizeof(struct _uac_send_info)); @@ -788,7 +788,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* Callback parameter */ uac_r.cbp = (void *)tp; } - ret = tmb.t_request_within(&uac_r); + ret = _uac_send_tmb.t_request_within(&uac_r); if(ret < 0) { LM_ERR("failed to send request with authentication\n"); @@ -816,7 +816,7 @@ int uac_req_send(void) uac_send_info_t *tp = NULL; if(_uac_req.s_ruri.len <= 0 || _uac_req.s_method.len == 0 - || tmb.t_request == NULL) + || _uac_send_tmb.t_request == NULL) return -1; memset(&uac_r, '\0', sizeof(uac_r)); @@ -856,8 +856,8 @@ int uac_req_send(void) uac_r.cbp = (void *)tp; } uac_r.callid = (_uac_req.s_callid.len <= 0) ? NULL : &_uac_req.s_callid; - ret = tmb.t_request(&uac_r, /* UAC Req */ - &_uac_req.s_ruri, /* Request-URI */ + ret = _uac_send_tmb.t_request(&uac_r, /* UAC Req */ + &_uac_req.s_ruri, /* Request-URI */ (_uac_req.s_turi.len <= 0) ? &_uac_req.s_ruri : &_uac_req.s_turi, /* To */ (_uac_req.s_furi.len <= 0) ? &_uac_req.s_ruri

6 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024