sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

git:5.0:f949edc0: permissions: check for db_url being set on reload
by Henning Westerholt 15 Aug '18

15 Aug '18

Module: kamailio Branch: 5.0 Commit: f949edc0798d92275dc340da0c06a6fddeb7ee3c URL: https://github.com/kamailio/kamailio/commit/f949edc0798d92275dc340da0c06a6f… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-15T21:17:40+02:00 permissions: check for db_url being set on reload (cherry picked from commit 2cb677247ccbb31bc76c0fd0ed0cd8e2b5b933eb) --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/f949edc0798d92275dc340da0c06a6f… Patch: https://github.com/kamailio/kamailio/commit/f949edc0798d92275dc340da0c06a6f… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 46d135bf6d..0f19dd9a39 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -255,6 +255,11 @@ int reload_address_table(void) */ int reload_address_table_cmd(void) { + if(!db_url.s) { + LM_ERR("db_url not set\n"); + return -1; + } + if (!db_handle) { db_handle = perm_dbf.init(&db_url); if (!db_handle) { diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index f953338d96..c357293f3c 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -585,6 +585,11 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) int reload_trusted_table_cmd(void) { + if(!db_url.s) { + LM_ERR("db_url not set\n"); + return -1; + } + if (!db_handle) { db_handle = perm_dbf.init(&db_url); if (!db_handle) {

1 0

git:5.1:0c3350c7: permissions: check for db_url being set on reload
by Henning Westerholt 15 Aug '18

15 Aug '18

Module: kamailio Branch: 5.1 Commit: 0c3350c785722fae33a65a2588c0b2545f4d3b02 URL: https://github.com/kamailio/kamailio/commit/0c3350c785722fae33a65a2588c0b25… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-15T21:16:18+02:00 permissions: check for db_url being set on reload (cherry picked from commit 2cb677247ccbb31bc76c0fd0ed0cd8e2b5b933eb) --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/0c3350c785722fae33a65a2588c0b25… Patch: https://github.com/kamailio/kamailio/commit/0c3350c785722fae33a65a2588c0b25… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 46d135bf6d..0f19dd9a39 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -255,6 +255,11 @@ int reload_address_table(void) */ int reload_address_table_cmd(void) { + if(!db_url.s) { + LM_ERR("db_url not set\n"); + return -1; + } + if (!db_handle) { db_handle = perm_dbf.init(&db_url); if (!db_handle) { diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index f953338d96..c357293f3c 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -585,6 +585,11 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) int reload_trusted_table_cmd(void) { + if(!db_url.s) { + LM_ERR("db_url not set\n"); + return -1; + } + if (!db_handle) { db_handle = perm_dbf.init(&db_url); if (!db_handle) {

1 0

git:master:989ea3d6: lib/srdb1: cast for signed comparison
by Daniel-Constantin Mierla 15 Aug '18

15 Aug '18

Module: kamailio Branch: master Commit: 989ea3d60ac30d7ecf5a65094c941bc2dcf76629 URL: https://github.com/kamailio/kamailio/commit/989ea3d60ac30d7ecf5a65094c941bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-15T16:45:38+02:00 lib/srdb1: cast for signed comparison --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/989ea3d60ac30d7ecf5a65094c941bc… Patch: https://github.com/kamailio/kamailio/commit/989ea3d60ac30d7ecf5a65094c941bc… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 1dfb4c80b3..39ac11d379 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -113,7 +113,7 @@ int db_str2uint(const char* _s, unsigned int* _v) tmp = strtoul(_s, &p, 10); if ((tmp == ULONG_MAX && errno == ERANGE) || - (tmp < INT_MIN) || (tmp > UINT_MAX)) { + ((long)tmp < INT_MIN) || (tmp > UINT_MAX)) { LM_ERR("Value out of range\n"); return -1; }

1 0

git:master:ec0c583b: tm: safety check for t->uas.request for forwarding local requests
by Daniel-Constantin Mierla 15 Aug '18

15 Aug '18

