sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:master: modules_k: ratelimit - removing rl_drop functionality
by Ovidiu Sas 05 Jul '10

05 Jul '10

Module: sip-router Branch: master Commit: 9f652c9de2e95671aecae2cdce00fb6c15a265ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f652c9… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jul 2 18:45:22 2010 -0400 modules_k: ratelimit - removing rl_drop functionality - rl_drop is now obsolete: same functionality can be achieved by invoking: append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); - sl dependency was also removed and therefore the module can be used in both s and k configurations. --- modules_k/ratelimit/config.c | 52 ------------------ modules_k/ratelimit/config.h | 41 -------------- modules_k/ratelimit/ratelimit.c | 113 --------------------------------------- 3 files changed, 0 insertions(+), 206 deletions(-) diff --git a/modules_k/ratelimit/config.c b/modules_k/ratelimit/config.c deleted file mode 100644 index dc6ade1..0000000 --- a/modules_k/ratelimit/config.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2008 iptelorg GmbH - * - * This file is part of SIP-router, a free SIP server. - * - * SIP-router is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * SIP-router is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * History - * ------- - * 2008-02-05 adapting tm module for the configuration framework (Miklos) - */ - -/*! - * \file - * \brief TM :: Configuration - * \ingroup tm - */ - - -#include "../../cfg/cfg.h" -#include "../../parser/msg_parser.h" /* method types */ - -#include "config.h" - -struct cfg_group_ratelimit default_ratelimit_cfg = { - DEFAULT_REPLY_CODE, - DEFAULT_REPLY_REASON -}; - -void *ratelimit_cfg = &default_ratelimit_cfg; - -cfg_def_t ratelimit_cfg_def[] = { - {"reply_code", CFG_VAR_INT | CFG_ATOMIC, 400, 699, 0, 0, - "The code of the reply sent by Kamailio while limiting." }, - {"reply_reason", CFG_VAR_STRING, 0, 0, 0, 0, - "The reason of the reply sent by Kamailio while limiting."}, - {0, 0, 0, 0, 0, 0} -}; diff --git a/modules_k/ratelimit/config.h b/modules_k/ratelimit/config.h deleted file mode 100644 index 5ce3e26..0000000 --- a/modules_k/ratelimit/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * $Id$ - * - * SIP-router is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/*! - * \file - * \brief Ratelimit :: Configuration - * \ingroup ratelimit - */ - - -#ifndef _RATELIMIT_CONFIG_H -#define _RATELIMIT_CONFIG_H - - -#include "../../cfg/cfg.h" -#include "../../str.h" - - -#define DEFAULT_REPLY_CODE 503 -#define DEFAULT_REPLY_REASON "Server Unavailable" - -struct cfg_group_ratelimit { - unsigned int reply_code; - char* reply_reason; -}; - -extern struct cfg_group_ratelimit default_ratelimit_cfg; -extern void *ratelimit_cfg; -extern cfg_def_t ratelimit_cfg_def[]; - -#endif diff --git a/modules_k/ratelimit/ratelimit.c b/modules_k/ratelimit/ratelimit.c index ed73e32..b949c68 100644 --- a/modules_k/ratelimit/ratelimit.c +++ b/modules_k/ratelimit/ratelimit.c @@ -49,11 +49,9 @@ #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../lib/kcore/statistics.h" -#include "../sl/sl_api.h" #include "../../lib/kcore/km_ut.h" #include "../../rpc_lookup.h" -#include "config.h" MODULE_VERSION @@ -69,9 +67,6 @@ MODULE_VERSION #define RXL(m, str, i) (m)[i].rm_eo - (m)[i].rm_so #define RXS(m, str, i) (str) + (m)[i].rm_so -/** SL binds */ -struct sl_binds slb; - static inline int str_cmp(const str * a, const str * b); static inline int str_i_cmp(const str * a, const str * b); @@ -210,9 +205,6 @@ static ticks_t rl_timer_handle(ticks_t, struct timer_ln*, void*); static int w_rl_check_default(struct sip_msg*, char *, char *); static int w_rl_check_forced(struct sip_msg*, char *, char *); static int w_rl_check_forced_pipe(struct sip_msg*, char *, char *); -static int w_rl_drop_default(struct sip_msg*, char *, char *); -static int w_rl_drop_forced(struct sip_msg*, char *, char *); -static int w_rl_drop(struct sip_msg*, char *, char *); static int add_queue_params(modparam_t, void *); static int add_pipe_params(modparam_t, void *); /* RESERVED for future use @@ -225,17 +217,12 @@ static cmd_export_t cmds[]={ {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_pvar_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_drop", (cmd_function)w_rl_drop_default, 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_drop", (cmd_function)w_rl_drop_forced, 1, fixup_uint_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_drop", (cmd_function)w_rl_drop, 2, fixup_uint_uint, 0, REQUEST_ROUTE|LOCAL_ROUTE}, {0,0,0,0,0,0} }; static param_export_t params[]={ {"timer_interval", INT_PARAM, &timer_interval}, {"queue", STR_PARAM|USE_FUNC_PARAM, (void *)add_queue_params}, {"pipe", STR_PARAM|USE_FUNC_PARAM, (void *)add_pipe_params}, - {"reply_code", INT_PARAM, &default_ratelimit_cfg.reply_code}, - {"reply_reason", STR_PARAM, &default_ratelimit_cfg.reply_reason}, /* RESERVED for future use {"load_source", STR_PARAM|USE_FUNC_PARAM, (void *)set_load_source}, */ @@ -439,12 +426,6 @@ static int mod_init(void) timer_init(rl_timer, rl_timer_handle, 0, F_TIMER_FAST); timer_add(rl_timer, MS_TO_TICKS(1500)); /* Start it after 1500ms */ - /* load the SL API */ - if (load_sl_api(&slb)!=0) { - LM_ERR("failed to load SL API\n"); - return -1; - } - network_load_value = shm_malloc(sizeof(int)); if (network_load_value==NULL) { LM_ERR("oom for network_load_value\n"); @@ -497,13 +478,6 @@ static int mod_init(void) return -1; } - /* load configurations*/ - if( cfg_declare("ratelimit", ratelimit_cfg_def, &default_ratelimit_cfg, cfg_sizeof(ratelimit), - &ratelimit_cfg )){ - LM_ERR("failed to declare the configuration"); - return -1; - } - *network_load_value = 0; *load_value = 0.0; *load_source = load_source_mp; @@ -685,93 +659,6 @@ static void destroy(void) } -static int rl_drop(struct sip_msg * msg, unsigned int low, unsigned int high) -{ - str hdr; - int ret; - int drop_code; - str drop_reason; - - LM_DBG("(%d, %d)\n", low, high); - - if (slb.send_reply != 0) { - if ( (drop_code = cfg_get(ratelimit, ratelimit_cfg, reply_code)) == 0 ) - drop_code = DEFAULT_REPLY_CODE; - - if ( (drop_reason.s = cfg_get(ratelimit, ratelimit_cfg, reply_reason)) == 0 ) - drop_reason.s = DEFAULT_REPLY_REASON; - drop_reason.len = strlen(drop_reason.s); - - if (low != 0 && high != 0) { - hdr.s = (char *)pkg_malloc(64); - if (hdr.s == 0) { - LM_ERR("Can't allocate memory for Retry-After header\n"); - return 0; - } - hdr.len = 0; - if (! hdr.s) { - LM_ERR("no memory for hdr\n"); - return 0; - } - - if (high == low) { - hdr.len = snprintf(hdr.s, 63, "Retry-After: %d\r\n", low); - } else { - hdr.len = snprintf(hdr.s, 63, "Retry-After: %d\r\n", - low + rand() % (high - low + 1)); - } - - if (add_lump_rpl(msg, hdr.s, hdr.len, LUMP_RPL_HDR)==0) { - LM_ERR("Can't add header\n"); - pkg_free(hdr.s); - return 0; - } - ret = slb.send_reply(msg, drop_code, &drop_reason); - - pkg_free(hdr.s); - } else { - ret = slb.send_reply(msg, drop_code, &drop_reason); - } - } else { - LM_ERR("Can't send reply\n"); - return 0; - } - return ret; -} - -static int w_rl_drop(struct sip_msg* msg, char *p1, char *p2) -{ - unsigned int low, high; - - low = (unsigned int)(unsigned long)p1; - high = (unsigned int)(unsigned long)p2; - - if (high < low) { - return rl_drop(msg, low, low); - } else { - return rl_drop(msg, low, high); - } -} - -static int w_rl_drop_forced(struct sip_msg* msg, char *p1, char *p2) -{ - unsigned int i; - - if (p1) { - i = (unsigned int)(unsigned long)p1; - LM_DBG("send retry in %d s\n", i); - } else { - i = 5; - LM_DBG("send default retry in %d s\n", i); - } - return rl_drop(msg, i, i); -} - -static int w_rl_drop_default(struct sip_msg* msg, char *p1, char *p2) -{ - return rl_drop(msg, 0, 0); -} - static inline int str_cmp(const str * a , const str * b) { return ! (a->len == b->len && ! strncmp(a->s, b->s, a->len));

