sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:master:97b1fa99: rabbitmq: functions exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 97b1fa994dfb5f463dd06b2f201423e19db5e508 URL: https://github.com/kamailio/kamailio/commit/97b1fa994dfb5f463dd06b2f201423e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T08:35:23+01:00 rabbitmq: functions exported to kemi framework --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/97b1fa994dfb5f463dd06b2f201423e… Patch: https://github.com/kamailio/kamailio/commit/97b1fa994dfb5f463dd06b2f201423e…

6 years, 11 months

git:master:4861c7e8: auth_ephemeral: variants of auth functions exported to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4861c7e831697bd0f139c87485c3dfb601a34599 URL: https://github.com/kamailio/kamailio/commit/4861c7e831697bd0f139c87485c3dfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T08:34:55+01:00 auth_ephemeral: variants of auth functions exported to kemi --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/4861c7e831697bd0f139c87485c3dfb… Patch: https://github.com/kamailio/kamailio/commit/4861c7e831697bd0f139c87485c3dfb…

6 years, 11 months

git:master:759e9d53: rabbitmq: clang format the code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 759e9d530c75e8c6c9d54764162cd17a8d8fe78e URL: https://github.com/kamailio/kamailio/commit/759e9d530c75e8c6c9d54764162cd17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T21:16:35+01:00 rabbitmq: clang format the code --- Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/rabbitmq.h Modified: src/modules/rabbitmq/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/759e9d530c75e8c6c9d54764162cd17… Patch: https://github.com/kamailio/kamailio/commit/759e9d530c75e8c6c9d54764162cd17…

6 years, 11 months

Doing a quick test with http_async_client module from master branch

by Daniel-Constantin Mierla

Hello, anyone around here that can do a quick test with http_async_module? I don't have a testbed for it right now and I would spend the time on other resources if someone here can run some tests with http_async_client module from master branch. I did a bit of internal refactoring in order to be able to export the function to kemi interface -- nothing radical, but it would be good to know it didn't break anything. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

6 years, 11 months

git:master:5a5bc72a: uac_redirect: exported get_redirects() variants to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a5bc72a66d2129aae8a8e200c905ff326e9f659 URL: https://github.com/kamailio/kamailio/commit/5a5bc72a66d2129aae8a8e200c905ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T21:11:44+01:00 uac_redirect: exported get_redirects() variants to kemi framework --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5bc72a66d2129aae8a8e200c905ff… Patch: https://github.com/kamailio/kamailio/commit/5a5bc72a66d2129aae8a8e200c905ff… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 77da46672e..788829ae6d 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -28,6 +28,7 @@ #include "../../core/mem/mem.h" #include "../../lib/srutils/sruid.h" #include "../../modules/tm/tm_load.h" +#include "../../core/kemi.h" #include "rd_funcs.h" #include "rd_filter.h" @@ -258,6 +259,7 @@ static int redirect_init(void) { regex_t *filter; void *p; + cmd_function fct; /* load the TM API */ if (load_tm_api(&rd_tmb)!=0) { @@ -304,6 +306,21 @@ static int redirect_init(void) if(sruid_init(&_redirect_sruid, '-', "rdir", SRUID_INC)<0) return -1; + if(rd_acc_fct == 0) { + /* import the acc stuff */ + if(acc_fct_s != 0 && acc_fct_s[0] == '\0') { + fct = find_export(acc_fct_s, 2, REQUEST_ROUTE); + if(fct == 0) + fct = find_export(acc_fct_s, 1, REQUEST_ROUTE); + if(fct == 0) { + LM_ERR("cannot import %s function; is acc loaded and" + " configured\n", acc_fct_s); + return E_UNSPEC; + } + rd_acc_fct = fct; + } + } + return 0; error: return -1; @@ -374,3 +391,83 @@ static int w_get_redirect1(struct sip_msg* msg, char *max_c, char *foo) return w_get_redirect2(msg, max_c, 0); } +static int ki_get_redirects_acc(sip_msg_t* msg, int max_c, int max_b, + str *reason) +{ + int n; + acc_param_t accp; + + if(reason && reason->len>0) { + memset(&accp, 0, sizeof(acc_param_t)); + accp.reason.s = reason->s; + accp.reason.len = reason->len; + } + msg_tracer(msg, 0); + /* get the contacts */ + n = get_redirect(msg, max_c, max_b, (reason && reason->len>0)?&accp:NULL, + bflags); + reset_filters(); + /* reset the tracer */ + msg_tracer(msg, 1); + + return n; +} + +static int ki_get_redirects(sip_msg_t* msg, int max_c, int max_b) +{ + int n; + + msg_tracer(msg, 0); + /* get the contacts */ + n = get_redirect(msg, max_c, max_b, NULL, bflags); + reset_filters(); + /* reset the tracer */ + msg_tracer(msg, 1); + + return n; +} + +static int ki_get_redirects_all(sip_msg_t* msg) +{ + int n; + + msg_tracer(msg, 0); + /* get the contacts */ + n = get_redirect(msg, 0, 0, NULL, bflags); + reset_filters(); + /* reset the tracer */ + msg_tracer(msg, 1); + + return n; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_uac_redirect_exports[] = { + { str_init("uac_redirect"), str_init("get_redirects_all"), + SR_KEMIP_INT, ki_get_redirects_all, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uac_redirect"), str_init("get_redirects"), + SR_KEMIP_INT, ki_get_redirects, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uac_redirect"), str_init("get_redirects_acc"), + SR_KEMIP_INT, ki_get_redirects_acc, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_uac_redirect_exports); + return 0; +} \ No newline at end of file

