sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
165 discussions

git:master: ctl: compile time option to use system memory allocator

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 55a3671f99c31455d2d460ef81a0bc6dabd1c338 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55a3671… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 12 09:18:31 2012 +0100 ctl: compile time option to use system memory allocator - flag in module Makefile: -DCTL_SYSTEM_MALLOC - turned on for the moment --- modules/ctl/Makefile | 2 + modules/ctl/binrpc_run.c | 43 ++++++++++++++++++----------------- modules/ctl/ctl.h | 44 ++++++++++++++++++++++++++++++++++++ modules/ctl/ctrl_socks.c | 20 +++++++++------- modules/ctl/fifo_server.c | 55 +++++++++++++++++++++++---------------------- modules/ctl/io_listener.c | 5 ++- 6 files changed, 110 insertions(+), 59 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=55a…

12 years, 11 months

git:master: app_lua: lookup pv in cached table for unset and isnull

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f101dacbf640f08e2133c197c465ff7d312dda1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f101dac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 11 12:04:56 2012 +0100 app_lua: lookup pv in cached table for unset and isnull --- modules/app_lua/app_lua_sr.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 3a2bf72..b5a6a6c 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1027,9 +1027,10 @@ static int lua_sr_pv_sets (lua_State *L) static int lua_sr_pv_unset (lua_State *L) { str pvn; - pv_spec_t pvs; + pv_spec_t *pvs; pv_value_t val; sr_lua_env_t *env_L; + int pl; env_L = sr_lua_env_get(); @@ -1039,14 +1040,21 @@ static int lua_sr_pv_unset (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv unset: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) + { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return 0; + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { - LM_ERR("unable to parse pv [%s]\n", pvn.s); + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); return 0; } memset(&val, 0, sizeof(pv_value_t)); val.flags |= PV_VAL_NULL; - if(pv_set_spec_value(env_L->msg, &pvs, 0, &val)<0) + if(pv_set_spec_value(env_L->msg, pvs, 0, &val)<0) { LM_ERR("unable to unset pv [%s]\n", pvn.s); return 0; @@ -1061,9 +1069,10 @@ static int lua_sr_pv_unset (lua_State *L) static int lua_sr_pv_is_null (lua_State *L) { str pvn; - pv_spec_t pvs; + pv_spec_t *pvs; pv_value_t val; sr_lua_env_t *env_L; + int pl; env_L = sr_lua_env_get(); @@ -1073,13 +1082,20 @@ static int lua_sr_pv_is_null (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv is null test: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) + { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return 0; + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { - LM_ERR("unable to parse pv [%s]\n", pvn.s); + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); return 0; } memset(&val, 0, sizeof(pv_value_t)); - if(pv_get_spec_value(env_L->msg, &pvs, &val) != 0) + if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_NOTICE("unable to get pv value for [%s]\n", pvn.s); lua_pushboolean(L, 1);

12 years, 11 months

git:master: lib/srutils: new internal library to collect common shared code for modules

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ba04bebd37cb8786db4b0e46c4455d956179433a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba04beb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 11 15:46:36 2012 +0100 lib/srutils: new internal library to collect common shared code for modules - for now includes tmrec - time recurrence matching library - used by tmrec module - cpl-c and drrouting embed tmrec -- planned to migrate to use of the internal lib --- lib/srutils/Makefile | 9 + lib/srutils/tmrec.c | 1325 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/srutils/tmrec.h | 177 +++++++ 3 files changed, 1511 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ba0…

12 years, 11 months

[tracker] Task closed: Sanity module fails to reject broken From/ To headers

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#177 - Sanity module fails to reject broken From/ To headers User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Check for duplicated tag parameters committed to master branch. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=177 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 11 months

[tracker] Comment added: rtpproxy timeout functionality via dlg_terminate_dlg mi command

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#196 - rtpproxy timeout functionality via dlg_terminate_dlg mi command User who did this - Nick Altmann (nikbyte) ---------- rtpproxy "understand" additional parameters only in U command. In other case it sends error. With my patch or without it. Maybe it will be right to write there if (opts.s.s[0] == 'U') && (to_tag.len > 0). I don't know. :-) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=196#comment493 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 11 months

[tracker] Comment added: pua_dialoginfo: set PUBLISH R-URIs via AVPs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#197 - pua_dialoginfo: set PUBLISH R-URIs via AVPs User who did this - Daniel-Constantin Mierla (miconda) ---------- As I could see, there is a wrapper dialog_publish_multi(...) which provides the uri parameter further to dialog_publish(...) anyhow. Shared memory operations are done under lock and should be avoided if not necessary. At the moment, all the extra shm ops are done just for one less condition in the wrapper. The idea of not sending publish in some cases is good, but should be made consistent, imo, not only for the case of using avps for uris. I would use a dialog flag to detect that. So it will work in all cases, besides being a bit more efficient -- searching in avps list to get none means going over all existing avps and comparing the names. Two more things: - when using avps, I saw a check against myself condition -- is it necessary to be hardcoded? Shouldn't be done in the config by admin when setting the avps? It will allow more flexibility there to decide if to send or not to a uri -- just don't add it as avp if no publish to it is desired - is the patch against master branch? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=197#comment492 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 11 months

git:master: parser: relocated helper functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f7f5ca4fdf63b3bc026dd9114b00cee2ab099801 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7f5ca4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 10 23:33:00 2012 +0100 parser: relocated helper functions --- lib/kcore/parser_helpers.c | 211 ------------------------------------- lib/kcore/parser_helpers.h | 22 ---- modules/enum/enum.c | 1 - modules/rtpproxy/rtpproxy.c | 1 - modules_k/auth_db/authorize.c | 3 +- modules_k/auth_radius/authorize.c | 1 - modules_k/dialog/dlg_handlers.c | 1 - modules_k/domain/domain.c | 1 - modules_k/group/group.c | 1 - modules_k/nathelper/nathelper.c | 1 - modules_k/pdt/pdt.c | 1 - modules_k/presence/subscribe.c | 1 - modules_k/pua/send_subscribe.c | 1 - modules_k/pv/pv_core.c | 1 - modules_k/registrar/lookup.c | 1 - modules_k/rls/subscribe.c | 1 - modules_k/siputils/checks.c | 1 - modules_k/speeddial/sdlookup.c | 1 - modules_k/uri_db/checks.c | 1 - parser/parse_from.c | 29 +++++ parser/parse_from.h | 2 + parser/parse_rr.c | 135 +++++++++++++++++++++++ parser/parse_rr.h | 10 ++ parser/parse_to.c | 32 ++++++ parser/parse_to.h | 2 + 25 files changed, 212 insertions(+), 250 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f7f…

12 years, 11 months

git:master: sanity: new checks for duplicates of tag params in To/From

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 997195274d2fc9d877fb2f3ff127e50773ebc4ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9971952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 10 23:07:36 2012 +0100 sanity: new checks for duplicates of tag params in To/From - the values are used to identify SIP dialogs and must be unique - reported in FS#177 --- modules/sanity/mod_sanity.c | 8 ++++++-- modules/sanity/mod_sanity.h | 6 ++++-- modules/sanity/sanity.c | 43 +++++++++++++++++++++++++++++++++++++++++++ modules/sanity/sanity.h | 3 +++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/modules/sanity/mod_sanity.c b/modules/sanity/mod_sanity.c index b54d2e3..fd50a79 100644 --- a/modules/sanity/mod_sanity.c +++ b/modules/sanity/mod_sanity.c @@ -145,8 +145,8 @@ static int sanity_fixup(void** param, int param_no) { LOG(L_ERR, "sanity: failed to convert second integer argument\n"); return E_UNSPEC; } - if ((checks < 1) || (checks > (SANITY_DEFAULT_URI_CHECKS))) { - LOG(L_ERR, "sanity: second input parameter (%i) outside of valid range 1-%i\n", checks, SANITY_DEFAULT_URI_CHECKS); + if ((checks < 1) || (checks >= (SANITY_URI_MAX_CHECKS))) { + LOG(L_ERR, "sanity: second input parameter (%i) outside of valid range <1-%i\n", checks, SANITY_URI_MAX_CHECKS); return E_UNSPEC; } *param = (void*)(long)checks; @@ -215,6 +215,10 @@ int sanity_check(struct sip_msg* _msg, int msg_checks, int uri_checks) (ret = check_digest(_msg, uri_checks)) != SANITY_CHECK_PASSED) { goto done; } + if (SANITY_CHECK_DUPTAGS & msg_checks && + (ret = check_duptags(_msg)) != SANITY_CHECK_PASSED) { + goto done; + } done: return ret; diff --git a/modules/sanity/mod_sanity.h b/modules/sanity/mod_sanity.h index 5586dce..8221329 100644 --- a/modules/sanity/mod_sanity.h +++ b/modules/sanity/mod_sanity.h @@ -47,7 +47,8 @@ #define SANITY_PROXY_REQUIRE (1<<9) #define SANITY_PARSE_URIS (1<<10) #define SANITY_CHECK_DIGEST (1<<11) -#define SANITY_MAX_CHECKS (1<<12) /* Make sure this is the highest value */ +#define SANITY_CHECK_DUPTAGS (1<<12) +#define SANITY_MAX_CHECKS (1<<13) /* Make sure this is the highest value */ /* VIA_SIP_VERSION and VIA_PROTOCOL do not work yet * and PARSE_URIS is very expensive */ @@ -59,13 +60,14 @@ SANITY_CL | \ SANITY_EXPIRES_VALUE | \ SANITY_PROXY_REQUIRE | \ - SANITY_CHECK_DIGEST + SANITY_CHECK_DIGEST #define SANITY_URI_CHECK_RURI (1<<0) #define SANITY_URI_CHECK_FROM (1<<1) #define SANITY_URI_CHECK_TO (1<<2) #define SANITY_URI_CHECK_CONTACT (1<<3) +#define SANITY_URI_MAX_CHECKS (1<<4) /* Make sure this is the highest value */ #define SANITY_DEFAULT_URI_CHECKS SANITY_URI_CHECK_RURI | \ SANITY_URI_CHECK_FROM | \ diff --git a/modules/sanity/sanity.c b/modules/sanity/sanity.c index 9466313..2331289 100644 --- a/modules/sanity/sanity.c +++ b/modules/sanity/sanity.c @@ -40,6 +40,7 @@ #include "../../parser/digest/digest.h" #include "../../parser/contact/parse_contact.h" #include "../../parser/parse_to.h" +#include "../../parser/parse_from.h" #define UNSUPPORTED_HEADER "Unsupported: " #define UNSUPPORTED_HEADER_LEN (sizeof(UNSUPPORTED_HEADER)-1) @@ -994,3 +995,45 @@ int check_digest(struct sip_msg* msg, int checks) return SANITY_CHECK_PASSED; } + + +/* check for the presence of duplicate tag prameters in To/From headers */ +int check_duptags(sip_msg_t* _msg) +{ + to_body_t *tb; + to_param_t *tp; + int n; + + if(parse_from_header(_msg)<0 || parse_to_header(_msg)<0) { + DBG("check_duptags failed while parsing\n"); + return SANITY_CHECK_FAILED; + } + tb = get_from(_msg); + if(tb->tag_value.s!=NULL) { + n = 0; + for(tp = tb->param_lst; tp; tp = tp->next) { + if(tp->type==TAG_PARAM) + n++; + } + if(n>1) { + DBG("check_duptags failed for From header\n"); + return SANITY_CHECK_FAILED; + } + } + tb = get_to(_msg); + if(tb->tag_value.s!=NULL) { + n = 0; + for(tp = tb->param_lst; tp; tp = tp->next) { + if(tp->type==TAG_PARAM) + n++; + } + if(n>1) { + DBG("check_duptags failed for To header\n"); + return SANITY_CHECK_FAILED; + } + } + + return SANITY_CHECK_PASSED; +} + + diff --git a/modules/sanity/sanity.h b/modules/sanity/sanity.h index 7109b6e..e910ed1 100644 --- a/modules/sanity/sanity.h +++ b/modules/sanity/sanity.h @@ -81,4 +81,7 @@ int check_parse_uris(struct sip_msg* _msg, int checks); */ int check_digest(struct sip_msg* _msg, int checks); +/* check if there are duplicate tag params in From/To headers */ +int check_duptags(sip_msg_t* _msg); + #endif /* SANITY_CHK_H */

12 years, 11 months

git:master: parser: typedef'ed To structures

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bd5cfa5cd4fdc5f852c7dc51f27573370a519b13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd5cfa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 10 23:07:04 2012 +0100 parser: typedef'ed To structures --- parser/parse_to.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parser/parse_to.h b/parser/parse_to.h index d71c4d2..cbeb35a 100644 --- a/parser/parse_to.h +++ b/parser/parse_to.h @@ -36,15 +36,15 @@ enum { TAG_PARAM = 400, GENERAL_PARAM }; -struct to_param{ +typedef struct to_param{ int type; /*!< Type of parameter */ str name; /*!< Name of parameter */ str value; /*!< Parameter value */ struct to_param* next; /*!< Next parameter in the list */ -}; +} to_param_t; -struct to_body{ +typedef struct to_body{ int error; /*!< Error code */ str body; /*!< The whole header field body */ str uri; /*!< URI */ @@ -53,7 +53,7 @@ struct to_body{ struct sip_uri parsed_uri; struct to_param *param_lst; /*!< Linked list of parameters */ struct to_param *last_param; /*!< Last parameter in the list */ -}; +} to_body_t; /* casting macro for accessing To body */

12 years, 11 months

[tracker] Comment added: pua_dialoginfo: set PUBLISH R-URIs via AVPs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#197 - pua_dialoginfo: set PUBLISH R-URIs via AVPs User who did this - Jasmin Schnatterbeck (jasmin) ---------- That's also possible, but I think it's a question of the underlying concept - e.g.: normally, a request consists of 3 URIs (from/to/req) and those requests, whose to-Uri==req-Uri are a special kind of request. The idea is to natively represent the information content of the "most regular" request with the structure, but with having the ability to store "special" requests (req uri==to uri) in an efficient way. So, when sending the requests, the r-uris are obtained using pubruris_caller/callee. The part of code that generates the request (dlg cb) does not have to care about to choose between variables for to-uri and req-uri for each request that is being sent - that is, indeed, not necessary. But the structure of the memory blocks, the shm pointers reference to, are different depending on whether using the feature or not. In the first case, it is "struct str_list + uristring", in the last case it is "struct str_list" only - and this str_list is not really necessary (in the last case), but makes it possible to have a unique format for the publish-information... and therefore it helps to separate the tasks "collect/decide about request information" and "send requests". Right, if the feature is enabled (via module parameter) it's responsibility (and freedom) of the script writer to choose appropriate PUBLISH request URIs, that includes the case to not send any PUBLISH request to anyone. jasmin ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=197#comment491 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2012