sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:c26ff896: dispatcher: log dst uri in error messages
by Daniel-Constantin Mierla 31 May '17

31 May '17

Module: kamailio Branch: master Commit: c26ff896824956efb3f77e7d1146d84792da2782 URL: https://github.com/kamailio/kamailio/commit/c26ff896824956efb3f77e7d1146d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-31T16:15:36+02:00 dispatcher: log dst uri in error messages --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:69dfb0fa: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 31 May '17

31 May '17

Module: kamailio Branch: master Commit: 69dfb0faac87307ab2bb746b4e10d25a0279de70 URL: https://github.com/kamailio/kamailio/commit/69dfb0faac87307ab2bb746b4e10d25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-31T09:46:18+02:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:06648b9c: pipelimit: updates to documentation for cfg functions
by Daniel-Constantin Mierla 31 May '17

31 May '17

Module: kamailio Branch: master Commit: 06648b9ce868307eb487ced9bd3d61f249246a73 URL: https://github.com/kamailio/kamailio/commit/06648b9ce868307eb487ced9bd3d61f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-31T09:32:52+02:00 pipelimit: updates to documentation for cfg functions --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:93ba83a3: pipelimit: allow execution of cfg functions from several routing blocks
by Daniel-Constantin Mierla 31 May '17

31 May '17

Module: kamailio Branch: master Commit: 93ba83a349564bf307654bf2891100071376eca2 URL: https://github.com/kamailio/kamailio/commit/93ba83a349564bf307654bf28911000… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-31T09:32:52+02:00 pipelimit: allow execution of cfg functions from several routing blocks --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:c4315a47: modules: readme files regenerated - ratelimit ... [skip ci]
by Kamailio Dev 31 May '17

31 May '17

Module: kamailio Branch: master Commit: c4315a4755c555ac9a5c65649625e7678c470ca8 URL: https://github.com/kamailio/kamailio/commit/c4315a4755c555ac9a5c65649625e76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-31T09:31:47+02:00 modules: readme files regenerated - ratelimit ... [skip ci] --- Modified: src/modules/ratelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]c4315a4755c555ac9a5c65649625e76… Patch: https://github.com/kamailio/kamailio/commit/c4315a4755c555ac9a5c65649625e76… --- diff --git a/src/modules/ratelimit/README b/src/modules/ratelimit/README index 78648295ea..3982bd554a 100644 --- a/src/modules/ratelimit/README +++ b/src/modules/ratelimit/README @@ -51,7 +51,7 @@ Hendrik Scholz 6. Functions 6.1. rl_check([pvar]) - 6.2. rl_check_pipe([pipe_no]) + 6.2. rl_check_pipe(pipe_no) 7. RPC Commands @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 6. Functions 6.1. rl_check([pvar]) - 6.2. rl_check_pipe([pipe_no]) + 6.2. rl_check_pipe(pipe_no) 7. RPC Commands @@ -325,7 +325,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") 6. Functions 6.1. rl_check([pvar]) - 6.2. rl_check_pipe([pipe_no]) + 6.2. rl_check_pipe(pipe_no) 6.1. rl_check([pvar]) @@ -334,8 +334,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") type, and then the pipe will be identified based on the matched queue. If a pipe number is provided as a parameter, then the given pipe number will be used for identifying the ratelimit algorithm. The pipe number - must be provided via a pseudovariable. It is recommended to provide the - pipe number via an integer pseudovariable. + must be provided as number or via a pseudovariable. The method will return an error code if the limit for the matched algorithm is reached. @@ -344,7 +343,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") * pvar - the pseudovariable holding the pipe id to be used by ratelimit. - This function can be used from REQUEST_ROUTE. + This function can be used from ANY_ROUTE. Example 1.4. rl_check usage ... @@ -353,7 +352,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); exit; - }; + } ... # use pipe no 1 for the current method # set int pvar to 1 @@ -362,25 +361,14 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); exit; - }; -... - # use pipe no 1 for the current method - # set str pvar to 1 - $var(p) = "1"; - if (!rl_check("$var(p)") { - append_to_reply("Retry-After: 5\r\n"); - sl_send_reply("503","Limiting"); - exit; - }; + } ... -6.2. rl_check_pipe([pipe_no]) +6.2. rl_check_pipe(pipe_no) - Check the current request against the matched ratelimit algorithm. If - no parameter is provided, the queue will be matched based on method - type, and then the pipe will be identified based on the matched queue. - If a pipe number is provided as a parameter, then the given pipe number - will be used for identifying the ratelimit algorithm. + Check the current request against the matched ratelimit algorithm of + the pipe provided as parameter. The parameter can be provided as number + or variable. The method will return an error code if the limit for the matched algorithm is reached. @@ -392,19 +380,12 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") Example 1.5. rl_check_pipe usage ... - # perform queue/pipe match for current method - if (!rl_check_pipe()) { - append_to_reply("Retry-After: 5\r\n"); - sl_send_reply("503","Limiting"); - exit; - }; -... # use pipe no 1 for the current method if (!rl_check_pipe("1") { append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); exit; - }; + } ... 7. RPC Commands [View Less]