3 4

seas module for sip-router
by Elias Baixas 05 Jul '10

05 Jul '10

Hello all, I have been working on the seas module to make it work on sip-router. I have my own git branch locally, but I'd like to share it on the sip-router public git so that others can take a look and finally push it to the master branch. it needs some transaction-module changes, so it needs good review from other more tm-knowledgable coders before it can be finally merged. where do I need to send my public ssh key to get commit access to the sip-router git ? thanks Elias

4 12

building sip-router statically with restricted set of modules
by Timo Reimann 05 Jul '10

05 Jul '10

Heya, I've been trying to build sip-router statically, that is, create a single binary that includes a few selected modules from the modules/ and modules_k/ directories only (ser modules aren't required in my case). So far, I haven't had much luck: I tried passing various combinations of modules, include_modules, and static_modules parameters to `make' but to no avail. The Makefile jungle is quite vast too -- I couldn't make much sense out of it either in order to debug what I was doing wrong. Any help is appreciated. Cheers, --Timo

2 1

SF.net SVN: openser:[6014] branches/1.5/modules/dialog/dlg_hash.c
by Marius Zbihlei 05 Jul '10

05 Jul '10

Revision: 6014 http://openser.svn.sourceforge.net/openser/?rev=6014&view=rev Author: mariuszbihlei Date: 2010-07-05 14:46:48 +0000 (Mon, 05 Jul 2010) Log Message: ----------- Do not consider in-early-dialog BYE requests to be bogus. Patch from Timo Reimann (timo.reimann at 1und1 dot de ) Modified Paths: -------------- branches/1.5/modules/dialog/dlg_hash.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: core: typos in comments
by Daniel-Constantin Mierla 05 Jul '10

