sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:cd17ca91: xlog: free vars in case of errors in fixup functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd17ca9113031b979fe403255388105ecee0fe73 URL: https://github.com/kamailio/kamailio/commit/cd17ca9113031b979fe403255388105… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-10T17:08:33+02:00 xlog: free vars in case of errors in fixup functions --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/cd17ca9113031b979fe403255388105… Patch: https://github.com/kamailio/kamailio/commit/cd17ca9113031b979fe403255388105… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index e62b432299..1368aa75ff 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @@ -116,7 +116,7 @@ static void destroy(void); static int xlog_log_colors_param(modparam_t type, void *val); int pv_parse_color_name(pv_spec_p sp, str *in); -static int pv_get_color(struct sip_msg *msg, pv_param_t *param, +static int pv_get_color(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); typedef struct _xl_level @@ -233,7 +233,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, /* if facility is not explicitely defined use the xlog default facility */ if (facility==NOFACILITY) { facility = xlog_facility; - } + } if(line>0) if(long_format==1) @@ -282,7 +282,7 @@ static int xlog_2_helper(struct sip_msg* msg, char* lev, char* frm, int mode, in xlp = (xl_level_p)lev; if(xlp->type==1) { - if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 + if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 || value.flags&PV_VAL_NULL || !(value.flags&PV_VAL_INT)) { LM_ERR("invalid log level value [%d]\n", value.flags); @@ -354,7 +354,7 @@ static int xlog_3_helper(struct sip_msg* msg, char* fac, char* lev, char* frm, i xlp = (xl_level_p)lev; if(xlp->type==1) { - if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 + if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 || value.flags&PV_VAL_NULL || !(value.flags&PV_VAL_INT)) { LM_ERR("invalid log level value [%d]\n", value.flags); @@ -511,6 +511,7 @@ static int xdbg_fixup_helper(void** param, int param_no, int mode) if(pv_parse_format(&s, &xm->m)<0) { LM_ERR("wrong format[%s]\n", (char*)(*param)); + pkg_free(xm); return E_UNSPEC; } *param = (void*)xm; @@ -521,7 +522,7 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) { xl_level_p xlp; str s; - + if(param_no==1) { s.s = (char*)(*param); @@ -545,6 +546,7 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) if(pv_parse_spec(&s, &xlp->v.sp)==NULL) { LM_ERR("invalid level param\n"); + pkg_free(xlp); return E_UNSPEC; } } else { @@ -561,10 +563,10 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) case 'D': xlp->v.level = L_DBG; break; default: LM_ERR("unknown log level\n"); + pkg_free(xlp); return E_UNSPEC; } } - pkg_free(*param); *param = (void*)xlp; return 0; } @@ -696,7 +698,7 @@ int pv_parse_color_name(pv_spec_p sp, str *in) LM_ERR("color name must have two chars\n"); return -1; } - + /* foreground */ switch(in->s[0]) { @@ -708,10 +710,10 @@ int pv_parse_color_name(pv_spec_p sp, str *in) case 'B': case 'P': case 'C': case 'W': break; - default: + default: goto error; } - + /* background */ switch(in->s[1]) { @@ -719,11 +721,11 @@ int pv_parse_color_name(pv_spec_p sp, str *in) case 's': case 'r': case 'g': case 'y': case 'b': case 'p': case 'c': case 'w': - break; - default: + break; + default: goto error; } - + sp->pvp.pvn.type = PV_NAME_INTSTR; sp->pvp.pvn.u.isname.type = AVP_NAME_STR; sp->pvp.pvn.u.isname.name.s = *in; @@ -813,7 +815,7 @@ static int xlog_log_colors_param(modparam_t type, void *val) pit->name.len, pit->name.s); goto error; } - + if(pit->body.len!=2) { LM_ERR("invalid color spec for level %.*s (%.*s)\n", pit->name.len, pit->name.s,

7 years, 5 months

deb nightly-builds not being built

by Victor Seva

We are having some issues with our building infrastructure so packages are not being built. We are working on it, please be patient. Cheers, Victor

7 years, 5 months

