sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

by Juha Heinanen

Module: sip-router Branch: master Commit: b3e2889f22db199c04e9d32999d143cefad37b2a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3e2889… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 17 21:23:57 2009 +0300 * modules_k/textops * filter_body function now takes multipart/mixed boundary string from Content-Type ;boundary parameter. --- modules_k/textops/textops.c | 84 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 71 insertions(+), 13 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 38d1287..d1b8418 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -63,6 +63,7 @@ #include "../../parser/parse_hname2.h" #include "../../parser/parse_methods.h" #include "../../parser/parse_content.h" +#include "../../parser/parse_param.h" #include "../../lib/kcore/parse_privacy.h" #include "../../mod_fix.h" #include "../../ut.h" @@ -831,27 +832,77 @@ static inline int find_line_start(char *text, unsigned int text_len, } -/* Filters multipart body by leaving out everything else except +/* Filters multipart/mixed body by leaving out everything else except * first body part of given content type. */ static int filter_body_f(struct sip_msg* msg, char* _content_type, char* ignored) { char *start; unsigned int len; - str *content_type, body; + str *content_type, body, params, boundary; + param_hooks_t hooks; + param_t *p, *list; + unsigned int mime; body.s = get_body(msg); if (body.s == 0) { - LM_ERR("Failed to get the message body\n"); + LM_ERR("failed to get the message body\n"); return -1; } body.len = msg->len - (int)(body.s - msg->buf); if (body.len == 0) { - LM_DBG("Message body has zero length\n"); + LM_DBG("message body has zero length\n"); return -1; } content_type = (str *)_content_type; + + mime = parse_content_type_hdr(msg); + if (mime <= 0) { + LM_ERR("failed to parse Content-Type hdr\n"); + return -1; + } + if (mime != ((TYPE_MULTIPART << 16) + SUBTYPE_MIXED)) { + LM_ERR("content type is not multipart/mixed\n"); + return -1; + } + + params.s = memchr(msg->content_type->body.s, ';', + msg->content_type->body.len); + if (params.s == NULL) { + LM_ERR("Content-Type hdr has no params\n"); + return -1; + } + params.len = msg->content_type->body.len - + (params.s - msg->content_type->body.s); + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { + LM_ERR("while parsing Content-Type params\n"); + return -1; + } + boundary.s = NULL; + for (p = list; p; p = p->next) { + if ((p->name.len == 8) + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { + boundary.s = pkg_malloc(p->body.len + 2); + if (boundary.s == NULL) { + free_params(list); + LM_ERR("no memory for boundary string\n"); + return -1; + } + *(boundary.s) = '-'; + *(boundary.s + 1) = '-'; + memcpy(boundary.s + 2, p->body.s, p->body.len); + boundary.len = 2 + p->body.len; + LM_DBG("boundary is <%.*s>\n", boundary.len, boundary.s); + break; + } + } + free_params(list); + if (boundary.s == NULL) { + LM_ERR("no mandatory param \";boundary\"\n"); + return -1; + } + start = body.s; len = body.len; @@ -861,10 +912,12 @@ static int filter_body_f(struct sip_msg* msg, char* _content_type, if (len > content_type->len + 2) { if (strncasecmp(start, content_type->s, content_type->len) == 0) { + LM_DBG("found content type %.*s\n", + content_type->len, content_type->s); start = start + content_type->len; if ((*start != 13) || (*(start + 1) != 10)) { - LM_ERR("No CRLF found after content type\n"); - return -1; + LM_ERR("no CRLF found after content type\n"); + goto err; } start = start + 2; len = len - content_type->len - 2; @@ -874,27 +927,32 @@ static int filter_body_f(struct sip_msg* msg, char* _content_type, } if (del_lump(msg, body.s - msg->buf, start - body.s, 0) == 0) { - LM_ERR("Deleting lump <%.*s> failed\n", + LM_ERR("deleting lump <%.*s> failed\n", (int)(start - body.s), body.s); - return -1; + goto err; } - if (find_line_start("--Boundary", 10, &start, &len)) { + if (find_line_start(boundary.s, boundary.len, &start, + &len)) { if (del_lump(msg, start - msg->buf, len, 0) == 0) { - LM_ERR("Deleting lump <%.*s> failed\n", + LM_ERR("deleting lump <%.*s> failed\n", len, start); - return -1; + goto err; } else { + pkg_free(boundary.s); return 1; } } else { - LM_ERR("Boundary not found after content\n"); - return -1; + LM_ERR("boundary not found after content\n"); + goto err; } } } else { + pkg_free(boundary.s); return -1; } } + err: + pkg_free(boundary.s); return -1; }