05 Jul '10

Module: sip-router Branch: master Commit: 39ac6a5c0a7833ad0c29ae7711f37b92c5c81e95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39ac6a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 5 10:36:58 2010 +0200 core: typos in comments --- sr_module.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sr_module.h b/sr_module.h index 10afc55..b055c88 100644 --- a/sr_module.h +++ b/sr_module.h @@ -266,8 +266,8 @@ typedef struct fparam { avp_ident_t avp; /* AVP identifier */ select_t* select; /* select structure */ struct subst_expr* subst; /* Regex substitution */ - pv_spec_t* pvs; /* kamailo pseudo-vars */ - pv_elem_t* pve; /* kamailo pseudo-vars in a string */ + pv_spec_t* pvs; /* kamailio pseudo-vars */ + pv_elem_t* pve; /* kamailio pseudo-vars in a string */ } v; void *fixed; } fparam_t;

1 0

git:master: debugger: work on nicer output
by Daniel-Constantin Mierla 05 Jul '10

05 Jul '10

Module: sip-router Branch: master Commit: 9a65f7d218a5740fb0196384e29e417efc755efb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a65f7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 5 10:37:22 2010 +0200 debugger: work on nicer output - output of dbg command to print action name along with type, making it more user friendly and easy to understand --- modules/debugger/debugger_act.c | 139 +++++++++++++++++++++++++++++++++++++++ modules/debugger/debugger_act.h | 34 ++++++++++ modules/debugger/debugger_api.c | 99 +++++++++++++++++++++++++-- 3 files changed, 264 insertions(+), 8 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9a6…

1 0

PostgreSQL problems with Kamailio_3.0.2
by Klaus Feichtinger 05 Jul '10

05 Jul '10

