sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:master: modules_k/regex Fixed a memory leak when using pcre regex

by Marius Zbihlei

Module: sip-router Branch: master Commit: d1d17a9c02ed4ff7d69024d4eb92369da66c3e20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1d17a9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Sep 22 18:35:37 2010 +0300 modules_k/regex Fixed a memory leak when using pcre regex The compiled regular expression when using pcre_match was not freed. (cherry picked from commit 61f4d7f12723c4a3d989d37a414433e5ed71abff) --- modules_k/regex/regex_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index fcefa51..3610646 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -575,9 +575,10 @@ static int w_pcre_match(struct sip_msg* _msg, char* _s1, char* _s2) LM_DBG("matching error '%d'\n", pcre_rc); break; } + pcre_free(pcre_re); return -1; } - + pcre_free(pcre_re); LM_DBG("'%s' matches '%s'\n", string.s, regex.s); return 1; }

13 years, 8 months

SF.net SVN: openser:[6043] branches/1.5/modules/regex/regex_mod.c

by Inaki Baz Castillo

Revision: 6043 http://openser.svn.sourceforge.net/openser/?rev=6043&view=rev Author: ibc_sf Date: 2010-09-22 21:23:04 +0000 (Wed, 22 Sep 2010) Log Message: ----------- - regex module: Fixed memory leak in pcre_match(). Backported from Kamailio 3.0 (credits to marius zbihlei) http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61f4d7f… Modified Paths: -------------- branches/1.5/modules/regex/regex_mod.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

13 years, 8 months

git:kamailio_3.0: modules_k/regex Fixed a memory leak when using pcre regex

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 61f4d7f12723c4a3d989d37a414433e5ed71abff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61f4d7f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Sep 22 18:35:37 2010 +0300 modules_k/regex Fixed a memory leak when using pcre regex The compiled regular expression when using pcre_match was not freed. --- modules_k/regex/regex_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index fcefa51..3610646 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -575,9 +575,10 @@ static int w_pcre_match(struct sip_msg* _msg, char* _s1, char* _s2) LM_DBG("matching error '%d'\n", pcre_rc); break; } + pcre_free(pcre_re); return -1; } - + pcre_free(pcre_re); LM_DBG("'%s' matches '%s'\n", string.s, regex.s); return 1; }

13 years, 8 months

git:master: modules_k/rtpproxy: Removing nathelper restriction for forcing

by Ovidiu Sas

