sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
296 discussions

git:4.3:df2dab4c: carrierroute: fixed possible kamctl fifo segfault
by Lucian Balaceanu 19 Jan '16

19 Jan '16

Module: kamailio Branch: 4.3 Commit: df2dab4c7cc970cd449772e84ac1645070067336 URL: https://github.com/kamailio/kamailio/commit/df2dab4c7cc970cd449772e84ac1645… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-01-19T13:35:13+02:00 carrierroute: fixed possible kamctl fifo segfault - introduced checks to reject contiguous -{OPTION}{PARAMETER} in kamctl fifo commands e.g.: kamctl fifo cr_activate_host "-dproxy -p 49 -h proxy1" is not allowed --- Modified: modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/df2dab4c7cc970cd449772e84ac1645… Patch: https://github.com/kamailio/kamailio/commit/df2dab4c7cc970cd449772e84ac1645… --- diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index 0455ba8..6cb6e55 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -490,7 +490,15 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { LM_DBG("token %.*s", opt_argv[i].len, opt_argv[i].s); if (opt_argv[i].len >= 1) { switch(*opt_argv[i].s) { - case '-': switch(opt_argv[i].s[1]) { + case '-': + /* -{OPTION}{PARAMETER} is not allowed */ + if (opt_argv[i].len != 2) { + FIFO_ERR(E_WRONGOPT); + LM_DBG("Unknown option: %.*s\n", opt_argv[i].len, opt_argv[i].s); + return -1; + } + + switch(opt_argv[i].s[1]) { case OPT_DOMAIN_CHR: op = OPT_DOMAIN; used_opts |= O_DOMAIN;

1 0

git:4.2:7b2208df: carrierroute: fixed possible kamctl fifo segfault
by Lucian Balaceanu 19 Jan '16

19 Jan '16

Module: kamailio Branch: 4.2 Commit: 7b2208dfb33e84e24ae33124218273cdd4ec1d5d URL: https://github.com/kamailio/kamailio/commit/7b2208dfb33e84e24ae33124218273c… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-01-19T13:33:41+02:00 carrierroute: fixed possible kamctl fifo segfault - introduced checks to reject contiguous -{OPTION}{PARAMETER} in kamctl fifo commands e.g.: kamctl fifo cr_activate_host "-dproxy -p 49 -h proxy1" is not allowed --- Modified: modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/7b2208dfb33e84e24ae33124218273c… Patch: https://github.com/kamailio/kamailio/commit/7b2208dfb33e84e24ae33124218273c… --- diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index 0455ba8..6cb6e55 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -490,7 +490,15 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { LM_DBG("token %.*s", opt_argv[i].len, opt_argv[i].s); if (opt_argv[i].len >= 1) { switch(*opt_argv[i].s) { - case '-': switch(opt_argv[i].s[1]) { + case '-': + /* -{OPTION}{PARAMETER} is not allowed */ + if (opt_argv[i].len != 2) { + FIFO_ERR(E_WRONGOPT); + LM_DBG("Unknown option: %.*s\n", opt_argv[i].len, opt_argv[i].s); + return -1; + } + + switch(opt_argv[i].s[1]) { case OPT_DOMAIN_CHR: op = OPT_DOMAIN; used_opts |= O_DOMAIN;

1 0

git:4.1:2fc778f3: carrierroute: fixed possible kamctl fifo segfault
by Lucian Balaceanu 19 Jan '16

19 Jan '16

