sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:40183854: sqlops: sqlops_do_query - Make result parameter optional in C API

by Hugh Waite

Module: kamailio Branch: master Commit: 401838544fde5a11fbdf2b17f21a59ca34cc3db2 URL: https://github.com/kamailio/kamailio/commit/401838544fde5a11fbdf2b17f21a59c… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-03-01T20:57:27Z sqlops: sqlops_do_query - Make result parameter optional in C API - The sqlops_do_query wrapper function will fail if the 'sres' string parameter is NULL - This change prevents a NULL string parameter from causing an error. - The sql_do_query function already handles NULL parameters correctly. --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/401838544fde5a11fbdf2b17f21a59c… Patch: https://github.com/kamailio/kamailio/commit/401838544fde5a11fbdf2b17f21a59c… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 16492300bc..825f77602a 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -703,8 +703,7 @@ int sqlops_do_query(str *scon, str *squery, str *sres) LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); goto error; } - res = sql_get_result(sres); - if(res==NULL) + if (sres && ((res = sql_get_result(sres)) == NULL)) { LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); goto error;

6 years, 2 months

[kamailio/kamailio] sqlops: sqlops_do_query - Make result parameter optional in C API (#1467)

by Hugh Waite

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1467 -- Commit Summary -- * sqlops: sqlops_do_query - Make result parameter optional in C API -- File Changes -- M src/modules/sqlops/sql_api.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1467.patch https://github.com/kamailio/kamailio/pull/1467.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/1467

6 years, 2 months

git:master:8c1f1c16: app_python3: improve exception debugging

by AnthonyA

Module: kamailio Branch: master Commit: 8c1f1c16c1d054cbc01dc26341f6770934d46ead URL: https://github.com/kamailio/kamailio/commit/8c1f1c16c1d054cbc01dc26341f6770… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T21:57:28+08:00 app_python3: improve exception debugging - print method name and arg on error --- Modified: src/modules/app_python3/python_exec.c Modified: src/modules/app_python3/python_support.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/8c1f1c16c1d054cbc01dc26341f6770… Patch: https://github.com/kamailio/kamailio/commit/8c1f1c16c1d054cbc01dc26341f6770… --- diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index 12a8008d66..55f40c1e47 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -142,7 +142,7 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) Py_DECREF(pFunc); if (PyErr_Occurred()) { Py_XDECREF(pResult); - python_handle_exception("python_exec2"); + python_handle_exception("apy_exec: %s(%s)", fname, fparam); _sr_apy_env.msg = bmsg; goto err; } diff --git a/src/modules/app_python3/python_support.c b/src/modules/app_python3/python_support.c index a08cd9ee11..2ad522901a 100644 --- a/src/modules/app_python3/python_support.c +++ b/src/modules/app_python3/python_support.c @@ -29,6 +29,8 @@ #include "app_python_mod.h" #include "python_support.h" +static char *make_message(const char *fmt, va_list args); + void python_handle_exception(const char *fmt, ...) { PyObject *pResult; @@ -40,6 +42,7 @@ void python_handle_exception(const char *fmt, ...) int i; char *srcbuf; int exc_exit = 0; + va_list ap; // We don't want to generate traceback when no errors occurred if (!PyErr_Occurred()) @@ -47,8 +50,11 @@ void python_handle_exception(const char *fmt, ...) if (fmt == NULL) srcbuf = NULL; - else - srcbuf = make_message(fmt); + else { + va_start(ap, fmt); + srcbuf = make_message(fmt, ap); + va_end(ap); + } PyErr_Fetch(&exception, &v, &tb); PyErr_Clear(); @@ -184,12 +190,11 @@ PyObject *InitTracebackModule() } -char *make_message(const char *fmt, ...) +static char *make_message(const char *fmt, va_list ap) { int n; size_t size; char *p, *np; - va_list ap; size = 100; /* Guess we need no more than 100 bytes. */ p = (char *)pkg_realloc(NULL, size * sizeof(char)); @@ -203,9 +208,7 @@ char *make_message(const char *fmt, ...) while (1) { - va_start(ap, fmt); n = vsnprintf(p, size, fmt, ap); - va_end(ap); if (n > -1 && n < size) return p; diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 032340dcdd..4d25564119 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -28,7 +28,6 @@ PyObject *format_exc_obj; void python_handle_exception(const char *, ...); -char *make_message(const char *fmt, ...); PyObject *InitTracebackModule(void); char *get_class_name(PyObject *);

6 years, 2 months

git:master:f8b8cecb: app_python: improve exception debugging

by AnthonyA

Module: kamailio Branch: master Commit: f8b8cecb7d713b37e3184b4720c992296005a427 URL: https://github.com/kamailio/kamailio/commit/f8b8cecb7d713b37e3184b4720c9922… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T21:57:28+08:00 app_python: improve exception debugging - print method name and arg on error --- Modified: src/modules/app_python/python_exec.c Modified: src/modules/app_python/python_support.c Modified: src/modules/app_python/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/f8b8cecb7d713b37e3184b4720c9922… Patch: https://github.com/kamailio/kamailio/commit/f8b8cecb7d713b37e3184b4720c9922… --- diff --git a/src/modules/app_python/python_exec.c b/src/modules/app_python/python_exec.c index 91c93d0e18..f5f4d02532 100644 --- a/src/modules/app_python/python_exec.c +++ b/src/modules/app_python/python_exec.c @@ -146,7 +146,7 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) Py_DECREF(pFunc); if (PyErr_Occurred()) { Py_XDECREF(pResult); - python_handle_exception("python_exec2"); + python_handle_exception("apy_exec: %s(%s)", fname, fparam); _sr_apy_env.msg = bmsg; goto err; } diff --git a/src/modules/app_python/python_support.c b/src/modules/app_python/python_support.c index 0a57068719..8db77af937 100644 --- a/src/modules/app_python/python_support.c +++ b/src/modules/app_python/python_support.c @@ -29,6 +29,8 @@ #include "app_python_mod.h" #include "python_support.h" +static char *make_message(const char *fmt, va_list ap); + void python_handle_exception(const char *fmt, ...) { PyObject *pResult; @@ -40,6 +42,7 @@ void python_handle_exception(const char *fmt, ...) int i; char *srcbuf; int exc_exit = 0; + va_list ap; // We don't want to generate traceback when no errors occurred if (!PyErr_Occurred()) @@ -47,8 +50,11 @@ void python_handle_exception(const char *fmt, ...) if (fmt == NULL) srcbuf = NULL; - else - srcbuf = make_message(fmt); + else { + va_start(fmt, ap); + srcbuf = make_message(fmt, ap); + va_end(ap); + } PyErr_Fetch(&exception, &v, &tb); PyErr_Clear(); @@ -184,12 +190,11 @@ PyObject *InitTracebackModule() } -char *make_message(const char *fmt, ...) +static char *make_message(const char *fmt, va_list ap) { int n; size_t size; char *p, *np; - va_list ap; size = 100; /* Guess we need no more than 100 bytes. */ p = (char *)pkg_realloc(NULL, size * sizeof(char)); @@ -203,9 +208,7 @@ char *make_message(const char *fmt, ...) while (1) { - va_start(ap, fmt); n = vsnprintf(p, size, fmt, ap); - va_end(ap); if (n > -1 && n < size) return p; diff --git a/src/modules/app_python/python_support.h b/src/modules/app_python/python_support.h index 032340dcdd..4d25564119 100644 --- a/src/modules/app_python/python_support.h +++ b/src/modules/app_python/python_support.h @@ -28,7 +28,6 @@ PyObject *format_exc_obj; void python_handle_exception(const char *, ...); -char *make_message(const char *fmt, ...); PyObject *InitTracebackModule(void); char *get_class_name(PyObject *);

6 years, 2 months

git:master:9831bba7: app_python3: code cleanup

by AnthonyA

Module: kamailio Branch: master Commit: 9831bba76bbdde62513c6b7f2c35e6cfe5a5a566 URL: https://github.com/kamailio/kamailio/commit/9831bba76bbdde62513c6b7f2c35e6c… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T21:32:02+08:00 app_python3: code cleanup --- Modified: src/modules/app_python3/app_python_mod.c Modified: src/modules/app_python3/apy_kemi.c Modified: src/modules/app_python3/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/9831bba76bbdde62513c6b7f2c35e6c… Patch: https://github.com/kamailio/kamailio/commit/9831bba76bbdde62513c6b7f2c35e6c…

6 years, 2 months

git:master:045d4476: core: check return of dlsym() before dlerror() handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 045d44762ce7cd267e64849c1c138d45b1fa040f URL: https://github.com/kamailio/kamailio/commit/045d44762ce7cd267e64849c1c138d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-03T07:39:45+01:00 core: check return of dlsym() before dlerror() handling - cope with the case when dlerror is not reset by dlsym - related to GH #1465 --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/045d44762ce7cd267e64849c1c138d4… Patch: https://github.com/kamailio/kamailio/commit/045d44762ce7cd267e64849c1c138d4… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 594f3d6af8..8a195fc12d 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -630,11 +630,14 @@ int load_module(char* mod_path) if(expref.len>3 && strcmp(expref.s+expref.len-3, ".so")==0) expref.len -= 3; snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); - exp = (union module_exports_u*)dlsym(handle, exbuf); LM_DBG("looking up exports with name: %s\n", exbuf); - if ( (error =(char*)dlerror())!=0 ){ - LM_ERR("%s\n", error); - goto error1; + exp = (union module_exports_u*)dlsym(handle, exbuf); + if(exp==NULL) { + if ( (error =(char*)dlerror())!=0 ){ + LM_ERR("failure for exports symbol: %s - dlerror: %s\n", + exbuf, error); + goto error1; + } } } /* hack to allow for kamailio style dlflags inside exports */

6 years, 2 months

git:master:310c60cb: app_python: don't hide the real exception on load failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 310c60cb34641f73ac0e8b48c9bf68efa5fb3533 URL: https://github.com/kamailio/kamailio/commit/310c60cb34641f73ac0e8b48c9bf68e… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T21:00:00+01:00 app_python: don't hide the real exception on load failure - don't call PyErr_PrintEx() as this clears the error indicator --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/310c60cb34641f73ac0e8b48c9bf68e… Patch: https://github.com/kamailio/kamailio/commit/310c60cb34641f73ac0e8b48c9bf68e… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 78cee45c66..98738ee66c 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -287,7 +287,7 @@ int apy_reload_script(void) PY_GIL_ENSURE; pModule = PyImport_ReloadModule(_sr_apy_module); if (!pModule) { - PyErr_PrintEx(0); + // 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");

6 years, 2 months

[kamailio/kamailio] app_python: don't hide the real exception on load failure (#1471)

by aalba6675

#### 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  Calling PyErr_Print() clears the error indicator and hides the real cause of failing to load the module as the output is lost (module has no stderr). The error should be left to python_handle_exception() to display via LM_ERR. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1471 -- Commit Summary -- * app_python: don't hide the real exception on load failure -- File Changes -- M src/modules/app_python/app_python_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1471.patch https://github.com/kamailio/kamailio/pull/1471.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/1471

6 years, 2 months

git:master:829941d0: app_python3: don't hide the real exception on load failure

by AnthonyA

Module: kamailio Branch: master Commit: 829941d0079cb7f46a20ec975252790fd17019ba URL: https://github.com/kamailio/kamailio/commit/829941d0079cb7f46a20ec975252790… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T01:02:48+08:00 app_python3: don't hide the real exception on load failure - don't call PyErr_PrintEx() as this clears the error indicator --- Modified: src/modules/app_python3/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/829941d0079cb7f46a20ec975252790… Patch: https://github.com/kamailio/kamailio/commit/829941d0079cb7f46a20ec975252790… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python_mod.c index e851b105d7..06d7a9d6f2 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python_mod.c @@ -300,7 +300,6 @@ int apy_reload_script(void) PY_GIL_ENSURE PyObject *pModule = PyImport_ReloadModule(_sr_apy_module); if (!pModule) { - PyErr_PrintEx(0); if (!PyErr_Occurred()) PyErr_Format(PyExc_ImportError, "Reload module '%s'", bname); python_handle_exception("mod_init"); @@ -408,7 +407,6 @@ int apy_load_script(void) pModule = PyImport_ImportModule(bname); if (pModule == NULL) { - PyErr_PrintEx(0); if (!PyErr_Occurred()) PyErr_Format(PyExc_ImportError, "No module named '%s'", bname); python_handle_exception("mod_init");

6 years, 2 months

git:5.1:4c840b7e: kamctl: fixed the name of rpc command for dialplan reload

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 4c840b7e9144e0540e97be5c9d3444b38a901a27 URL: https://github.com/kamailio/kamailio/commit/4c840b7e9144e0540e97be5c9d3444b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T16:19:12+01:00 kamctl: fixed the name of rpc command for dialplan reload (cherry picked from commit 9b7bb4ea6c100f5f33d2dddc9061febf33c47f5e) --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/4c840b7e9144e0540e97be5c9d3444b… Patch: https://github.com/kamailio/kamailio/commit/4c840b7e9144e0540e97be5c9d3444b… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index f82f6f540a..05505a7648 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1902,7 +1902,7 @@ dialplan() { ;; reload) - ctl_cmd_run dp_reload dp.reload + ctl_cmd_run dp_reload dialplan.reload ;; *)

6 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018