Module: sip-router Branch: master Commit: 6ea9c55354fc23e551be566b685797c1810e8c10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ea9c55… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Sep 22 12:57:50 2010 -0400 modules_k/rtpproxy: Removing nathelper restriction for forcing RTP packets only for INVITE type SIP requests. - in dialog requests like UPDATE are valid SIP request that can update the SDP. --- modules_k/rtpproxy/rtpproxy.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index daee003..3680099 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -1690,11 +1690,6 @@ rtpproxy_offer1_f(struct sip_msg *msg, char *str1, char *str2) static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) { - - if (msg->first_line.type == SIP_REQUEST) - if (msg->first_line.u.request.method_value != METHOD_INVITE) - return -1; - return force_rtp_proxy(msg, param1, param2, 1); } @@ -1725,8 +1720,7 @@ force_rtp_proxy2_f(struct sip_msg *msg, char *param1, char *param2) { int offer; - if (msg->first_line.type == SIP_REQUEST && - msg->first_line.u.request.method_value == METHOD_INVITE) { + if (msg->first_line.type == SIP_REQUEST) { offer = 1; } else if (msg->first_line.type == SIP_REPLY) { offer = 0;

13 years, 8 months

rtpproxy (k): removal of force_rtpproxy

by Ovidiu Sas

Hello all, I would like to propose the removal of force_rtp_proxy function from the rtpproxy (k) module. Instead, the rtpproxy_offer/rtpproxy_answer should be used. Why? - force_rtp_proxy no longer support 200ok/ACK SDP negotiation ('s' flag was deprecated); - all functionality of force_rtp_proxy is provided by rtpproxy_offer/rtpproxy_answer; - rtpproxy_offer/rtpproxy_answer is easier to use in the config. Objections? Regards, Ovidiu Sas

13 years, 8 months

git:carstenbock/dispatcher: - Allow the configuration of valid return values from OPTIONs-Request.

by Carsten Bock

Module: sip-router Branch: carstenbock/dispatcher Commit: e207c10747fa937e12f305f27b8592b871677d60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e207c10… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Sep 22 12:51:12 2010 +0200 - Allow the configuration of valid return values from OPTIONs-Request. - Inspiration taken from OpenSIPs --- modules_k/dispatcher/dispatch.c | 8 +- modules_k/dispatcher/dispatch.h | 4 + modules_k/dispatcher/dispatcher.c | 124 +++++++++++++++++++++++++ modules_k/dispatcher/doc/dispatcher_admin.xml | 22 +++++ 4 files changed, 152 insertions(+), 6 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c old mode 100644 new mode 100755 index 528bf9d..2b2a189 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2259,12 +2259,8 @@ static void ds_options_callback( struct cell *t, int type, ps->code, uri.len, uri.s, group); /* ps->code contains the result-code of the request. * - * We accept both a "200 OK", "501 Not supported" and "403" as an - * successful reply. - * 501: Cisco-Gateways reply with a "501 Not supported" to the request. - * 403: Aastra-Gateways reply with a "403" to the request. - * 405: Some GWs reply with a "405 Method Not Allowed" to the request. */ - if ((ps->code == 200) || (ps->code == 501) || (ps->code == 403) || (ps->code == 405)) + * We accept "200 OK" and custom reply codes as a valid response. */ + if ((ps->code == 200) || check_options_rplcode(ps->code)) { /* Set the according entry back to "Active": * remove the Probing/Inactive Flag and reset the failure counter. */ diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h old mode 100644 new mode 100755 index 16ab844..5ae6478 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -116,6 +116,10 @@ int ds_is_from_list(struct sip_msg *_m, int group); */ void ds_check_timer(unsigned int ticks, void* param); +/*! \brief + * Function for checking, ig the reply-code is valid. + */ +int check_options_rplcode(int code); /*! \brief * Timer for checking active calls load diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c old mode 100644 new mode 100755 index 8632283..63ddd89 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -127,6 +127,10 @@ str ds_table_name = str_init(DS_TABLE_NAME); str ds_setid_pvname = {NULL, 0}; pv_spec_t ds_setid_pv; +static str options_reply_codes_str= {NULL, 0}; +static int* options_reply_codes = NULL; +static int options_codes_no; + /** module functions */ static int mod_init(void); static int child_init(int); @@ -152,6 +156,8 @@ static struct mi_root* ds_mi_list(struct mi_root* cmd, void* param); static struct mi_root* ds_mi_reload(struct mi_root* cmd_tree, void* param); static int mi_child_init(void); +static int parse_reply_codes(); + static cmd_export_t cmds[]={ {"ds_select_dst", (cmd_function)w_ds_select_dst, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, @@ -206,6 +212,7 @@ static param_export_t params[]={ {"ds_hash_expire", INT_PARAM, &ds_hash_expire}, {"ds_hash_initexpire", INT_PARAM, &ds_hash_initexpire}, {"ds_hash_check_interval", INT_PARAM, &ds_hash_check_interval}, + {"ds_options_reply_codes", STR_PARAM, &options_reply_codes_str.s}, {0,0,0} }; @@ -264,6 +271,16 @@ static int mod_init(void) if (ds_ping_from.s) ds_ping_from.len = strlen(ds_ping_from.s); if (ds_ping_method.s) ds_ping_method.len = strlen(ds_ping_method.s); + if(options_reply_codes_str.s) { + options_reply_codes_str.len = strlen(options_reply_codes_str.s); + if(parse_reply_codes()< 0) + { + LM_ERR("Bad format for options_reply_code parameter" + " - Need a code list separated by commas\n"); + return -1; + } + } + if(init_data()!= 0) return -1; @@ -475,6 +492,9 @@ static void destroy(void) if(ds_db_url.s) ds_disconnect_db(); ds_hash_load_destroy(); + + if(options_reply_codes) + pkg_free(options_reply_codes); } /** @@ -709,3 +729,107 @@ static int w_ds_is_from_list1(struct sip_msg *msg, char *set, char *str2) { return ds_is_from_list(msg, (int)(long)set); } + +static int parse_reply_codes(void) +{ + str code_str; + unsigned int code; + int index= 0; + char* sep1, *sep2, *aux; + + options_reply_codes = (int*)pkg_malloc( + options_reply_codes_str.len/3 * sizeof(int)); + + if(options_reply_codes== NULL) + { + LM_ERR("no more memory\n"); + return -1; + } + + sep1 = options_reply_codes_str.s; + sep2 = strchr(options_reply_codes_str.s, ','); + + while(sep2 != NULL) + { + // Trim the values: + aux = sep2; + while(*sep1 == ' ') + sep1++; + + sep2--; + while(*sep2 == ' ') + sep2--; + + // The resulting string + code_str.s = sep1; + code_str.len = sep2-sep1+1; + + // Create a Integer from the String: + if(str2int(&code_str, &code)< 0) + { + LM_ERR("Bad format - not am integer [%.*s]\n", + code_str.len, code_str.s); + return -1; + } + + // Check if it is valid: + if(code<100 ||code > 700) + { + LM_ERR("Wrong number [%d]- must be a valid SIP reply code\n", code); + return -1; + } + + // Add it to the List + options_reply_codes[index] = code; + index++; + + // Next item: + sep1 = aux +1; + sep2 = strchr(sep1, ','); + } + + // No more commas? Last value: + // Trim: + while(*sep1 == ' ') + sep1++; + sep2 = options_reply_codes_str.s+options_reply_codes_str.len -1; + while(*sep2 == ' ') + sep2--; + + // Convert + code_str.s = sep1; + code_str.len = sep2 -sep1 +1; + if(str2int(&code_str, &code)< 0) + { + LM_ERR("Bad format - not am integer [%.*s]\n", + code_str.len, code_str.s); + return -1; + } + // Validate: + if(code<100 ||code > 700) + { + LM_ERR("Wrong number [%d]- must be a valid SIP reply code\n", code); + return -1; + } + // Add: + options_reply_codes[index] = code; + index++; + + // Done: + options_codes_no = index; + + return 0; +} + +int check_options_rplcode(int code) +{ + int i; + + for (i =0; i< options_codes_no; i++) + { + if(options_reply_codes[i] == code) + return 1; + } + + return 0; +} diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml old mode 100644 new mode 100755 index 62f0f89..3b6c2fe --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -568,6 +568,28 @@ modparam("dispatcher", "force_dst", 1) </section> <section> + <title><varname>ds_options_reply_codes</varname> (string)</title> + <para> + This parameters allows the configuration of valid return codes to the OPTIONS-Request. + The "200 OK" is always accepted, if you want to accept other return codes you may specify + them in this parameter as a comma separated value: + </para> + <para> + <emphasis> + Default value is <quote>null</quote> - only accept "200 OK" as a reply. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_options_reply_codes</quote> parameter</title> + <programlisting format="linespecific"> + ... + modparam("dispatcher", "ds_options_reply_codes", "403,500,604") + ... + </programlisting> + </example> + </section> + + <section> <title><varname>ds_append_branch</varname> (int)</title> <para> If set to 1, functions will automaticall append a new branch if

13 years, 8 months

git:master: sip-router*.cfg: enable warning by default

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 48c2ffc29fdb5b48805ef824105957df50a8b5a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48c2ffc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 22 12:41:45 2010 +0200 sip-router*.cfg: enable warning by default sip_warning is enabled by default (very useful for debugging, I wouldn't a proxy without it). This is needed because the default value changed in 3.1 (from on to off). --- etc/sip-router-basic.cfg | 1 + etc/sip-router-oob.cfg | 1 + etc/sip-router.cfg | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/etc/sip-router-basic.cfg b/etc/sip-router-basic.cfg index e5f3178..e382a40 100644 --- a/etc/sip-router-basic.cfg +++ b/etc/sip-router-basic.cfg @@ -53,6 +53,7 @@ rev_dns=no # (cmd. line: -R) #mhomed=yes # usefull for multihomed hosts, small performance penalty #disable_tcp=yes #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) +sip_warning=yes #!ifdef WITH_TLS enable_tls=yes diff --git a/etc/sip-router-oob.cfg b/etc/sip-router-oob.cfg index 05f2f27..6aa82f5 100644 --- a/etc/sip-router-oob.cfg +++ b/etc/sip-router-oob.cfg @@ -191,6 +191,7 @@ phone2tel=no # ignore user=phone in request-URIs -- otherwise # to TEL URIs, and their lookup would fail in URI # database reply_to_via=no +sip_warning=yes # public IP address #DEBCONF-LISTEN-START listen=127.0.0.1 diff --git a/etc/sip-router.cfg b/etc/sip-router.cfg index 659dd75..5e20619 100644 --- a/etc/sip-router.cfg +++ b/etc/sip-router.cfg @@ -76,6 +76,7 @@ rev_dns=no # (cmd. line: -R) #mhomed=yes # usefull for multihomed hosts, small performance penalty #disable_tcp=yes #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) +sip_warning=yes #!ifdef WITH_TLS enable_tls=yes #!endif

13 years, 8 months

git:master: sercmd: increase internal buffers

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 70ffe3dd1aa0e15e715e34cd0f3fec4c5115caac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70ffe3d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 22 12:33:12 2010 +0200 sercmd: increase internal buffers Increase sizes for maximum reply and maximum body (send) to 64k, maximum command arguments number to 256 and maximum line size to 16k. Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> Reported-by: Juha Heinanen jh tutpro com --- utils/sercmd/sercmd.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index a309b3f..7c071ed 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -74,11 +74,10 @@ #endif #define IOVEC_CNT 20 -#define BUF_SIZE 65535 -#define MAX_LINE_SIZE 1024 /* for non readline mode */ -#define MAX_REPLY_SIZE 4096 -#define MAX_BODY_SIZE 4096 -#define MAX_BINRPC_ARGS 128 +#define MAX_LINE_SIZE 16384 /* for non readline mode */ +#define MAX_REPLY_SIZE 65536 +#define MAX_BODY_SIZE 65536 +#define MAX_BINRPC_ARGS 256 #ifndef UNIX_PATH_MAX

13 years, 8 months

git:master: debugger: updates examples for latest version

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: caef96ca04c29d5eec599af1405f256d13f91179 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=caef96c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 22 12:31:01 2010 +0200 debugger: updates examples for latest version --- modules/debugger/README | 91 +++++++++++++++++++++++-------- modules/debugger/doc/debugger_admin.xml | 81 ++++++++++++++++++++-------- 2 files changed, 128 insertions(+), 44 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cae…

13 years, 8 months

git:master: debugger: removed implemented to-do list

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2537fccd689c872f995d7da5bc6d4b88d1e0ed55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2537fcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 22 11:53:00 2010 +0200 debugger: removed implemented to-do list --- modules/debugger/README | 27 ++++++++------------------- modules/debugger/doc/debugger_admin.xml | 22 ---------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index e0b8a1f..5a04f0a 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2010 Daniel-Constantin Mierla (asipto.com) + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -44,7 +44,6 @@ Daniel-Constantin Mierla 5.3. dbg.bp 6. Usage - 7. To-do List of Examples @@ -88,7 +87,6 @@ Chapter 1. Admin Guide 5.3. dbg.bp 6. Usage - 7. To-do 1. Overview @@ -142,7 +140,7 @@ Chapter 1. Admin Guide Control whether config running trace is enabled or disabled at startup. - Default value is "0" (disabled). + Default value is “0” (disabled). Example 1.1. Set cfgtrace parameter ... @@ -154,7 +152,7 @@ modparam("debugger", "cfgtrace", 1) Control whether every line (for now) breakpoint is enabled or disabled at startup. - Default value is "0" (disabled). + Default value is “0” (disabled). Example 1.2. Set breakpoint parameter ... @@ -165,7 +163,7 @@ modparam("debugger", "breakpoint", 1) What log level to be used to print module specific messages. - Default value is "-1" (L_ERR). + Default value is “-1” (L_ERR). Example 1.3. Set log_level parameter ... @@ -176,7 +174,7 @@ modparam("debugger", "log_level", 1) What log facility to be used to print module specific messages. - Default value is "NULL" (default from core). + Default value is “NULL” (default from core). Example 1.4. Set log_facility parameter ... @@ -187,7 +185,7 @@ modparam("debugger", "log_facility", "LOG_DAEMON") String to print before any module specific messages. - Default value is "*** cfgtrace:". + Default value is “*** cfgtrace:”. Example 1.5. Set log_prefix parameter ... @@ -199,7 +197,7 @@ modparam("debugger", "log_prefix", "from-debugger-with-love:") Microseconds to sleep before checking for new commands when waiting at breakpoint - Default value is "100000" (that is 0.1sec). + Default value is “100000” (that is 0.1sec). Example 1.6. Set step_usleep parameter ... @@ -213,7 +211,7 @@ modparam("debugger", "step_usleep", 500000) blocking RPC process for ever in case the worker process 'forgets' to write back a reply. - Default value is "200". + Default value is “200”. Example 1.7. Set step_loops parameter ... @@ -389,12 +387,3 @@ sercmd> dbg.bp move 10481 1(10481) ERROR: *** cfgtrace: c=[/etc/kamailio/debugger.cfg] l=44 a=25 1(10481) ERROR: *** cfgtrace: c=[/etc/kamailio/debugger.cfg] l=45 a=3 ... - -7. To-do - - The 'MUSTS' and ideas of what can be done: - * Complete breakpoint setting and usage on specific lines. - * Make the output more human friendly - text can be used instead of - integer values for some fields such as state. Also, for some - actions (e.g., module functions) string name can be printed instead - of action internal type code. diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index b774bdf..f8be5c0 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -470,27 +470,5 @@ sercmd> dbg.bp move 10481 </programlisting> </section> - <section> - <title>To-do</title> - <para> - The 'MUSTS' and ideas of what can be done: - </para> - <itemizedlist> - <listitem> - <para> - Complete breakpoint setting and usage on specific lines. - </para> - </listitem> - <listitem> - <para> - Make the output more human friendly - text can be used instead of - integer values for some fields such as state. Also, for some - actions (e.g., module functions) string name can be printed instead - of action internal type code. - </para> - </listitem> - </itemizedlist> - </section> - </chapter>

13 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010