Hello, Currently I have big troubles in the combination of PRESENCE / PRESENCE_XML (/ PUA / PUA_USRLOC) with POSTGRESQL database. During last days I've analyzed the output of Kamailio 3.0.2 and PostgreSQL (8.3) database, running on Debian Lenny OS. Following items were found: 1) The default settings of 4 PGSQL tables after initializing the database with "kamdbctl init" are not useful; the tables "PRESENTITY", "PUA", "ACC" and "MISSED_CALLS" have wrong settings for "Not NULL" characteristics of some columns. In detail following columns had to be adapted manually in the database: "acc" and "missed_calls" table : column "id" must allow "NULL" (remove "Not Null" setting) "presentity" table: the column "sender" must allow "NULL" (remove "Not Null" setting) "pua" table: the columns "extra_headers", "version", "remote_contact", "contact" and "desired_expires" must allow "NULL" (remove "Not Null" setting) E.g. 883:4451: 0(7123) ERROR: db_postgres [km_dbase.c:428]: driver error: PGRES_FATAL_ERROR, ERROR: null value in column "sender" violates not-null constraint 1008:5057: 1(7134) ERROR: db_postgres [km_dbase.c:428]: driver error: PGRES_FATAL_ERROR, ERROR: null value in column "extra_headers" violates not-null constraint 1025:5078: 1(7134) ERROR: db_postgres [km_dbase.c:428]: driver error: PGRES_FATAL_ERROR, ERROR: null value in column "version" violates not-null constraint I recommend adapting the script "utils/kamctl/postgres/presence-create.sql"! 2) I do not know if this has a direct influence on the problems I have with presence, but the column "sender" in the table "presentity" seems to be used only "half". When the pua_usrloc module is inserting an entry into the table it does NOT insert a value for the column "sender". However, when a query is sent for selecting information from this table, the column "sender" is explicitly requested...... e.g. INSERTION (no "sender" value is inserted): Jun 18 20:15:01 TestKam /usr/sbin/kamailio[3151]: DEBUG: db_postgres [km_dbase.c:149]: 0x826ba68 PQsendQuery(insert into presentity (domain,username,event,etag,expires,body,received_time ) values ('192.168.150.11','116333','presence','a.1276884785.3151.1.0',1276885262,'<?xml version="1.0"?>\\012<presence xmlns="urn:ietf:params:xml:ns:pidf" xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" xmlns:c="urn:ietf:params:xml:ns:pidf:cipid" entity="116333(a)192.168.150.11">\\012 <tuple id="0x828d7d8">\\012 <status>\\012 <basic>open</basic>\\012 </status>\\012 </tuple>\\012</presence>\\012',1276884901) <file:///%5C%5C012%3c%5Cpresence%3e%5C012%27,1276884901%29>) SELECTION (a "sender" value is explicitly queried): Jun 18 20:15:08 TestKam /usr/sbin/kamailio[3151]: DEBUG: db_postgres [km_dbase.c:149]: 0x826ba68 PQsendQuery(select body,sender from presentity where domain='192.168.150.11' AND username='116333' AND event='presence' AND etag='a.1276884785.3151.1.0') What does the column "sender" represent? In the presence description on the Kamailio homepage (version 1.5) this column still is not included. 3) The next problem I have is, that the PIDF-body, which is stored in the PGSQL database, seems to cause an error in the presence_xml module and therefore no body is attached to the NOTIFY message. The NOTIFY message contains a SIP header "Content-Type: application/pidf+xml", but no PIDF-body is sent in this message. As result of this SIP request the SIP user agent (= subscriber) is a little bit confused..... I think that problem in general has something to do with the "error" described in the new task from Friday June 18^th (http://lists.sip-router.org/pipermail/sr-dev/2010-June/007865.html). First I wondered, why this problem only occurred in case that a (subscribed) user agent de-registers from Kamailio registrar server. But I guess the NOTIFY message after registration of the user agent is created without dependency on a PGSQL query (= generated with information from memory). Another behaviour of the server was, that (after emptying all related tables) the first registration / de-registration flow didn't cause any error (both NOTIFY messages were readable and contained a PIDF-body); only beginning at the second flow the body could not be parsed. This was tested with SIPp sending register/de-register messages in a period of 3 seconds. The Kamailio error message looks like: Jun 18 13:08:16 TestKam /usr/sbin/kamailio[3167]: ERROR: presence_xml [notify_body.c:515]: while parsing xml body message Jun 18 13:08:16 TestKam /usr/sbin/kamailio[3167]: ERROR: presence_xml [notify_body.c:84]: while aggregating body 4) I don't know if the parser might be influenced by a WARNING that is generated by the postgresql daemon whenever an entry into the presentity table is done (including XML body). From Kamailio log output I saw that the special characters "#011" and "#012" are included in the XML body. I guess that is the octal notation of \t (horizontal tab) and \n (newline). However, postgresql generates an error message that looks like following: /WARNING: nonstandard use of \\ in a string literal at character 162/ HINT: Use the escape string syntax for backslashes, e.g., E'\\'. Maybe this has some influence on the parser problem, too. Because in this version of Postgresql the parameter "standard_conforming_strings" is implicitly on -- just for previous versions it could be set to off. That means, that any backslash symbol (\) is interpreted as standard character (no escape). Therefore the queried result of the database does no longer include \n and \t. As interim "solution" of this problem I changed to the MySQL database instead of PostgreSQL. The "Not NULL" violation is the same, but MySQL seems to ignore this violation. Also the XML body is stored in MySQL "as wished" -- that means: all special characters are stored and the queried body still contains it. The modules "pua" and "pua_usrloc" are used for testing purposes only, because the user agents send publish messages themselves. Therefore it is not necessary using this module. But for some regression tests I used a command line base user agent that does not support publish messages. But the problem is the same -- independent from the user agent and where the publish messages is generated. Additionally I have attached a ZIP file that contains traces of the SIP traffic to/from Kamailio and Kamailio internally (Publish) and two excerpts of Kamailio syslog. The syslog excerpts are from two register / de-register sequences, where the first sequence was okay and the second one generated the parsing error. I haven't found any essential difference that would clarify the different behaviour of Kamailio. Please give me some comments to these problems ;-) I know, PostgreSQL is only "second quality" for Kamailio, but it has some advantages against MySQL, too. Thanks in advance and regards, Klaus Feichtinger