15 years, 5 months

git:master: * Small clarification in filter_body text.

by Juha Heinanen

Module: sip-router Branch: master Commit: af0d2038a36502e0d786aa62dbb8ae7378e1f5e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af0d203… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 17 21:37:36 2009 +0300 * Small clarification in filter_body text. --- modules_k/textops/doc/textops_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/textops/doc/textops_admin.xml b/modules_k/textops/doc/textops_admin.xml index 28d36e9..ce46bda 100644 --- a/modules_k/textops/doc/textops_admin.xml +++ b/modules_k/textops/doc/textops_admin.xml @@ -606,7 +606,7 @@ set_reply_body("test", "text/plain"); <function moreinfo="none">filter_body(content_type)</function> </title> <para> - Filters multipart body by leaving out all other body + Filters multipart/mixed body by leaving out all other body parts except the first body part of given type. </para> <para>Meaning of the parameters is as follows:</para>

15 years, 5 months

[ openser-Bugs-2791122 ] fr_inv_timer_avp on amd64

by SourceForge.net

Bugs item #2791122, was opened at 2009-05-13 13:07 Message generated for change (Comment added) made by effeks You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2791122&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Tobias Lindgren (effeks) Assigned to: Nobody/Anonymous (nobody) Summary: fr_inv_timer_avp on amd64 Initial Comment: Hi! When we compile kamailio 1.5.1 trunk on Debian Linux amd64 the fr_inv_time_avp timer cannot altered (the value of the AVP-variable has no effect on the timer) and seem stuck on something like 15 seconds. Compiling the same code in a 32bit chroot works fine, aswell as on any other standard 32bit system, where the timer is set to the value of the AVP as expected. /effeks ---------------------------------------------------------------------- >Comment By: Tobias Lindgren (effeks) Date: 2009-06-17 16:04 Message: Sent debugs to your email. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-06-10 13:23 Message: I did several tests and the timeout was ok. Here are my parameters: modparam("tm", "fr_timer", 15) modparam("tm", "fr_inv_timer", 60) modparam("tm", "wt_timer", 5) modparam("tm", "fr_inv_timer_avp", "$avp(i:120)") $avp(i:120) = 30; Can you get a ngrep trace and send it to me at: <miconda [at] gmail.com>? Thanks. ---------------------------------------------------------------------- Comment By: Tobias Lindgren (effeks) Date: 2009-06-05 13:23 Message: Any news? ---------------------------------------------------------------------- Comment By: Tobias Lindgren (effeks) Date: 2009-05-25 13:50 Message: The avp-value was a string, but changing it into an integer makes no difference. On 32bit it works regardless of int or str. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-25 11:49 Message: Did you check my last message? Is the timer avp integer or string value? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-05-25 11:47 Message: Any progress on this? ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-22 19:12 Message: Just saw in your last comment that you assign a string to the avp: $avp(i:10) = "25"; Should be: $avp(i:10) = 25; Can you doublecheck? ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-19 09:25 Message: OK, i am going to check the log. thanks. ---------------------------------------------------------------------- Comment By: Tobias Lindgren (effeks) Date: 2009-05-15 13:23 Message: Done, the config snippet looks something like this: modparam("tm", "fr_inv_timer_avp", "$avp(i:10)") $avp(i:10) = "25"; t_relay(); ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-15 12:07 Message: Can you run with debug=5 and attach the syslog output here? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2791122&group_…

