sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:50694326: pkg/kamailio/alpine: Removed unnecessary patches

by Sergey Safarov

Module: kamailio Branch: master Commit: 50694326b33a73e73c982f0fa575e5f67ccdf427 URL: https://github.com/kamailio/kamailio/commit/50694326b33a73e73c982f0fa575e5f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-09-22T15:54:38-04:00 pkg/kamailio/alpine: Removed unnecessary patches --- Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine/0002-remove-spurious-execinfo.patch Removed: pkg/kamailio/alpine/0003-src_modules_tls_tls_init_c.patch --- Diff: https://github.com/kamailio/kamailio/commit/50694326b33a73e73c982f0fa575e5f… Patch: https://github.com/kamailio/kamailio/commit/50694326b33a73e73c982f0fa575e5f…

7 years, 2 months

[kamailio/kamailio] pkg/kamailio/alpine: Packaged rabbitmq, sctp, radius modules and created docker scripts (#1245)

by sergey-safarov

#### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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/1245 -- Commit Summary -- * pkg/kamailio/alpine: Removed unnecessary patches * pkg/kamailio/alpine_docker: Added docker packaging scripts * pkg/kamailio/alpine: Packaged rabbitmq, sctp, radius modules -- File Changes -- D pkg/kamailio/alpine/0002-remove-spurious-execinfo.patch (30) D pkg/kamailio/alpine/0003-src_modules_tls_tls_init_c.patch (131) M pkg/kamailio/alpine/APKBUILD (24) A pkg/kamailio/alpine_docker/Dockerfile (6) A pkg/kamailio/alpine_docker/README.md (91) A pkg/kamailio/alpine_docker/build.sh (137) A pkg/kamailio/alpine_docker/entrypoint.sh (14) A pkg/kamailio/alpine_docker/hooks/pre_build (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1245.patch https://github.com/kamailio/kamailio/pull/1245.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/1245

7 years, 2 months

Enabling Redirection in Kamailio SIP Server

by Anas Rasheed

How can we enable redirection in Kamilio SIP Server using Siremis User Interface for it? Can anyone provide us with the tutorial of it?

7 years, 3 months

git:master:8f0fc94a: tm: rpc command to clean long time expired transactions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f0fc94aaa6db96ef209c6136240d98ef566a004 URL: https://github.com/kamailio/kamailio/commit/8f0fc94aaa6db96ef209c6136240d98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-14T09:21:08+02:00 tm: rpc command to clean long time expired transactions - try hard clean after 90 seconds since lifetime elapsed --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_stats.c Modified: src/modules/tm/t_stats.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/8f0fc94aaa6db96ef209c6136240d98… Patch: https://github.com/kamailio/kamailio/commit/8f0fc94aaa6db96ef209c6136240d98… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 19b5daec0b..ee79b91fd3 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -575,3 +575,62 @@ void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) return; } } + +void tm_log_transaction(tm_cell_t *tcell, int llev, char *ltext) +{ + LOG(llev, "%s [start] transaction %p\n", ltext, tcell); + LOG(llev, "%s - tindex=%u tlabel=%u method='%.*s' from='%.*s'" + " to='%.*s' callid='%.*s' cseq='%.*s' uas_request=%s" + " tflags=%u outgoings=%u ref_count=%u lifetime=%u\n", + ltext, (unsigned)tcell->hash_index, (unsigned)tcell->label, + tcell->method.len, tcell->method.s, + tcell->from.len, tcell->from.s, + tcell->to.len, tcell->to.s, + tcell->callid.len, tcell->callid.s, + tcell->cseq_n.len, tcell->cseq_n.s, + (tcell->uas.request)?"yes":"no", + (unsigned)tcell->flags, + (unsigned)tcell->nr_of_outgoings, +#ifdef TM_DEL_UNREF + (unsigned)atomic_get(&tcell->ref_count), +#else + tcell->ref_count, +#endif + (unsigned)TICKS_TO_S(tcell->end_of_life) + ); + + LOG(llev, "%s [end] transaction %p\n", ltext, tcell); +} + +#define TM_LIFETIME_LIMIT 90 +/* clean active but very old transactions */ +void tm_clean_lifetime(void) +{ + int r; + tm_cell_t *tcell; + ticks_t texp; + + texp = get_ticks_raw() - S_TO_TICKS(TM_LIFETIME_LIMIT); + + for (r=0; r<TABLE_ENTRIES; r++) { + /* faster first try without lock */ + if(clist_empty(&_tm_table->entries[r], next_c)) { + continue; + } + lock_hash(r); + /* one more time with lock to be avoid any cpu races */ + if(clist_empty(&_tm_table->entries[r], next_c)) { + unlock_hash(r); + continue; + } + + clist_foreach(&_tm_table->entries[r], tcell, next_c) + { + if(TICKS_GT(texp, tcell->end_of_life)) { + tm_log_transaction(tcell, L_WARN, "[hard cleanup]"); + free_cell(tcell); + } + } + unlock_hash(r); + } +} diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 904709579a..7d61ae3673 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -607,6 +607,8 @@ inline static void remove_from_hash_table_unsafe(struct cell *p_cell) t_stats_deleted(is_local(p_cell)); } +void tm_clean_lifetime(void); + /** * backup xdata from/to msg context to local var and use T lists */ diff --git a/src/modules/tm/t_stats.c b/src/modules/tm/t_stats.c index d6ae5f52e4..6b26aedba0 100644 --- a/src/modules/tm/t_stats.c +++ b/src/modules/tm/t_stats.c @@ -252,7 +252,7 @@ void tm_rpc_hash_stats(rpc_t* rpc, void* c) #endif /* TM_HASH_STATS */ } -/* hash statistics */ +/* list active transactions */ void tm_rpc_list(rpc_t* rpc, void* c) { int r; @@ -294,3 +294,10 @@ void tm_rpc_list(rpc_t* rpc, void* c) unlock_hash(r); } } + + +/* rpc command to clean active but very old transactions */ +void tm_rpc_clean(rpc_t* rpc, void* c) +{ + tm_clean_lifetime(); +} diff --git a/src/modules/tm/t_stats.h b/src/modules/tm/t_stats.h index 0a0057c620..bd21befd0f 100644 --- a/src/modules/tm/t_stats.h +++ b/src/modules/tm/t_stats.h @@ -150,5 +150,6 @@ void tm_rpc_hash_stats(rpc_t* rpc, void* c); typedef int (*tm_get_stats_f)(struct t_proc_stats *all); int tm_get_stats(struct t_proc_stats *all); void tm_rpc_list(rpc_t* rpc, void* c); +void tm_rpc_clean(rpc_t* rpc, void* c); #endif diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 7adaa8796d..9bc1695a0f 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2521,6 +2521,11 @@ static const char* tm_rpc_list_doc[2] = { 0 }; +static const char* tm_rpc_clean_doc[2] = { + "Clean expired (lifetime exceeded) transactions.", + 0 +}; + /* rpc exports */ static rpc_export_t tm_rpc[] = { @@ -2532,6 +2537,7 @@ static rpc_export_t tm_rpc[] = { {"tm.t_uac_start", rpc_t_uac_start, rpc_t_uac_start_doc, 0 }, {"tm.t_uac_wait", rpc_t_uac_wait, rpc_t_uac_wait_doc, RET_ARRAY}, {"tm.list", tm_rpc_list, tm_rpc_list_doc, RET_ARRAY}, + {"tm.clean", tm_rpc_clean, tm_rpc_clean_doc, 0}, {0, 0, 0, 0} };

7 years, 3 months

git:master:185db312: janssonrpcc: do not lock in mod destroy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 185db312ed91bba6c997a42a84c4da1e4ce2319f URL: https://github.com/kamailio/kamailio/commit/185db312ed91bba6c997a42a84c4da1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-23T09:30:08+02:00 janssonrpcc: do not lock in mod destroy - all children are killed already and if lock was already set results in a deadlock --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/185db312ed91bba6c997a42a84c4da1… Patch: https://github.com/kamailio/kamailio/commit/185db312ed91bba6c997a42a84c4da1… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 429d034bf0..654ea8280c 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -215,7 +215,6 @@ static int child_init(int rank) void mod_destroy(void) { if(jsonrpc_server_group_lock) { - lock_get(jsonrpc_server_group_lock); /* blocking */ lock_dealloc(jsonrpc_server_group_lock); }

7 years, 3 months

git:master:29164982: jsonrpcc: do not declare variables in header files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 291649821f4d19790072ffaf9aefc41891a3551d URL: https://github.com/kamailio/kamailio/commit/291649821f4d19790072ffaf9aefc41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-23T09:29:10+02:00 jsonrpcc: do not declare variables in header files - avoid declaration in each .c that includes the .h --- Modified: src/modules/janssonrpcc/janssonrpc.h Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/janssonrpcc/janssonrpc_io.h Modified: src/modules/janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_request.h Modified: src/modules/janssonrpcc/janssonrpc_server.c Modified: src/modules/janssonrpcc/janssonrpc_server.h Modified: src/modules/janssonrpcc/janssonrpc_srv.c Modified: src/modules/janssonrpcc/janssonrpc_srv.h Modified: src/modules/janssonrpcc/janssonrpcc_mod.c Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/291649821f4d19790072ffaf9aefc41… Patch: https://github.com/kamailio/kamailio/commit/291649821f4d19790072ffaf9aefc41…

7 years, 3 months

git:master:5fde5e87: Merge pull request #1242 from gaaf/random-fixes

by GitHub

Module: kamailio Branch: master Commit: 5fde5e87a0dba18c7d1d1cd97ef4e89536cc10c5 URL: https://github.com/kamailio/kamailio/commit/5fde5e87a0dba18c7d1d1cd97ef4e89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-09-23T07:58:38+02:00 Merge pull request #1242 from gaaf/random-fixes Random fixes --- Modified: src/modules/cfgutils/cfgutils.c Modified: src/modules/janssonrpcc/janssonrpcc_mod.c Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5fde5e87a0dba18c7d1d1cd97ef4e89… Patch: https://github.com/kamailio/kamailio/commit/5fde5e87a0dba18c7d1d1cd97ef4e89… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index ca7bf77ae3..4a3e001e6e 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -134,9 +134,9 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"rand_event", (cmd_function)rand_event, 0, 0, 0, ANY_ROUTE}, - {"sleep", (cmd_function)m_sleep, 1, fixup_igp_null, 0, + {"sleep", (cmd_function)m_sleep, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, - {"usleep", (cmd_function)m_usleep, 1, fixup_igp_null, 0, + {"usleep", (cmd_function)m_usleep, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"abort", (cmd_function)dbg_abort, 0, 0, 0, ANY_ROUTE}, @@ -162,9 +162,9 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"core_hash", (cmd_function)w_core_hash, 3, fixup_core_hash, 0, ANY_ROUTE}, - {"check_route_exists", (cmd_function)w_check_route_exists, 1, 0, 0, + {"check_route_exists", (cmd_function)w_check_route_exists, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, - {"route_if_exists", (cmd_function)w_route_exists, 1, 0, 0, + {"route_if_exists", (cmd_function)w_route_exists, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_cfgutils", (cmd_function)bind_cfgutils, 0, 0, 0, 0}, @@ -622,7 +622,6 @@ static int m_sleep(struct sip_msg *msg, char *time, char *str2) LM_ERR("cannot get time interval value\n"); return -1; } - LM_DBG("sleep %lu seconds\n", (unsigned long)s); sleep((unsigned int)s); return 1; } @@ -635,7 +634,6 @@ static int m_usleep(struct sip_msg *msg, char *time, char *str2) LM_ERR("cannot get time interval value\n"); return -1; } - LM_DBG("sleep %lu microseconds\n", (unsigned long)time); sleep_us((unsigned int)s); return 1; } @@ -784,7 +782,14 @@ static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) */ static int w_check_route_exists(struct sip_msg *msg, char *route) { - if (route_lookup(&main_rt, route)<0) { + str s; + + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) + { + LM_ERR("invalid route parameter\n"); + return -1; + } + if (route_lookup(&main_rt, s.s)<0) { /* not found */ return -1; } @@ -797,16 +802,27 @@ static int w_route_exists(struct sip_msg *msg, char *route) { struct run_act_ctx ctx; int newroute, backup_rt, ret; + str s; - newroute = route_lookup(&main_rt, route); + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) + { + LM_ERR("invalid route parameter\n"); + return -1; + } + + newroute = route_lookup(&main_rt, s.s); if (newroute<0) { return -1; } backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); ret = run_top_route(main_rt.rlist[newroute], msg, &ctx); set_route_type(backup_rt); + if (ctx.run_flags & EXIT_R_F) { + return 0; + } return ret; } diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index a6e9c010d3..5cdd5f8a5b 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -205,8 +205,10 @@ static int child_init(int rank) void mod_destroy(void) { - lock_get(jsonrpc_server_group_lock); /* blocking */ - if(jsonrpc_server_group_lock) lock_dealloc(jsonrpc_server_group_lock); + if(jsonrpc_server_group_lock) { + lock_get(jsonrpc_server_group_lock); /* blocking */ + lock_dealloc(jsonrpc_server_group_lock); + } free_server_group(global_server_group); CHECK_AND_FREE(global_server_group); diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index b20299efe9..ec7a5fced3 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -82,7 +82,7 @@ static int fixup_get_field(void** param, int param_no) static int fixup_get_field_free(void** param, int param_no) { if (param_no == 1 || param_no == 2) { - LM_WARN("free function has not been defined for spve\n"); + fixup_free_spve_null(param, 1); return 0; }

7 years, 3 months

git:master:894e64ae: janssonrcp-c: Fix segfault in mod_destroy

by Alex Hermann

Module: kamailio Branch: master Commit: 894e64ae69f485ee8b764092d255c65ab7740da7 URL: https://github.com/kamailio/kamailio/commit/894e64ae69f485ee8b764092d255c65… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2017-09-22T11:56:54+02:00 janssonrcp-c: Fix segfault in mod_destroy Check variable before dereferencing it. --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/894e64ae69f485ee8b764092d255c65… Patch: https://github.com/kamailio/kamailio/commit/894e64ae69f485ee8b764092d255c65… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index a6e9c010d3..5cdd5f8a5b 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -205,8 +205,10 @@ static int child_init(int rank) void mod_destroy(void) { - lock_get(jsonrpc_server_group_lock); /* blocking */ - if(jsonrpc_server_group_lock) lock_dealloc(jsonrpc_server_group_lock); + if(jsonrpc_server_group_lock) { + lock_get(jsonrpc_server_group_lock); /* blocking */ + lock_dealloc(jsonrpc_server_group_lock); + } free_server_group(global_server_group); CHECK_AND_FREE(global_server_group);

7 years, 3 months

git:master:305dbe71: json: Add fixup_free function for json_get_field

by Alex Hermann

Module: kamailio Branch: master Commit: 305dbe7197f87d8e14bb75f14553852c8e3c9b8c URL: https://github.com/kamailio/kamailio/commit/305dbe7197f87d8e14bb75f14553852… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2017-09-22T11:56:54+02:00 json: Add fixup_free function for json_get_field --- Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/305dbe7197f87d8e14bb75f14553852… Patch: https://github.com/kamailio/kamailio/commit/305dbe7197f87d8e14bb75f14553852… --- diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index b20299efe9..ec7a5fced3 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -82,7 +82,7 @@ static int fixup_get_field(void** param, int param_no) static int fixup_get_field_free(void** param, int param_no) { if (param_no == 1 || param_no == 2) { - LM_WARN("free function has not been defined for spve\n"); + fixup_free_spve_null(param, 1); return 0; }

7 years, 3 months

git:master:efe9d554: cfgutils: Remove debug statements in sleep functions

by Alex Hermann

Module: kamailio Branch: master Commit: efe9d554a912edb0ffc5ae8e7176adc5bcc44a5e URL: https://github.com/kamailio/kamailio/commit/efe9d554a912edb0ffc5ae8e7176adc… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2017-09-22T11:56:54+02:00 cfgutils: Remove debug statements in sleep functions Too much noise when debug logging is on --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/efe9d554a912edb0ffc5ae8e7176adc… Patch: https://github.com/kamailio/kamailio/commit/efe9d554a912edb0ffc5ae8e7176adc… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index c2fc404c56..4a3e001e6e 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -622,7 +622,6 @@ static int m_sleep(struct sip_msg *msg, char *time, char *str2) LM_ERR("cannot get time interval value\n"); return -1; } - LM_DBG("sleep %lu seconds\n", (unsigned long)s); sleep((unsigned int)s); return 1; } @@ -635,7 +634,6 @@ static int m_usleep(struct sip_msg *msg, char *time, char *str2) LM_ERR("cannot get time interval value\n"); return -1; } - LM_DBG("sleep %lu microseconds\n", (unsigned long)time); sleep_us((unsigned int)s); return 1; }

7 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017