6 years, 11 months

git:master:0b31d427: modules: readme files regenerated - benchmark ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0b31d42751994a71286d028df4c32e41549a40f4 URL: https://github.com/kamailio/kamailio/commit/0b31d42751994a71286d028df4c32e4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-12-06T20:16:24+01:00 modules: readme files regenerated - benchmark ... [skip ci] --- Modified: src/modules/benchmark/README --- Diff: https://github.com/kamailio/kamailio/commit/0b31d42751994a71286d028df4c32e4… Patch: https://github.com/kamailio/kamailio/commit/0b31d42751994a71286d028df4c32e4… --- diff --git a/src/modules/benchmark/README b/src/modules/benchmark/README index 6f38bcdbff..30ac60e6d8 100644 --- a/src/modules/benchmark/README +++ b/src/modules/benchmark/README @@ -35,6 +35,7 @@ Bastian Friedrich 3.1. enable (int) 3.2. granularity (int) 3.3. loglevel (int) + 3.4. register (str) 4. Functions @@ -69,10 +70,11 @@ Bastian Friedrich 1.1. Set enable parameter 1.2. Set granularity parameter 1.3. Set loglevel parameter - 1.4. bm_start_timer usage - 1.5. bm_log_timer usage - 1.6. Enabling a timer - 1.7. benchmark usage + 1.4. Set register parameter + 1.5. bm_start_timer usage + 1.6. bm_log_timer usage + 1.7. Enabling a timer + 1.8. benchmark usage 2.1. Using the benchmark module's API from another module Chapter 1. Admin Guide @@ -90,6 +92,7 @@ Chapter 1. Admin Guide 3.1. enable (int) 3.2. granularity (int) 3.3. loglevel (int) + 3.4. register (str) 4. Functions @@ -140,6 +143,7 @@ Chapter 1. Admin Guide 3.1. enable (int) 3.2. granularity (int) 3.3. loglevel (int) + 3.4. register (str) 3.1. enable (int) @@ -193,6 +197,20 @@ modparam("benchmark", "loglevel", 4) This will set the logging level to L_DBG. +3.4. register (str) + + Register a timer id at startup. Required when using the start/log + functions via Kemi framework. This parameter can be set many times to + register several timer ids. + + Default value is “NONE”. + + Example 1.4. Set register parameter +... +modparam("benchmark", "register", "test") +modparam("benchmark", "register", "auth") +... + 4. Functions 4.1. bm_start_timer(name) @@ -202,7 +220,7 @@ modparam("benchmark", "loglevel", 4) Start timer “name”. A later call to “bm_log_timer()” logs this timer.. - Example 1.4. bm_start_timer usage + Example 1.5. bm_start_timer usage ... bm_start_timer("test"); ... @@ -235,7 +253,7 @@ bm_start_timer("test"); * Global avg possibly the most interesting value. - Example 1.5. bm_log_timer usage + Example 1.6. bm_log_timer usage ... bm_log_timer("test"); ... @@ -269,7 +287,7 @@ bm_log_timer("test"); Enable or disable a single timer. The following example enables timer "test" (the second parameter must be 0 to disable): - Example 1.6. Enabling a timer + Example 1.7. Enabling a timer ... kamcmd benchmark.enable_timer test 1 ... @@ -286,7 +304,7 @@ kamcmd benchmark.enable_timer test 1 Measure the duration of user location lookup. - Example 1.7. benchmark usage + Example 1.8. benchmark usage ... bm_start_timer("usrloc-lookup"); lookup("location");