15 years, 5 months

git:master: presence_xml: documentation for xml_ns parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d0809a64c34389d82ed1e023aa79372f721a6bbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0809a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 12 11:24:39 2009 +0300 presence_xml: documentation for xml_ns parameter - parameter that allow registering namespace prefixes for XPath handling --- modules_k/presence_xml/README | 14 ++++++++++++++ modules_k/presence_xml/doc/presence_xml_admin.xml | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README index d9fafe5..e38262c 100644 --- a/modules_k/presence_xml/README +++ b/modules_k/presence_xml/README @@ -36,6 +36,7 @@ Anca-Maria Vamanu 3.8. integrated_xcap_server (int) 3.9. xcap_server (str) 3.10. passive_mode(int) + 3.11. xml_ns (str) 4. Exported Functions 5. Installation @@ -55,6 +56,7 @@ Anca-Maria Vamanu 1.8. Set integrated_xcap_server parameter 1.9. Set xcap_server parameter 1.10. Set passive_mode parameter + 1.11. Set xml_ns parameter Chapter 1. Admin Guide @@ -78,6 +80,7 @@ Chapter 1. Admin Guide 3.8. integrated_xcap_server (int) 3.9. xcap_server (str) 3.10. passive_mode(int) + 3.11. xml_ns (str) 4. Exported Functions 5. Installation @@ -129,6 +132,7 @@ Chapter 1. Admin Guide 3.8. integrated_xcap_server (int) 3.9. xcap_server (str) 3.10. passive_mode(int) + 3.11. xml_ns (str) 3.1. db_url(str) @@ -271,6 +275,16 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") modparam("presence_xml", "passive_mode", 1) ... +3.11. xml_ns (str) + + Register xml namespace prefix. Parameter value must have the format: + 'prefix=uri'. + + Example 1.11. Set xml_ns parameter +... +modparam("presence_xml", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +... + 4. Exported Functions None to be used in configuration file. diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml index 16a22bd..cefadf0 100644 --- a/modules_k/presence_xml/doc/presence_xml_admin.xml +++ b/modules_k/presence_xml/doc/presence_xml_admin.xml @@ -297,6 +297,20 @@ modparam("presence_xml", "passive_mode", 1) </programlisting> </example> </section> + <section> + <title><varname>xml_ns</varname> (str)</title> + <para> + Register xml namespace prefix. Parameter value must have the format: + 'prefix=uri'.</para> + <example> + <title>Set <varname>xml_ns</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +... +</programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

15 years, 5 months