3 16

git:master: modules_k: dialog - update README with RPC functions
by Ovidiu Sas 03 Jul '10

03 Jul '10

Module: sip-router Branch: master Commit: 4ed0fcaf92979f6b8f88e4da6ad89c352f0594e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ed0fca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Jul 3 00:38:22 2010 -0400 modules_k: dialog - update README with RPC functions --- modules_k/dialog/doc/dialog_admin.xml | 336 +++++++++++++++++++++++++-------- 1 files changed, 258 insertions(+), 78 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4ed…

1 0

git:master: modules_k: ratelimit - README file updated to reflect rl_drop() removal
by Ovidiu Sas 03 Jul '10

03 Jul '10

Module: sip-router Branch: master Commit: 9ef1e02ac525368577efeabfd650c8c102827e75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ef1e02… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jul 2 22:38:55 2010 -0400 modules_k: ratelimit - README file updated to reflect rl_drop() removal --- modules_k/ratelimit/doc/ratelimit_admin.xml | 122 +++------------------------ 1 files changed, 12 insertions(+), 110 deletions(-) diff --git a/modules_k/ratelimit/doc/ratelimit_admin.xml b/modules_k/ratelimit/doc/ratelimit_admin.xml index 438179e..718ebd0 100644 --- a/modules_k/ratelimit/doc/ratelimit_admin.xml +++ b/modules_k/ratelimit/doc/ratelimit_admin.xml @@ -43,7 +43,8 @@ ... if (is_method("INVITE|REGISTER|SUBSCRIBE") { if (!rl_check()) { - rl_drop(); + append_to_reply("Retry-After: 5\r\n"); + sl_send_reply("503","Limiting"); exit; }; }; @@ -264,67 +265,6 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") </programlisting> </example> </section> - <section> - <title><varname>reply_code</varname> (integer)</title> - <para> - The code of the reply sent by &kamailio; while limiting. - </para> - <para> - <emphasis> - Default value is 503. - </emphasis> - - </para> - <example> - <title>Set <varname>reply_code</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("ratelimit", "reply_code", 505) -... -</programlisting> - </example> - <para> - This value cant be modified at runtime using sercmd - </para> - <example> - <title> Set <varname>reply_code</varname> parameter at runtime </title> - <programlisting format="linespecific"> - -sercmd cfg.set_now_int ratelimit reply_code 505 - - </programlisting> - </example> - </section> - <section> - <title><varname>reply_reason</varname> (string)</title> - <para> - The reason of the reply sent by &kamailio; while limiting. - </para> - <para> - <emphasis> - Default value is "Server Unavailable". - </emphasis> - </para> - <example> - <title>Set <varname>reply_reason</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("ratelimit", "reply_reason", "Limiting") -... -</programlisting> - </example> - <para> - This value cant be modified at runtime using sercmd - </para> - <example> - <title> Set <varname>reply_reason</varname> parameter at runtime </title> - <programlisting format="linespecific"> - -sercmd cfg.set_now_string ratelimit reply_reason "Limiting" - - </programlisting> - </example> - </section> </section> <section> <title>Exported Functions</title> @@ -360,7 +300,8 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" ... # perform queue/pipe match for current method if (!rl_check()) { - rl_drop(); + append_to_reply("Retry-After: 5\r\n"); + sl_send_reply("503","Limiting"); exit; }; ... @@ -368,7 +309,8 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" # set int pvar to 1 $var(p) = 1; if (!rl_check("$var(p)")) { - rl_drop(); + append_to_reply("Retry-After: 5\r\n"); + sl_send_reply("503","Limiting"); exit; }; ... @@ -376,7 +318,8 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" # set str pvar to 1 $var(p) = "1"; if (!rl_check("$var(p)") { - rl_drop(); + append_to_reply("Retry-After: 5\r\n"); + sl_send_reply("503","Limiting"); exit; }; ... @@ -412,62 +355,21 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" ... # perform queue/pipe match for current method if (!rl_check_pipe()) { - rl_drop(); + 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") { - rl_drop(); + append_to_reply("Retry-After: 5\r\n"); + sl_send_reply("503","Limiting"); exit; }; ... </programlisting> </example> </section> - <section> - <title> - <function moreinfo="none">rl_drop([[min ], max])</function> - </title> - <para> - For the current request, a "503 - Server Unavailable" reply is sent back. - The reply may or may not have a "Retry-After" header. If no parameter is given, - there will be no "Retry-After" header. If only the - <emphasis>max</emphasis> parameter is given, the - reply will contain a "Retry-After: <emphasis>max</emphasis>" header. If both - <emphasis>min</emphasis> and <emphasis>max</emphasis> params are given, the - reply will contain a "Retry-After: <emphasis>random</emphasis>" header with - <emphasis>random</emphasis> being a random value between the given min and max. - </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem><para> - <emphasis>min</emphasis> - the minimum value of "Retry-After" header. - </para> - </listitem> - <listitem> - <para> - <emphasis>max</emphasis> - the maximum value of "Retry-After" header. - </para> - </listitem> - </itemizedlist> - <para> - This function can be used from REQUEST_ROUTE. - </para> - <example> - <title><function>rl_drop</function> usage</title> - <programlisting format="linespecific"> -... - if (!rl_check()) { - # send back a "503 - Server Unavailable" - # with a "Retry-After: 5" - rl_drop("5"); - exit; - }; -... -</programlisting> - </example> - </section> </section> <section>

1 0

git:master: modules_k: ratelimit - rl_check(): strict pipe boundary checking
by Ovidiu Sas 02 Jul '10

02 Jul '10

Module: sip-router Branch: master Commit: 721354929365b57a1e0337dccde9d58ce8d03945 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7213549… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jul 2 19:11:40 2010 -0400 modules_k: ratelimit - rl_check(): strict pipe boundary checking --- modules_k/ratelimit/ratelimit.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/ratelimit/ratelimit.c b/modules_k/ratelimit/ratelimit.c index b949c68..628a486 100644 --- a/modules_k/ratelimit/ratelimit.c +++ b/modules_k/ratelimit/ratelimit.c @@ -758,11 +758,16 @@ 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; + 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; + } + LOCK_GET(rl_lock); if (forced_pipe < 0) { if (find_queue(msg, &que_id)) { pipe_id = que_id = 0; - ret = 1; + ret = -1; goto out_release; } pipe_id = *queues[que_id].pipe; @@ -817,13 +822,8 @@ static int w_rl_check_forced_pipe(struct sip_msg* msg, char *p1, char *p2) { int pipe; - if (p1) { - pipe = (int)(unsigned int)(unsigned long)p1; - LM_DBG("trying pipe %d\n", pipe); - } else { - pipe = -1; - } - + pipe = (int)(unsigned int)(unsigned long)p1; + LM_DBG("trying pipe %d\n", pipe); return rl_check(msg, pipe); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010