1 0

git:master:44cc2029: ratelimit: updates to documentation
by Daniel-Constantin Mierla 31 May '17

31 May '17

Module: kamailio Branch: master Commit: 44cc202959bd32e1a0c6e7926edce32cc8cb5f3f URL: https://github.com/kamailio/kamailio/commit/44cc202959bd32e1a0c6e7926edce32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-31T09:18:15+02:00 ratelimit: updates to documentation --- Modified: src/modules/ratelimit/doc/ratelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]44cc202959bd32e1a0c6e7926edce32… Patch: https://github.com/kamailio/kamailio/commit/44cc202959bd32e1a0c6e7926edce32… --- diff --git a/src/modules/ratelimit/doc/ratelimit_admin.xml b/src/modules/ratelimit/doc/ratelimit_admin.xml index bdfec2b8ac..911da3fdf1 100644 --- a/src/modules/ratelimit/doc/ratelimit_admin.xml +++ b/src/modules/ratelimit/doc/ratelimit_admin.xml @@ -283,8 +283,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") then the pipe will be identified based on the matched queue. If a pipe number is provided as a parameter, then the given pipe number will be used for identifying the ratelimit algorithm. - The pipe number must be provided via a pseudovariable. It is recommended to - provide the pipe number via an integer pseudovariable. + The pipe number must be provided as number or via a pseudovariable. </para> <para>The method will return an error code if the limit for the matched algorithm is reached. @@ -297,7 +296,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") </para></listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>rl_check</function> usage</title> @@ -308,7 +307,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); exit; - }; + } ... # use pipe no 1 for the current method # set int pvar to 1 @@ -317,30 +316,19 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); exit; - }; -... - # use pipe no 1 for the current method - # set str pvar to 1 - $var(p) = "1"; - if (!rl_check("$var(p)") { - append_to_reply("Retry-After: 5\r\n"); - sl_send_reply("503","Limiting"); - exit; - }; + } ... </programlisting> </example> </section> <section> <title> - <function moreinfo="none">rl_check_pipe([pipe_no])</function> + <function moreinfo="none">rl_check_pipe(pipe_no)</function> </title> <para> - Check the current request against the matched ratelimit algorithm. If no - parameter is provided, the queue will be matched based on method type, and - then the pipe will be identified based on the matched queue. If a pipe number - is provided as a parameter, then the given pipe number will be used for - identifying the ratelimit algorithm. + Check the current request against the matched ratelimit algorithm of the + pipe provided as parameter. The parameter can be provided as + number or variable. </para> <para>The method will return an error code if the limit for the matched algorithm is reached. @@ -358,19 +346,12 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") <title><function>rl_check_pipe</function> usage</title> <programlisting format="linespecific"> ... - # perform queue/pipe match for current method - if (!rl_check_pipe()) { - append_to_reply("Retry-After: 5\r\n"); - sl_send_reply("503","Limiting"); - exit; - }; -... # use pipe no 1 for the current method if (!rl_check_pipe("1") { append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); exit; - }; + } ... </programlisting> </example> [View Less]

1 0

git:master:61e715c0: ratelimit: allow int or pv in parameters of cfg functions
by Daniel-Constantin Mierla 31 May '17

31 May '17