Module: kamailio Branch: master Commit: ec0c583b5b054d06691a2c0d90be195f6ed51cdd URL: https://github.com/kamailio/kamailio/commit/ec0c583b5b054d06691a2c0d90be195… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-15T12:23:51+02:00 tm: safety check for t->uas.request for forwarding local requests --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/ec0c583b5b054d06691a2c0d90be195… Patch: https://github.com/kamailio/kamailio/commit/ec0c583b5b054d06691a2c0d90be195… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 4ebafee167..985b96f190 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1718,7 +1718,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, setbflagsval(0, backup_bflags); /* update message flags, if changed in branch route */ - t->uas.request->flags = p_msg->flags; + if(t->uas.request) t->uas.request->flags = p_msg->flags; /* don't forget to clear all branches processed so far */ @@ -1782,7 +1782,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, /* restore backup flags from initial env */ setbflagsval(0, backup_bflags); /* update message flags, if changed in branch route */ - t->uas.request->flags = p_msg->flags; + if(t->uas.request) t->uas.request->flags = p_msg->flags; ser_error=E_CANCELED; return -1; }

1 0

[kamailio/kamailio] permissions: check for db_url being set on reload (#1621)
by Armen Babikyan 15 Aug '18

15 Aug '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1621 -- Commit Summary -- * permissions: check for db_url being set on reload -- File Changes -- M src/modules/permissions/address.c (7) M src/modules/permissions/trusted.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1621.patch https://github.com/kamailio/kamailio/pull/1621.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/1621

2 3

git:master:2cb67724: permissions: check for db_url being set on reload
by Henning Westerholt 15 Aug '18

15 Aug '18

Module: kamailio Branch: master Commit: 2cb677247ccbb31bc76c0fd0ed0cd8e2b5b933eb URL: https://github.com/kamailio/kamailio/commit/2cb677247ccbb31bc76c0fd0ed0cd8e… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-08-15T09:04:30+02:00 permissions: check for db_url being set on reload --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/2cb677247ccbb31bc76c0fd0ed0cd8e… Patch: https://github.com/kamailio/kamailio/commit/2cb677247ccbb31bc76c0fd0ed0cd8e… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index cc447deaf6..7a8999ea34 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -255,6 +255,11 @@ int reload_address_table(void) */ int reload_address_table_cmd(void) { + if(!db_url.s) { + LM_ERR("db_url not set\n"); + return -1; + } + if (!db_handle) { db_handle = perm_dbf.init(&db_url); if (!db_handle) { @@ -621,4 +626,4 @@ int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) } return ki_allow_address_group(_msg, &ips, port); -} \ No newline at end of file +} diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 06e3142321..9943cbd137 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -636,6 +636,11 @@ int allow_trusted_3(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp, int reload_trusted_table_cmd(void) { + if(!db_url.s) { + LM_ERR("db_url not set\n"); + return -1; + } + if (!db_handle) { db_handle = perm_dbf.init(&db_url); if (!db_handle) {

1 0

new compiler warnings in master
by Juha Heinanen 14 Aug '18

14 Aug '18

CC (gcc) [M db_mysql.so] my_cmd.o my_cmd.c: In function 'set_field': my_cmd.c:774:16: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] bind->is_null = &f->is_null; ^ my_cmd.c: In function 'bind_result': my_cmd.c:1004:21: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] result[i].is_null = &f->is_null; ^

2 3