6 years, 11 months

git:master:9c01580f: benchmark: documentation for register parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c01580fd858f995dc8e680545f628f4716a77a4 URL: https://github.com/kamailio/kamailio/commit/9c01580fd858f995dc8e680545f628f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T20:00:50+01:00 benchmark: documentation for register parameter --- Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c01580fd858f995dc8e680545f628f… Patch: https://github.com/kamailio/kamailio/commit/9c01580fd858f995dc8e680545f628f… --- diff --git a/src/modules/benchmark/doc/benchmark_admin.xml b/src/modules/benchmark/doc/benchmark_admin.xml index e666d105d2..2216dc219b 100644 --- a/src/modules/benchmark/doc/benchmark_admin.xml +++ b/src/modules/benchmark/doc/benchmark_admin.xml @@ -156,6 +156,29 @@ modparam("benchmark", "loglevel", 4) </para> </section> + <section id="benchmark.p.register"> + <title><varname>register</varname> (str)</title> + <para> + Register a timer id at startup. Required when using the start/log + functions via Kemi framework. This parameter can be set many + times to register several timer ids. + </para> + <para> + <emphasis> + Default value is <quote>NONE</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>register</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("benchmark", "register", "test") +modparam("benchmark", "register", "auth") +... +</programlisting> + </example> + </section> + </section> <section> <title>Functions</title>

6 years, 11 months

git:master:f382c10e: benchmark: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f382c10e18248423c2f8f4fb3469f7faea1504e3 URL: https://github.com/kamailio/kamailio/commit/f382c10e18248423c2f8f4fb3469f7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T19:56:32+01:00 benchmark: exported functions to kemi framework - new parameter 'register' - register a timer id, required when using kemi framework, because there is no fixup mechanism to register timer ids based on function params --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/f382c10e18248423c2f8f4fb3469f7f… Patch: https://github.com/kamailio/kamailio/commit/f382c10e18248423c2f8f4fb3469f7f…

6 years, 11 months

git:master:9139bd29: group: is_user_in() exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9139bd2991a28a6a1ef67692e76e71ba807913d8 URL: https://github.com/kamailio/kamailio/commit/9139bd2991a28a6a1ef67692e76e71b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T18:14:49+01:00 group: is_user_in() exported to kemi framework --- Modified: src/modules/group/group.c Modified: src/modules/group/group.h Modified: src/modules/group/group_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9139bd2991a28a6a1ef67692e76e71b… Patch: https://github.com/kamailio/kamailio/commit/9139bd2991a28a6a1ef67692e76e71b…

6 years, 11 months

git:5.0:6d58c71a: tm: make t_run_local_req reentrant

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 6d58c71aa9c5e0a4571a5f12db724b753b035ece URL: https://github.com/kamailio/kamailio/commit/6d58c71aa9c5e0a4571a5f12db724b7… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-12-06T17:27:05+01:00 tm: make t_run_local_req reentrant - avoid crash when local-request event route is triggered inside another one (cherry picked from commit 97b15611ad87e36dd17ba76a77cb8817d974806b) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/6d58c71aa9c5e0a4571a5f12db724b7… Patch: https://github.com/kamailio/kamailio/commit/6d58c71aa9c5e0a4571a5f12db724b7… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5352e25399..e73af4eb03 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

6 years, 11 months

← Newer
1
...
38
39
40
41
42
43
44
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017