sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

git:master:e5f6e835: core: async task - handle return code for fcntl(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e5f6e83557a73c0597ddac8f2f23d99631339657 URL: https://github.com/kamailio/kamailio/commit/e5f6e83557a73c0597ddac8f2f23d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-03T12:29:18+02:00 core: async task - handle return code for fcntl(...) --- Modified: src/core/async_task.c --- Diff: https://github.com/kamailio/kamailio/commit/e5f6e83557a73c0597ddac8f2f23d99… Patch: https://github.com/kamailio/kamailio/commit/e5f6e83557a73c0597ddac8f2f23d99… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index a6b9d4ef8d..870241b0d3 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -75,13 +75,23 @@ int async_task_workers_active(void) */ int async_task_init_sockets(void) { + int val; + if (socketpair(PF_UNIX, SOCK_DGRAM, 0, _async_task_sockets) < 0) { LM_ERR("opening tasks dgram socket pair\n"); return -1; } - if (_async_nonblock) - fcntl(_async_task_sockets[1], F_SETFL, fcntl(_async_task_sockets[1], F_GETFL, 0) | O_NONBLOCK); + if (_async_nonblock) { + val = fcntl(_async_task_sockets[1], F_GETFL, 0); + if(val<0) { + LM_WARN("failed to get socket flags\n"); + } else { + if(fcntl(_async_task_sockets[1], F_SETFL, val | O_NONBLOCK)<0) { + LM_WARN("failed to set socket nonblock flag\n"); + } + } + } LM_DBG("inter-process event notification sockets initialized\n"); return 0;

5 years, 7 months

git:master:9d6356a4: kex: proper range for array access of reply stats per code class

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9d6356a4dfe4d455958208face87616126ca49f3 URL: https://github.com/kamailio/kamailio/commit/9d6356a4dfe4d455958208face87616… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-03T12:29:18+02:00 kex: proper range for array access of reply stats per code class --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/9d6356a4dfe4d455958208face87616… Patch: https://github.com/kamailio/kamailio/commit/9d6356a4dfe4d455958208face87616… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 5d2bcc13a1..2f51a1f955 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -237,7 +237,7 @@ static int km_cb_rpl_stats_by_method(struct sip_msg *msg, int method = get_cseq(msg)->method_id; int group = msg->first_line.u.reply.statuscode / 100 - 1; - if (group >= 1 && group <= 6) { + if (group >= 0 && group <= 5) { switch(method) { case METHOD_INVITE: update_stat( VAR_NAME(invite)[group], 1); break; case METHOD_CANCEL: update_stat( VAR_NAME(cancel)[group], 1); break;

5 years, 7 months

[kamailio/kamailio] sipcapture: initialize variable (#1664)

by Mikko Lehto

#### 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) #### Checklist: - [✓] PR should be backported to stable branches - [✓] Tested changes locally #### Description After enabling clang -Wall on, this warning showed up: > sipcapture.c:2580:5: warning: variable 'corrtmp' is used uninitialized whenever 'if' condition is false > [-Wsometimes-uninitialized] > if(correlation_id) { > ^~~~~~~~~~~~~~ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1664 -- Commit Summary -- * sipcapture: initialize variable -- File Changes -- M src/modules/sipcapture/sipcapture.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1664.patch https://github.com/kamailio/kamailio/pull/1664.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/1664

5 years, 7 months

git:master:522c338a: Merge pull request #1664 from mslehto/Wsometimes_uninitialized

by GitHub

Module: kamailio Branch: master Commit: 522c338abff05634b6eff2a50e2827abf748902c URL: https://github.com/kamailio/kamailio/commit/522c338abff05634b6eff2a50e2827a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-03T09:16:15+02:00 Merge pull request #1664 from mslehto/Wsometimes_uninitialized sipcapture: initialize variable --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/522c338abff05634b6eff2a50e2827a… Patch: https://github.com/kamailio/kamailio/commit/522c338abff05634b6eff2a50e2827a… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index bb3332b26f..327e4e110f 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2499,7 +2499,8 @@ int receive_logging_json_msg(char *buf, unsigned int len, struct timezone tz; time_t epoch_time_as_time_t; - str tmp, corrtmp, table; + str tmp, table; + str corrtmp = STR_NULL; _capture_mode_data_t *c = NULL; c = capture_def;

5 years, 7 months

git:master:a0db2cb0: sipcapture: initialize variable

by Mikko Lehto

Module: kamailio Branch: master Commit: a0db2cb021e45fe56f8b54121efa31bf071c8709 URL: https://github.com/kamailio/kamailio/commit/a0db2cb021e45fe56f8b54121efa31b… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-10-02T16:14:48+03:00 sipcapture: initialize variable > sipcapture.c:2580:5: warning: variable 'corrtmp' is used uninitialized whenever 'if' condition is false > [-Wsometimes-uninitialized] > if(correlation_id) { > ^~~~~~~~~~~~~~ --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/a0db2cb021e45fe56f8b54121efa31b… Patch: https://github.com/kamailio/kamailio/commit/a0db2cb021e45fe56f8b54121efa31b… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index bb3332b26f..327e4e110f 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2499,7 +2499,8 @@ int receive_logging_json_msg(char *buf, unsigned int len, struct timezone tz; time_t epoch_time_as_time_t; - str tmp, corrtmp, table; + str tmp, table; + str corrtmp = STR_NULL; _capture_mode_data_t *c = NULL; c = capture_def;

5 years, 7 months

git:master:6c15fc82: pkg/kamailio/deb: version set 5.2.0~dev8 [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 6c15fc825da9e3b943ac3513219f4f6529ea8efc URL: https://github.com/kamailio/kamailio/commit/6c15fc825da9e3b943ac3513219f4f6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-10-02T16:14:39+02:00 pkg/kamailio/deb: version set 5.2.0~dev8 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6c15fc825da9e3b943ac3513219f4f6… Patch: https://github.com/kamailio/kamailio/commit/6c15fc825da9e3b943ac3513219f4f6…

5 years, 7 months

git:5.1:1252ae25: Makefile.defs: enabled clang compile warning flags -Wunused-variable -Wuninitialized

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 1252ae2523d16edda0465cfb441eaedd2de62d27 URL: https://github.com/kamailio/kamailio/commit/1252ae2523d16edda0465cfb441eaed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-02T16:06:14+02:00 Makefile.defs: enabled clang compile warning flags -Wunused-variable -Wuninitialized (cherry picked from commit d63548dc311df5f2550e788fc026d9ec7c7dd2f4) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1252ae2523d16edda0465cfb441eaed… Patch: https://github.com/kamailio/kamailio/commit/1252ae2523d16edda0465cfb441eaed… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 6cf372786d..697252b0be 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1707,9 +1707,9 @@ else # no gcc ifeq ($(CC_NAME), icc) CFLAGS+= -Wall else # no icc -ifeq ($(CC_NAME), suncc) - # FIXME: is the default (-Xa ?) enough? -endif # CC_NAME=suncc +ifeq ($(CC_NAME), clang) + CFLAGS+= -Wunused-variable -Wuninitialized +endif # CC_NAME=clang endif # CC_NAME=icc endif # CC_NAME=gcc

5 years, 7 months

git:5.1:275ff956: tm: macro to define the ptr address for tm cell uac field

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 275ff956e460af769cb4f659a21162317e653695 URL: https://github.com/kamailio/kamailio/commit/275ff956e460af769cb4f659a211623… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-02T16:05:47+02:00 tm: macro to define the ptr address for tm cell uac field (cherry picked from commit cb984a53016762cb0932ed4dec4c75edb8997c0f) --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/275ff956e460af769cb4f659a211623… Patch: https://github.com/kamailio/kamailio/commit/275ff956e460af769cb4f659a211623… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index d4c86db9b5..4ca611e6ab 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -48,6 +48,10 @@ #include "uac.h" /* free_local_ack */ +#define T_UAC_PTR(T) ((tm_ua_client_t*)((char*)T + sizeof(tm_cell_t) \ + + MD5_LEN - sizeof(((tm_cell_t*)0)->md5))) + + static enum kill_reason kr; /* pointer to the big table where all the transaction data lives */ @@ -337,9 +341,7 @@ struct cell *build_cell(struct sip_msg *p_msg) new_cell->uas.response.my_T = new_cell; init_rb_timers(&new_cell->uas.response); /* UAC */ - new_cell->uac = - (struct ua_client *)((char *)new_cell + sizeof(struct cell) - + MD5_LEN - sizeof(((struct cell *)0)->md5)); + new_cell->uac = T_UAC_PTR(new_cell); /* timers */ init_cell_timers(new_cell);

5 years, 7 months

git:5.1:8ce74832: tm: safty checks when destroying the tm cell

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 8ce748329be28b2a0f86f7711b03cdb696ee76d0 URL: https://github.com/kamailio/kamailio/commit/8ce748329be28b2a0f86f7711b03cdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-02T16:06:05+02:00 tm: safty checks when destroying the tm cell (cherry picked from commit afb7ef77faab405a4da0c7f601f35358a1130238) --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/8ce748329be28b2a0f86f7711b03cdb… Patch: https://github.com/kamailio/kamailio/commit/8ce748329be28b2a0f86f7711b03cdb… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 4ca611e6ab..4b1f0233f7 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -132,6 +132,10 @@ void free_cell_helper( LM_DBG("freeing transaction %p from %s:%u\n", dead_cell, fname, fline); + if(dead_cell==NULL) { + return; + } + if(dead_cell->prev_c != NULL && dead_cell->next_c != NULL) { if(likely(silent == 0)) { LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", @@ -153,6 +157,10 @@ void free_cell_helper( if(dead_cell->fcount!=1) { LM_WARN("unexpected fcount value: %d\n", dead_cell->fcount); } + if(dead_cell->uac==NULL || dead_cell->uac!=T_UAC_PTR(dead_cell)) { + LM_WARN("unexpected tm cell content: %p\n", dead_cell); + return; + } if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0);

5 years, 7 months

git:5.1:837dc3e0: tm: reset the tm cell content during free

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 837dc3e07fb71e217706f6233f6d789256dd7dd6 URL: https://github.com/kamailio/kamailio/commit/837dc3e07fb71e217706f6233f6d789… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-02T16:05:30+02:00 tm: reset the tm cell content during free (cherry picked from commit fe19995ba150beca0acf6f4bdc1bb92f3c8348e1) --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/837dc3e07fb71e217706f6233f6d789… Patch: https://github.com/kamailio/kamailio/commit/837dc3e07fb71e217706f6233f6d789… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 1ec5747207..d4c86db9b5 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -253,6 +253,7 @@ void free_cell_helper( xavp_destroy_list_unsafe(&dead_cell->xavps_list); #endif + memset(dead_cell, 0, sizeof(tm_cell_t)); /* the cell's body */ shm_free_unsafe(dead_cell);

5 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018