[kamailio/kamailio] getting an error while install kamailio5.1 on ubntu 18.4 (#1602)
by limitall 14 Aug '18

14 Aug '18

flex -o core/lex.yy.c core/cfg.lex CC (gcc) [kamailio] core/lex.yy.o CC (gcc) [kamailio] core/cfg.tab.o LD (gcc) [kamailio] kamailio CC (gcc) [M db_mysql.so] km_val.o CC (gcc) [M db_mysql.so] my_fld.o In file included from my_fld.c:22:0: my_fld.h:37:2: error: unknown type name ‘my_bool’ my_bool is_null; ^~~~~~~ ../../Makefile.rules:100: recipe for target 'my_fld.o' failed make[2]: *** [my_fld.o] Error 1 Makefile:511: recipe for target 'modules' failed make[1]: *** [modules] Error 1 make[1]: Leaving directory '/usr/local/src/kamailio-5.1/kamailio/src' Makefile:27: recipe for target 'all' failed make: *** [all] Error 2 -- 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/1602

5 6

git:master:9f459dcc: db_mysql: improved fix in commit 1736723cc2a15 - it did not worked for mariadb
by Henning Westerholt 14 Aug '18

14 Aug '18

Module: kamailio Branch: master Commit: 9f459dccf84be7d7d0fbce89ca9165f7d1c4d66b URL: https://github.com/kamailio/kamailio/commit/9f459dccf84be7d7d0fbce89ca9165f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-14T19:35:20+02:00 db_mysql: improved fix in commit 1736723cc2a15 - it did not worked for mariadb - improved fix in commit 1736723cc2a15 - it did not worked for mariadb - Reason is that MariaDB increased its numbering scheme, they are now at 10.x - MariaDB 10 is still using my_bool type, added few more #ifs to fix this --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_fld.h --- Diff: https://github.com/kamailio/kamailio/commit/9f459dccf84be7d7d0fbce89ca9165f… Patch: https://github.com/kamailio/kamailio/commit/9f459dccf84be7d7d0fbce89ca9165f… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 242329e295..9d6566204d 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -29,7 +29,12 @@ #include "km_my_con.h" #include "km_db_mysql.h" #include <mysql.h> + +/* MariaDB exports MYSQL_VERSION_ID as well, but changed numbering scheme */ +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION #include <stdbool.h> +#endif + #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/ut.h" @@ -45,7 +50,11 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) char *host, *grp, *egrp; unsigned int connection_flag = 0; #if MYSQL_VERSION_ID > 50012 +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool rec; +#else + my_bool rec; +#endif #endif if (!id) { diff --git a/src/modules/db_mysql/my_fld.h b/src/modules/db_mysql/my_fld.h index 539a4df699..c247e48407 100644 --- a/src/modules/db_mysql/my_fld.h +++ b/src/modules/db_mysql/my_fld.h @@ -29,13 +29,21 @@ #include "../../lib/srdb2/db_drv.h" #include "../../lib/srdb2/db_fld.h" #include <mysql.h> + +/* MariaDB exports MYSQL_VERSION_ID as well, but changed numbering */ +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION #include <stdbool.h> +#endif struct my_fld { db_drv_t gen; char* name; +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool is_null; +#else + my_bool is_null; +#endif MYSQL_TIME time; unsigned long length; str buf;

1 0

git:master:3afb9659: app_python: ensure cfg framework is initialized for child init callback
by Daniel-Constantin Mierla 14 Aug '18

14 Aug '18

Module: kamailio Branch: master Commit: 3afb9659ab8b25ff8cfbe4fc706396b83db51021 URL: https://github.com/kamailio/kamailio/commit/3afb9659ab8b25ff8cfbe4fc706396b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-14T11:05:17+02:00 app_python: ensure cfg framework is initialized for child init callback - reported by GH #1618 --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3afb9659ab8b25ff8cfbe4fc706396b… Patch: https://github.com/kamailio/kamailio/commit/3afb9659ab8b25ff8cfbe4fc706396b… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 5c5278f42d..8ed21e1c93 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -26,6 +26,7 @@ #include "../../core/sr_module.h" #include "../../core/mod_fix.h" #include "../../core/kemi.h" +#include "../../core/cfg/cfg_struct.h" #include "python_exec.h" #include "python_iface.h" @@ -278,7 +279,7 @@ int apy_mod_init(PyObject *pModule) Py_XDECREF(_sr_apy_handler_obj); _sr_apy_handler_obj = pHandler; rval = 0; - err: +err: return rval; } @@ -291,7 +292,7 @@ int apy_reload_script(void) PY_GIL_ENSURE; pModule = PyImport_ReloadModule(_sr_apy_module); if (!pModule) { - // PyErr_PrintEx(0); - don't hide the real exception + // PyErr_PrintEx(0); - don't hide the real exception if (!PyErr_Occurred()) PyErr_Format(PyExc_ImportError, "Reload module '%s'", bname); python_handle_exception("mod_init"); @@ -306,15 +307,15 @@ int apy_reload_script(void) Py_DECREF(_sr_apy_module); _sr_apy_module = pModule; - if(apy_init_script(_apy_process_rank)<0) { - LM_ERR("failed to init script\n"); + if(apy_init_script(_apy_process_rank)<0) { + LM_ERR("failed to init script\n"); goto err; - } + } rval = 0; - err: +err: PY_GIL_RELEASE; - return rval; + return rval; } int apy_load_script(void) @@ -390,7 +391,7 @@ int apy_load_script(void) _sr_apy_module = pModule; rval = apy_mod_init(pModule); - err: +err: PY_GIL_RELEASE; return rval; } @@ -435,6 +436,10 @@ int apy_init_script(int rank) goto err; } + if (cfg_child_init()) { + goto err; + } + pArgs = PyTuple_New(1); if (pArgs == NULL) { python_handle_exception("child_init"); @@ -485,7 +490,7 @@ int apy_init_script(int rank) rval = PyInt_AsLong(pResult); Py_DECREF(pResult); - err: +err: PY_GIL_RELEASE; return rval; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018