Module: kamailio Branch: 4.1 Commit: 2fc778f350b85fce9ba582ccf5d396d7962b2d0b URL: https://github.com/kamailio/kamailio/commit/2fc778f350b85fce9ba582ccf5d396d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-01-19T13:22:58+02:00 carrierroute: fixed possible kamctl fifo segfault - introduced checks to reject contiguous -{OPTION}{PARAMETER} in kamctl fifo commands e.g.: kamctl fifo cr_activate_host "-dproxy -p 49 -h proxy1" is not allowed --- Modified: modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/2fc778f350b85fce9ba582ccf5d396d… Patch: https://github.com/kamailio/kamailio/commit/2fc778f350b85fce9ba582ccf5d396d… --- diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index c323b8f..fdf9ce2 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -490,7 +490,15 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { LM_DBG("token %.*s", opt_argv[i].len, opt_argv[i].s); if (opt_argv[i].len >= 1) { switch(*opt_argv[i].s) { - case '-': switch(opt_argv[i].s[1]) { + case '-': + /* -{OPTION}{PARAMETER} is not allowed */ + if (opt_argv[i].len != 2) { + FIFO_ERR(E_WRONGOPT); + LM_DBG("Unknown option: %.*s\n", opt_argv[i].len, opt_argv[i].s); + return -1; + } + + switch(opt_argv[i].s[1]) { case OPT_DOMAIN_CHR: op = OPT_DOMAIN; used_opts |= O_DOMAIN;

1 0

git:master:a86fa8f9: carrierroute: fixed possible kamctl fifo segfault
by Lucian Balaceanu 19 Jan '16

19 Jan '16

Module: kamailio Branch: master Commit: a86fa8f9c9d2a9f63732b43b1087e6cc5cba18fb URL: https://github.com/kamailio/kamailio/commit/a86fa8f9c9d2a9f63732b43b1087e6c… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-01-19T11:09:59+02:00 carrierroute: fixed possible kamctl fifo segfault - introduced checks to reject contiguous -{OPTION}{PARAMETER} in kamctl fifo commands e.g.: kamctl fifo cr_activate_host "-dproxy -p 49 -h proxy1" is not allowed --- Modified: modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/a86fa8f9c9d2a9f63732b43b1087e6c… Patch: https://github.com/kamailio/kamailio/commit/a86fa8f9c9d2a9f63732b43b1087e6c… --- diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index 0455ba8..6cb6e55 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -490,7 +490,15 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { LM_DBG("token %.*s", opt_argv[i].len, opt_argv[i].s); if (opt_argv[i].len >= 1) { switch(*opt_argv[i].s) { - case '-': switch(opt_argv[i].s[1]) { + case '-': + /* -{OPTION}{PARAMETER} is not allowed */ + if (opt_argv[i].len != 2) { + FIFO_ERR(E_WRONGOPT); + LM_DBG("Unknown option: %.*s\n", opt_argv[i].len, opt_argv[i].s); + return -1; + } + + switch(opt_argv[i].s[1]) { case OPT_DOMAIN_CHR: op = OPT_DOMAIN; used_opts |= O_DOMAIN;

1 0

git:4.3:7fc18d15: tm: reinit ref counter if attempting to free while still in wait timer
by Daniel-Constantin Mierla 19 Jan '16

19 Jan '16

Module: kamailio Branch: 4.3 Commit: 7fc18d15ce0cdcaf47127e5ef96a28a239ed4104 URL: https://github.com/kamailio/kamailio/commit/7fc18d15ce0cdcaf47127e5ef96a28a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-19T09:59:09+01:00 tm: reinit ref counter if attempting to free while still in wait timer (cherry picked from commit c7e411edb3c68260d43f86ee6977d468c074836b) --- Modified: modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/7fc18d15ce0cdcaf47127e5ef96a28a… Patch: https://github.com/kamailio/kamailio/commit/7fc18d15ce0cdcaf47127e5ef96a28a… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index ea38de0..d492665 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -131,6 +131,7 @@ void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsig LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", dead_cell, fname, fline); if(t_on_wait(dead_cell)) { + INIT_REF(dead_cell, 1); LM_WARN("cell %p is still linked in wait timer (%s:%u)" " - skip freeing now\n", dead_cell, fname, fline); return;

1 0

git:4.3:384c0ce0: tm: don't free tm cell still linked in wait timer
by Daniel-Constantin Mierla 19 Jan '16

19 Jan '16