git:master:b5af70a2: tm: several checks for return codes for better error handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b5af70a2b464cae1058ec53bb8dbea5ca07e6d4e URL: https://github.com/kamailio/kamailio/commit/b5af70a2b464cae1058ec53bb8dbea5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-10T11:28:10+02:00 tm: several checks for return codes for better error handling --- Modified: src/modules/tm/t_fifo.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_serial.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/b5af70a2b464cae1058ec53bb8dbea5… Patch: https://github.com/kamailio/kamailio/commit/b5af70a2b464cae1058ec53bb8dbea5…

7 years, 5 months

git:master:23ee80c8: evapi: close server socket if fnctl() fails

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 23ee80c8d71b9bac63ebe6117620cffc8900c2a9 URL: https://github.com/kamailio/kamailio/commit/23ee80c8d71b9bac63ebe6117620cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-10T11:28:10+02:00 evapi: close server socket if fnctl() fails --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/23ee80c8d71b9bac63ebe6117620cff… Patch: https://github.com/kamailio/kamailio/commit/23ee80c8d71b9bac63ebe6117620cff… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index aa07a8eb4b..04eab30e50 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -623,10 +623,12 @@ int evapi_run_dispatcher(char *laddr, int lport) fflags = fcntl(evapi_srv_sock, F_GETFL); if(fflags<0) { LM_ERR("failed to get the srv socket flags\n"); + close(evapi_srv_sock); return -1; } if (fcntl(evapi_srv_sock, F_SETFL, fflags | O_NONBLOCK)<0) { LM_ERR("failed to set srv socket flags\n"); + close(evapi_srv_sock); return -1; }

7 years, 5 months

TOPOS: Minor issue

by Carsten Bock

Hi, i've noticed the following detail with the TOPOS module: I wanted to use topos with a database backend. I accidentally misconfigured my Kamailio by setting a database url and the storage type to "redis" without loading the topos_redis module, e.g.: modparam("topos", "db_url", DB_URL) [...] a few lines below.... so I missed that line: modparam("topos", "storage", "redis") This resulted in the DB-Connection not being initialized and in a crash without proper error message. While I can circumvent the crash by a safety check (which I just added), I wonder if it would be nicer, if Kamailio would not start at all in this case of misconfiguration? Just a thought..... Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

7 years, 5 months

git:master:95fd884f: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 95fd884f3096ef5e72f98c3cb89939b75ee7232e URL: https://github.com/kamailio/kamailio/commit/95fd884f3096ef5e72f98c3cb89939b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-10T10:01:37+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/95fd884f3096ef5e72f98c3cb89939b… Patch: https://github.com/kamailio/kamailio/commit/95fd884f3096ef5e72f98c3cb89939b…

7 years, 5 months

git:master:05b31ddb: topos: Safety check for database storage

by Carsten Bock

Module: kamailio Branch: master Commit: 05b31ddbfad71cae5c4cab24b57b1d606c74a7c8 URL: https://github.com/kamailio/kamailio/commit/05b31ddbfad71cae5c4cab24b57b1d6… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-10T09:57:20+02:00 topos: Safety check for database storage --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/05b31ddbfad71cae5c4cab24b57b1d6… Patch: https://github.com/kamailio/kamailio/commit/05b31ddbfad71cae5c4cab24b57b1d6… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 814593880e..9e2285dda9 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -448,6 +448,11 @@ int tps_db_insert_dialog(tps_data_t *td) db_val_t db_vals[TPS_NR_KEYS]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + goto error; + } + memset(db_keys, 0, TPS_NR_KEYS*sizeof(db_key_t)); memset(db_vals, 0, TPS_NR_KEYS*sizeof(db_val_t)); nr_keys = 0; @@ -583,6 +588,11 @@ int tps_db_clean_dialogs(void) db_op_t db_ops[2]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + return -1; + } + nr_keys = 0; LM_DBG("cleaning expired dialog records\n"); @@ -629,6 +639,11 @@ int tps_db_insert_branch(tps_data_t *td) db_val_t db_vals[TPS_NR_KEYS]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + goto error; + } + memset(db_keys, 0, TPS_NR_KEYS*sizeof(db_key_t)); memset(db_vals, 0, TPS_NR_KEYS*sizeof(db_val_t)); nr_keys = 0; @@ -730,6 +745,11 @@ int tps_db_clean_branches(void) db_op_t db_ops[2]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + return -1; + } + nr_keys = 0; LM_DBG("cleaning expired branch records\n");