Module: kamailio Branch: master Commit: 61e715c0b4c013b63bebb014b33305a78e5b9558 URL: https://github.com/kamailio/kamailio/commit/61e715c0b4c013b63bebb014b33305a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-31T09:09:16+02:00 ratelimit: allow int or pv in parameters of cfg functions - execution can be done in ANY_ROUTE --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/61e715c0b4c013b63bebb014b33305a… Patch: https://github.com/kamailio/kamailio/commit/61e715c0b4c013b63bebb014b33305a… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 84ca3e5fc4..408bdf4ab6 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -205,10 +205,12 @@ static int set_load_source(modparam_t, void *); static void destroy(void); static cmd_export_t cmds[]={ - {"rl_check", (cmd_function)w_rl_check_default, 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_pvar_null, + {"rl_check", (cmd_function)w_rl_check_default, 0, 0, + 0, ANY_ROUTE}, + {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_igp_null, fixup_free_pvar_null, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, fixup_uint_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, fixup_igp_null, + 0, ANY_ROUTE}, {0,0,0,0,0,0} }; static param_export_t params[]={ @@ -711,14 +713,13 @@ str queue_other = str_init("*"); * (expects rl_lock to be taken) * \return 0 if a nueue was found, -1 otherwise */ -static int find_queue(struct sip_msg * msg, int * queue) +static int find_queue(struct sip_msg * msg, str * method, int * queue) { - str method = msg->first_line.u.request.method; int i; *queue = -1; for (i=0; i<*nqueues; i++) - if (! str_i_cmp(queues[i].method, &method)) { + if (! str_i_cmp(queues[i].method, method)) { *queue = i; return 0; } else if (! str_i_cmp(queues[i].method, &queue_other)) { @@ -791,8 +792,18 @@ static int pipe_push(struct sip_msg * msg, int id) static int rl_check(struct sip_msg * msg, int forced_pipe) { int que_id, pipe_id, ret; - str method = msg->first_line.u.request.method; + str method; + if(msg->first_line.type == SIP_REQUEST) { + method = msg->first_line.u.request.method; + } else { + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) + || (msg->cseq==NULL))) { + LM_ERR("no CSEQ header\n"); + return -1; + } + method = get_cseq(msg)->method; + } if (forced_pipe >=0 && (forced_pipe>=MAX_PIPES || *pipes[forced_pipe].algo==PIPE_ALGO_NOP)) { LM_ERR("forced pipe %d out of range or not defined", forced_pipe); return -1; @@ -800,7 +811,7 @@ static int rl_check(struct sip_msg * msg, int forced_pipe) LOCK_GET(rl_lock); if (forced_pipe < 0) { - if (find_queue(msg, &que_id)) { + if (find_queue(msg, &method, &que_id)) { pipe_id = que_id = 0; ret = -1; goto out_release; @@ -829,35 +840,24 @@ static int rl_check(struct sip_msg * msg, int forced_pipe) static int w_rl_check_forced(struct sip_msg* msg, char *p1, char *p2) { int pipe = -1; - pv_value_t pv_val; - - if (p1 && (pv_get_spec_value(msg, (pv_spec_t *)p1, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_INT) { - pipe = pv_val.ri; - LM_DBG("pipe=%d\n", pipe); - } else if (pv_val.flags & PV_VAL_STR) { - if(str2int(&(pv_val.rs), (unsigned int*)&pipe) != 0) { - LM_ERR("Unable to get pipe from pv '%.*s'" - "=> defaulting to method type checking\n", - pv_val.rs.len, pv_val.rs.s); - pipe = -1; - } - } else { - LM_ERR("pv not a str or int => defaulting to method type checking\n"); - pipe = -1; - } - } else { - LM_ERR("Unable to get pipe from pv:%p" - " => defaulting to method type checking\n", p1); - pipe = -1; + + if(fixup_get_ivalue(msg, (gparam_t*)p1, &pipe)<0) { + LM_ERR("failed to get pipe id parameter\n"); + return -1; } + return rl_check(msg, pipe); } + static int w_rl_check_forced_pipe(struct sip_msg* msg, char *p1, char *p2) { - int pipe; + int pipe = -1; + + if(fixup_get_ivalue(msg, (gparam_t*)p1, &pipe)<0) { + LM_ERR("failed to get pipe id parameter\n"); + return -1; + } - pipe = (int)(unsigned int)(unsigned long)p1; LM_DBG("trying pipe %d\n", pipe); return rl_check(msg, pipe); } [View Less]

1 0

[GitHub] Please verify your email address.
by GitHub 30 May '17

30 May '17

Hi @kamailio-sync! Help us secure your GitHub account by verifying your email address (sr-dev(a)lists.kamailio.org). This will let you receive notifications and password resets from GitHub. Click the link below to verify your email address: https://github.com/users/kamailio-sync/emails/32326566/confirm_verification… You’re receiving this email because you recently created a new GitHub account or added a new email address. If this wasn’t you, please ignore this email. --- Sent with <3 by … [View More]

1 0

git:4.4:8351c7a8: travis-ci: use 4.4-stretch docker image [skip ci]
by Victor Seva 30 May '17

30 May '17

Module: kamailio Branch: 4.4 Commit: 8351c7a81f432141d6d1348ffec9821ff028da33 URL: https://github.com/kamailio/kamailio/commit/8351c7a81f432141d6d1348ffec9821… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-05-30T17:08:19+02:00 travis-ci: use 4.4-stretch docker image [skip ci] --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/8351c7a81f432141d6d1348ffec9821… … [View More]

1 0

git:4.3:5859e438: travis-ci: use proper domain for sr-dev mailing list [skip ci]
by Victor Seva 30 May '17

30 May '17

Module: kamailio Branch: 4.3 Commit: 5859e438b5c7b57dbc68bca958b810b177b8e2b9 URL: https://github.com/kamailio/kamailio/commit/5859e438b5c7b57dbc68bca958b810b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-05-30T17:01:48+02:00 travis-ci: use proper domain for sr-dev mailing list [skip ci] (cherry picked from commit bce1db4fce2a7cd75a8103916e1361b9c94d6f64) --- Modified: .travis.yml --- Diff: … [View More]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
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 May 2017