Module: kamailio Branch: 4.3 Commit: 384c0ce0728ce83023b50c0ea4748bfa6232a9b4 URL: https://github.com/kamailio/kamailio/commit/384c0ce0728ce83023b50c0ea4748bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-19T09:58:49+01:00 tm: don't free tm cell still linked in wait timer - wait timer should do the free - friendlier handling of situation when modules binding to tm do inconsistent unref operations (cherry picked from commit d83a56bcdfeb8ffc75166a62e11ceb4c057c3ce5) --- Modified: modules/tm/h_table.c Modified: modules/tm/t_funcs.c Modified: modules/tm/t_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/384c0ce0728ce83023b50c0ea4748bf… Patch: https://github.com/kamailio/kamailio/commit/384c0ce0728ce83023b50c0ea4748bf… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 105230c..ea38de0 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -40,6 +40,7 @@ #include "t_reply.h" #include "t_cancel.h" #include "t_stats.h" +#include "t_funcs.h" #include "h_table.h" #include "../../fix_lumps.h" /* free_via_clen_lump */ #include "timer.h" @@ -129,6 +130,11 @@ void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsig if(likely(silent==0)) { LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", dead_cell, fname, fline); + if(t_on_wait(dead_cell)) { + LM_WARN("cell %p is still linked in wait timer (%s:%u)" + " - skip freeing now\n", dead_cell, fname, fline); + return; + } } unlink_timers(dead_cell); remove_from_hash_table_unsafe(dead_cell); diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index cec58e0..e498713 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -150,6 +150,12 @@ void put_on_wait( struct cell *Trans ) } +int t_on_wait(tm_cell_t *Trans) +{ + if(Trans->wait_timer.prev!=NULL || Trans->wait_timer.next!=NULL) + return 1; + return 0; +} /* WARNING: doesn't work from failure route (deadlock, uses t_reply => * tries to get the reply lock again) */ diff --git a/modules/tm/t_funcs.h b/modules/tm/t_funcs.h index 173851b..b7b653e 100644 --- a/modules/tm/t_funcs.h +++ b/modules/tm/t_funcs.h @@ -190,6 +190,7 @@ int get_ip_and_port_from_uri( str* uri , unsigned int *param_ip, void put_on_wait( struct cell *Trans ); +int t_on_wait(tm_cell_t *Trans); int t_relay_to( struct sip_msg *p_msg ,

1 0

git:4.3:beb0a653: tm: silent mode when freeing transactions at shutdown
by Daniel-Constantin Mierla 19 Jan '16

19 Jan '16

Module: kamailio Branch: 4.3 Commit: beb0a65386d0d56e3d5c876b55cd08d3b54985df URL: https://github.com/kamailio/kamailio/commit/beb0a65386d0d56e3d5c876b55cd08d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-19T09:58:31+01:00 tm: silent mode when freeing transactions at shutdown - they are still linked in tm hash table as it should be, so no warn message for that case (cherry picked from commit 27495c7c34bf963e403c0f711daf9b76076d2ec3) --- Modified: modules/tm/h_table.c Modified: modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/beb0a65386d0d56e3d5c876b55cd08d… Patch: https://github.com/kamailio/kamailio/commit/beb0a65386d0d56e3d5c876b55cd08d… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 5aee155..105230c 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -115,7 +115,7 @@ unsigned int transaction_count( void ) -void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int fline ) +void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsigned int fline ) { char *b; int i; @@ -126,8 +126,10 @@ void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int f LM_DBG("freeing transaction %p from %s:%u\n", dead_cell, fname, fline); if(dead_cell->prev_c!=NULL && dead_cell->next_c!=NULL) { - LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", + if(likely(silent==0)) { + LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", dead_cell, fname, fline); + } unlink_timers(dead_cell); remove_from_hash_table_unsafe(dead_cell); } @@ -437,7 +439,7 @@ void free_hash_table( ) /* delete all synonyms at hash-collision-slot i */ clist_foreach_safe(&_tm_table->entries[i], p_cell, tmp_cell, next_c){ - free_cell(p_cell); + free_cell_silent(p_cell); } } shm_free(_tm_table); diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 7cda34e..0cbe24c 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -553,8 +553,9 @@ struct s_table* tm_get_table(void); struct s_table* init_hash_table(void); void free_hash_table(void); -void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int fline); -#define free_cell(t) free_cell_helper((t), __FILE__, __LINE__) +void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsigned int fline); +#define free_cell(t) free_cell_helper((t), 0, __FILE__, __LINE__) +#define free_cell_silent(t) free_cell_helper((t), 1, __FILE__, __LINE__) struct cell* build_cell( struct sip_msg* p_msg );