git:master: kex: implemented mi debug command

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bc18eab9c61678de1e7a58ffd5aca55ecadacf95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc18eab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 17 11:09:19 2009 +0200 kex: implemented mi debug command - MI command to change the debug level at runtime - uses same signature as previous Kamailio versions --- modules_k/kex/mi_core.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 52db30b..369fe59 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -48,6 +48,8 @@ #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" #include "../../version.h" +#include "../../cfg/cfg.h" +#include "../../cfg/cfg_ctx.h" #define BUILD_STR __FILE__ " compiled on "__TIME__ " " __DATE__ " with " COMPILER "\n" #define BUILD_STR_LEN (sizeof(BUILD_STR)-1) @@ -58,6 +60,7 @@ static time_t kmi_up_since; static str kmi_up_since_ctime; +static cfg_ctx_t *_kex_cfg_ctx = NULL; static int init_mi_uptime(void) { @@ -308,26 +311,30 @@ static struct mi_root *mi_kill(struct mi_root *cmd, void *param) } -#if 0 static struct mi_root *mi_debug(struct mi_root *cmd, void *param) { struct mi_root *rpl_tree; struct mi_node *node; char *p; int len; - int new_debug; + int new_debug = 0; + str group_name = {"core", 4}; + str var_name = {"debug", 5}; + void *vval; + int set = 0; + unsigned int val_type; -#ifdef CHANGEABLE_DEBUG_LEVEL node = cmd->node.kids; if (node!=NULL) { if (str2sint( &node->value, &new_debug) < 0) return init_mi_tree( 400, MI_SSTR(MI_BAD_PARM)); - } else - new_debug = *debug; -#else - new_debug = debug; -#endif - + set = 1; + } else { + if(cfg_get_by_name(_kex_cfg_ctx, &group_name, &var_name, &vval, + &val_type)!=0) + return init_mi_tree( 500, MI_SSTR(MI_INTERNAL_ERR)); + new_debug = *((int*)vval); + } rpl_tree = init_mi_tree( 200, MI_SSTR(MI_OK)); if (rpl_tree==0) return 0; @@ -340,13 +347,13 @@ static struct mi_root *mi_debug(struct mi_root *cmd, void *param) return 0; } -#ifdef CHANGEABLE_DEBUG_LEVEL - *debug = new_debug; -#endif + if(set==1) { + cfg_set_now(_kex_cfg_ctx, &group_name, &var_name, + (void *)(long)new_debug, CFG_VAR_INT); + } return rpl_tree; } -#endif static mi_export_t mi_core_cmds[] = { @@ -357,9 +364,7 @@ static mi_export_t mi_core_cmds[] = { { "which", mi_which, MI_NO_INPUT_FLAG, 0, 0 }, { "kill", mi_kill, MI_NO_INPUT_FLAG, 0, 0 }, { "ps", mi_ps, MI_NO_INPUT_FLAG, 0, 0 }, -#if 0 { "debug", mi_debug, 0, 0, 0 }, -#endif { 0, 0, 0, 0, 0} }; @@ -367,6 +372,11 @@ static mi_export_t mi_core_cmds[] = { int init_mi_core(void) { + if (cfg_register_ctx(&_kex_cfg_ctx, NULL)) { + LM_ERR("failed to register cfg context\n"); + return -1; + } + if (register_mi_mod( "core", mi_core_cmds)<0) { LM_ERR("unable to register core MI cmds\n"); return -1;

15 years, 5 months

CVS:commitlog: sip_router sctp_options.c sctp_server.c

by Andrei Pelinescu-Onciul

andrei 2009/06/17 11:12:08 CEST SER CVS Repository Modified files: . sctp_options.c sctp_server.c Log: sctp: SCTP_PEER_ADDR_PARAMS fix for older kernels On older kernels (< 2.6.27) one has to set the AF when setting a SCTP_PEER_ADDR_PARAMS socket option even if the address is the wildcard (INADDR_ANY). This affects the sctp_hbinterval and sctp_pathmaxrxt config options. Reported-by: Cristian Constantin <cristian.constantin(a)iptel.org> Revision Changes Path 1.10 +19 -5 sip_router/sctp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.c.dif… 1.30 +7 -4 sip_router/sctp_server.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.c.diff…

15 years, 5 months

CVS:commitlog: sip_router cfg.lex cfg.y core_cmd.c sctp_options.c sctp_options.h sctp_server.c

by Andrei Pelinescu-Onciul

andrei 2009/06/16 00:34:57 CEST SER CVS Repository Modified files: . cfg.lex cfg.y core_cmd.c sctp_options.c sctp_options.h sctp_server.c Log: sctp: assoc_reuse option Association reuse for replies can now be turned off (the default is on). Config name: sctp_assoc_reuse, real time name: assoc_reuse (sercmd cfg.set_now_int sctp assoc_reuse 0). Revision Changes Path 1.123 +4 -1 sip_router/cfg.lex http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.lex.diff?r1=1.… 1.180 +16 -1 sip_router/cfg.y http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.y.diff?r1=1.17… 1.40 +3 -2 sip_router/core_cmd.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/core_cmd.c.diff?r1… 1.9 +22 -1 sip_router/sctp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.c.dif… 1.6 +7 -1 sip_router/sctp_options.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.h.dif… 1.29 +3 -3 sip_router/sctp_server.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.c.diff…