7 years, 5 months

git:master:3868a27b: topos: Add missing doc for storage parameter

by Carsten Bock

Module: kamailio Branch: master Commit: 3868a27b7358c9a98ed2c240deb41e9ce524b8f5 URL: https://github.com/kamailio/kamailio/commit/3868a27b7358c9a98ed2c240deb41e9… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-10T09:56:07+02:00 topos: Add missing doc for storage parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3868a27b7358c9a98ed2c240deb41e9… Patch: https://github.com/kamailio/kamailio/commit/3868a27b7358c9a98ed2c240deb41e9… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b465713985..77de4b8cbd 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -68,6 +68,37 @@ </section> <section> <title>Parameters</title> + <section id="topos.p.storage"> + <title><varname>storage</varname> (str)</title> + <para> + Type of storage, valid types are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>db</emphasis> - Database Backend + </para> + </listitem> + <listitem> + <para> + <emphasis>redis</emphasis> - Redis Backend + </para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>db</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>storage</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "storage", "redis") +... +</programlisting> + </example> + </section> <section id="topos.p.db_url"> <title><varname>db_url</varname> (str)</title> <para>

7 years, 5 months

git:master:56f6efc1: topos_redis: Fix Typo in error-message

by Carsten Bock

Module: kamailio Branch: master Commit: 56f6efc176b0c2a1a69754c55a50b1a5661f7b95 URL: https://github.com/kamailio/kamailio/commit/56f6efc176b0c2a1a69754c55a50b1a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-10T09:54:08+02:00 topos_redis: Fix Typo in error-message --- Modified: src/modules/topos_redis/topos_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56f6efc176b0c2a1a69754c55a50b1a… Patch: https://github.com/kamailio/kamailio/commit/56f6efc176b0c2a1a69754c55a50b1a… --- diff --git a/src/modules/topos_redis/topos_redis_mod.c b/src/modules/topos_redis/topos_redis_mod.c index 0fdef7882c..08b7ceda45 100644 --- a/src/modules/topos_redis/topos_redis_mod.c +++ b/src/modules/topos_redis/topos_redis_mod.c @@ -101,7 +101,7 @@ static int mod_init(void) _tps_storage_api.end_dialog = tps_redis_end_dialog; if(_tps_api.set_storage_api(&_tps_storage_api)<0) { - LM_ERR("failed to set topos storae api\n"); + LM_ERR("failed to set topos storage api\n"); return -1; } return 0;

7 years, 5 months

git:master:c0125e04: evapi: handle return code for fcntl

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c0125e049f1c34afe7411f763f9f57c7a00109a8 URL: https://github.com/kamailio/kamailio/commit/c0125e049f1c34afe7411f763f9f57c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-09T10:21:20+02:00 evapi: handle return code for fcntl --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c0125e049f1c34afe7411f763f9f57c… Patch: https://github.com/kamailio/kamailio/commit/c0125e049f1c34afe7411f763f9f57c… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 5429d6913b..aa07a8eb4b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -591,6 +591,7 @@ int evapi_run_dispatcher(char *laddr, int lport) struct ev_io io_server; struct ev_io io_notify; int yes_true = 1; + int fflags = 0; LM_DBG("starting dispatcher processing\n"); @@ -619,7 +620,15 @@ int evapi_run_dispatcher(char *laddr, int lport) return -1; } /* set non-blocking flag */ - fcntl(evapi_srv_sock, F_SETFL, fcntl(evapi_srv_sock, F_GETFL) | O_NONBLOCK); + fflags = fcntl(evapi_srv_sock, F_GETFL); + if(fflags<0) { + LM_ERR("failed to get the srv socket flags\n"); + return -1; + } + if (fcntl(evapi_srv_sock, F_SETFL, fflags | O_NONBLOCK)<0) { + LM_ERR("failed to set srv socket flags\n"); + return -1; + } bzero(&evapi_srv_addr, sizeof(evapi_srv_addr)); evapi_srv_addr.sin_family = h->h_addrtype;

7 years, 5 months

← Newer
1
...
31
32
33
34
35
36
37
...
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