1 0

New async HTTP module
by Federico Cabiddu 18 Jan '16

18 Jan '16

Hi all, with two colleagues (Camille Oudot and Giacomo Vacca) we have been working to an asynchronous HTTP module. The module uses libevent (http://libevent.org/) and cURL's multi inteface ( http://curl.haxx.se/libcurl/c/libcurl-multi.html). It instantiates N workers at startup, each able to generate multiple requests in parallel and to resume the execution of the routing script upon reception of the HTTP reply (or on error); if the query is executed in a transaction context, the transaction itself will be suspended and resumed before continuing the routing logic execution. The module, apart from implementing non blocking HTTP queries, also provides the ability to specify some HTTPS options per request, to customize HTTP headers and to use several HTTP methods (GET,POST,PUT,DELETE) making it very suitable for interacting with RESTful APIs. We hope that this module can be useful to many. As usual any feedback and improvement proposals are more than welcome! Regards, Federico

2 2

git:4.3:b8dbff13: permissions: max size of subnet array set to 512
by Daniel-Constantin Mierla 18 Jan '16

18 Jan '16

Module: kamailio Branch: 4.3 Commit: b8dbff13ed9426e909e54442d80621624a28e50f URL: https://github.com/kamailio/kamailio/commit/b8dbff13ed9426e909e54442d806216… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T12:52:40+01:00 permissions: max size of subnet array set to 512 - was 128, which can be insufficient for large interconnect (cherry picked from commit 82d7e06b09f02a2e6dab9f171586f9cd6f636f5b) --- Modified: modules/permissions/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/b8dbff13ed9426e909e54442d806216… Patch: https://github.com/kamailio/kamailio/commit/b8dbff13ed9426e909e54442d806216… --- diff --git a/modules/permissions/hash.h b/modules/permissions/hash.h index 1ae0072..f4d101f 100644 --- a/modules/permissions/hash.h +++ b/modules/permissions/hash.h @@ -174,7 +174,7 @@ int addr_hash_table_rpc_print(struct addr_list** table, rpc_t* rpc, void* c); void empty_addr_hash_table(struct addr_list** hash_table); -#define PERM_MAX_SUBNETS 128 +#define PERM_MAX_SUBNETS 512 /*

1 0

git:master:391c8ac0: modules/ims_auth: prevent crash if suspended transaction disappears waiting for a MAR
by jaybeepee 18 Jan '16

18 Jan '16

Module: kamailio Branch: master Commit: 391c8ac03fc91029104b0c125e4c6e6184f1783a URL: https://github.com/kamailio/kamailio/commit/391c8ac03fc91029104b0c125e4c6e6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-01-18T11:52:17+02:00 modules/ims_auth: prevent crash if suspended transaction disappears waiting for a MAR --- Modified: modules/ims_auth/cxdx_mar.c --- Diff: https://github.com/kamailio/kamailio/commit/391c8ac03fc91029104b0c125e4c6e6… Patch: https://github.com/kamailio/kamailio/commit/391c8ac03fc91029104b0c125e4c6e6… --- diff --git a/modules/ims_auth/cxdx_mar.c b/modules/ims_auth/cxdx_mar.c index ff41296..3dcbcb1 100644 --- a/modules/ims_auth/cxdx_mar.c +++ b/modules/ims_auth/cxdx_mar.c @@ -137,7 +137,7 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *maa, long elaps if (tmb.t_lookup_ident(&t, data->tindex, data->tlabel) < 0) { LM_ERR("t_continue: transaction not found\n"); result = CSCF_RETURN_ERROR; - goto error; + goto error1; } /* get the private_identity */ @@ -485,6 +485,8 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *maa, long elaps tmb.unref_cell(t); } tmb.t_continue(data->tindex, data->tlabel, data->act); + +error1: free_saved_transaction_data(data); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016