15 years, 5 months

[ openser-Bugs-2740437 ] PUBLISH authentication is wrong

by SourceForge.net

Bugs item #2740437, was opened at 2009-04-07 13:28 Message generated for change (Comment added) made by klaus_darilion You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2740437&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver devel Status: Open Resolution: None Priority: 7 Private: No Submitted By: Klaus Darilion (klaus_darilion) Assigned to: Nobody/Anonymous (nobody) Summary: PUBLISH authentication is wrong Initial Comment: Hi! For PUBLISH requests, Authentication user should be checked against RURI. Thus, realm should be derived from RURI too. Can someone please review the patch - I am not sure if the usage of &(_m->parsed_uri) is correct in this situation. thanks ---------------------------------------------------------------------- >Comment By: Klaus Darilion (klaus_darilion) Date: 2009-06-15 16:14 Message: I also think it is better to just remove the automated realm-calculation and instead force to script writer to specify the realm in the config. ---------------------------------------------------------------------- Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-05-19 15:40 Message: The original question was about the default "realm" to set if ww_authorize() hasn't it set. The reporter suggested to take the default realm from the RURI domain but IMHO (as debated in the ML) this is wrong (take for example an external presence user agent which publish status for other AoR's with different domains. In this case, the PUA should authenticate with his own username (pua(a)external_domain.org) and not with the domain in the RURI (alice(a)atlanta.org). The best option, IMHO, would be never setting the default realm from any part of the request. Instead, it must be set manually by the script configurator by choosing $fd, $rd, $td... AFAIR all of this was explained in the devel maillist. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-19 09:31 Message: IMO, the from has to be auth'ed as well. Other opinions? Can we close this? Anyhow, auth module allows to use username from any field with pv_proxy|www_authorize(). proxy|www_challenge() takes any PV as realm parameter. So the behaviour can be achieved with sqlops (to load passwed from db) and auth for the rest. ---------------------------------------------------------------------- Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-04-16 15:50 Message: I copy part of my mail in devel maillist about this report: I don't agree on the patch behaviour. For PUBLISH the credentials username should be matched against the From username. For example, a presence user agent (pua@domain) could publish state for bob(a)domain.org, but we still need pua to authenticate against us. In my opinion, the logical behaviour would be: is_method("PUBLISH") { if ! check_from() { sl_send_reply("403", "You are not who you say"); exit(); } if au != fu { if fu == "sip:pua@domain" { xlog("L_INFO", "Thirdy party PUBLISH allowed for PUA \n"); } else { sl_send_reply("403", "Thirdy Party PUBLISH not allowed for you"); exit(); } } } So I consider the proposed patch as wrong since it avoids authenticated thirdy party publish. ---------------------------------------------------------------------- Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-04-14 17:23 Message: I have no checked the patch yet, but I confirm that for PUBLISH, the RURI should be checked instead of the From or To. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2740437&group_…

15 years, 5 months

CVS:commitlog: rtpproxy Makefile.in

by Maxim Sobolev

sobomax 2009/06/15 14:33:34 CEST SER CVS Repository Modified files: . Makefile.in Log: Re-gen after addition of rtpp_network.[ch]. Revision Changes Path 1.14 +4 -2 rtpproxy/Makefile.in http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/Makefile.in.diff?r1=…

15 years, 5 months

SF.net SVN: openser:[5873] branches/1.5/modules/registrar/lookup.c

by Carsten Bock

Revision: 5873 http://openser.svn.sourceforge.net/openser/?rev=5873&view=rev Author: carstenbock Date: 2009-06-15 11:39:59 +0000 (Mon, 15 Jun 2009) Log Message: ----------- "match_callid" should be initialized properly, otherwise "registered" may return false in some cases. - Reported and fixed by Min Wang (wang(a)basis-audionet.com) Modified Paths: -------------- branches/1.5/modules/registrar/lookup.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009