sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:master: modules_k/nathelper: add_contact_alias adds <> s around contact URI

by Juha Heinanen

Module: sip-router Branch: master Commit: 3ff9594a30eff2d18e6ea0595c5f82f878eaca1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ff9594… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. (cherry picked from commit f5ef15fee0c3bf09adf2506effa0895f72af9034) --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 51c1086..52c5e5f 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

13 years, 3 months

git:master: modules/tm: new implementation of load_contacts()/next_contacts ()

by Juha Heinanen

Module: sip-router Branch: master Commit: e973bbe5e7310861f77b17ce0afaf1cca35fe48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e973bbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:38:41 2010 +0300 modules/tm: new implementation of load_contacts()/next_contacts() - Simpler implementation of load_contacts()/next_contacts() functions based on recent changes related to Request-URI handling. - Function next_contacts() does not anymore set any timers. Check contact_avp and call t_set_fr() before calling t_relay() instead. - Removed fr_timer_next module parameter, because it is not needed anymore. --- modules/tm/README | 255 ++++++++++++++------------------------ modules/tm/doc/functions.xml | 51 +++----- modules/tm/doc/params.xml | 73 ----------- modules/tm/doc/tm.xml | 15 +-- modules/tm/t_serial.c | 279 ++++++++++++------------------------------ modules/tm/tm.c | 1 - 6 files changed, 190 insertions(+), 484 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e97…

13 years, 4 months

lockup("location") doesn't find a "sip" registration if RURI scheme is "sips"

by Iñaki Baz Castillo

Hi, "sip:alice@domain.org" is registered in Kamailio. If the proxy receives a request for "sips:alice@domain.org" and invokes "lookup(location)" the function doesn't retrieve the registration of alice. But it should: RFC 5630 section 3.3: When used as the Request-URI of a request, the SIPS scheme signifies that each hop over which the request is forwarded, until the request reaches the SIP entity responsible for the domain portion of the Request-URI, must be secured with TLS; once it reaches the domain in question it is handled in accordance with local security and routing policy, quite possibly using TLS for any last hop to a UAS. When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. Note the last phrase: When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. This is, the entire path *until* the proxy responsible for the domain in the RURI must be secure (TLS) but it's not required (local policy) that the destination proxy dellivers the request to the destination user using TLS. So IMHO lockup(location) should not inspect the registration schema. Am I wrong? -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years, 6 months

question about module function arguments

by Juha Heinanen

i understood that module functions can now have an arbitrary number of string, int and pseudo var arguments, where string arguments can possibly also contain pseudo variables. some time ago i asked an example on how this is done, but didn't get any reply. so i'll try again. for example, allow_trusted function is now defined like this: {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, how can i add a third argument to the function without needing to define yet another fixup_pvar_pvar_something? -- juha

13 years, 8 months

Re: [sr-dev] planning release of v3.1.2

by Bernhard Suttner

Hi, whats about: http://sip-router.org/tracker/index.php?do=details&task_id=108 I think that some users are trying to register to an asterisk system. Or does somebody have a solution for that? A new release would be nice!!! Thanks in advance. Best regards, Bernhard ----- Original Message ----- From: Daniel-Constantin Mierla [mailto:miconda@gmail.com] To: kamailio [mailto:sr-users@lists.sip-router.org], sr-dev [mailto:sr-dev@lists.sip-router.org] Sent: Fri, 28 Jan 2011 20:15:50 +0100 Subject: [sr-dev] planning release of v3.1.2 > Hello, > > I think it is time to release v3.1.2, first date that comes in my mind > is next Thursday if everyone feels it is enough time to take care of > backporting any fix he/she did and it is not yet there. That will > provide us a fresh release for the FOSDEM event. If not, then maybe the > other week, Tuesday, so the participants at the Kamailio Devel training > in Barcelona can practice on it. > > Soon after we should plan also a release for previous stable, branch 3.0. > > Anyone having other options? > > Thanks, > Daniel > > -- > Daniel-Constantin Mierla > http://www.asipto.com > > > _______________________________________________ > sr-dev mailing list > sr-dev(a)lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >

13 years, 9 months

planning release of v3.1.2

by Daniel-Constantin Mierla

Hello, I think it is time to release v3.1.2, first date that comes in my mind is next Thursday if everyone feels it is enough time to take care of backporting any fix he/she did and it is not yet there. That will provide us a fresh release for the FOSDEM event. If not, then maybe the other week, Tuesday, so the participants at the Kamailio Devel training in Barcelona can practice on it. Soon after we should plan also a release for previous stable, branch 3.0. Anyone having other options? Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

13 years, 10 months

Load_gw failed

by Thiago Maluf

Hi Kamailio Users, I'm trying to use LCR module in Kamailio 3.1.1 and I', having some problems with this function (load_gws). I'm my kamailio.cfg , I have this route: # SEARCH DEST route[NUMBER] { xlog("L_ALERT", "NUMBER IS $rU \n"); if ($rU=~"^55211020[0-9]{4}$") { # IS MY USERS route(LDAP_NUM2USER); } else { # NOT IS MY USER if (!load_gws(1,$rU)) { xlog("L_ALERT", "LOAD LOCAL GW FAILED $rU \n"); route(DSER); return; } else { xlog("L_ALERT", "LOAD GW DEBUG $avp(i:709)\n"); } ; if (!next_gw()) { xlog("L_ALERT", "NEXT LOCAL GW FAILED\n"); sl_send_reply("503", "Service not available - No gateways"); return; }; setflag(29); route(RELAY); return; }; }; When my call arrive to load_gws, I have this problem: (2198) ERROR: <core> [action.c:1158]: runtime fixup failed for load_gws param 2 (2198) ERROR: <core> [action.c:1511]: run action error at: /etc/kamailio/kamailio.cfg:472 I already saw the Kamailio Code and this error doesn't make sense. Would somebody Help me with it? Very thanks, Thiago Maluf. ---------------------------------------------------------------- Thiago Maluf Resende Tel: +55 21 9700-9113 e-mail: malufrj(a)gmail.com

13 years, 10 months

RPM Packaging Issues

by Martin Hoffmann

Heisann, the last couple of days, I had the pleasure of building Kamailio 3.1.1 RPMs. Now that the trauma is slowly wearing off, I have two things worth discussing here (or so I believe). One is that I was building for x86_64. In this system, libraries should go into lib64 but module and library directory seem to be hardcoded to lib/$(MAIN_NAME)/ in Makefile.defs. Did I miss the place to switch this or should one be reconsidered? Simply moving the whole /usr/lib/kamailio tree to /usr/lib64/kamailio didn't quite do the trick since the path seems to be embedded in the modules that require some of the shared libraries. Second, there was some fun little breakage with the MySQL module. Because of the way the module's Makefile adds -L directories to the LIBS variable, the linker happily linked against libmysqlclient16.a but somehow forgot to add the libraries that libmysqlclient in turn depends on. I am not quite sure on the mechanics, but presumably libtool takes care of this in the GNU toolchain?[0] In any case, I didn't really want a statically linked MySQL client to begin with. Dropping all the -Ls did that trick. That may or may not be the proper way to do this. I have limited the build to the modules I need or that don't depend on anything funny (this is RHES/Centos, so all you get is Gnome and Firefox and other things very important for servers). Given the time invested so far, I am willing to test my newfound knowledge and give building a full set of packages a try, unless there is dependencies particularly hard to satisfy. I believe Ovidiu has done the RPMs for Centos so far. Maybe we can coordinate work on this? Best regards, Mar"don't you dare saying Debian"tin [0] If the .la files are used also if you don't use the whole automagick, then the reason possibly is that the libmysqlclient16.la that comes with MySQL's own community RPMs is broken since it doesn't list any dependencies. Maybe everything is fine with the MySQL client packages that come with Centos 5. Unfortunately, they date from the late Cambrian or so I have been given to understand.

13 years, 10 months

git:master: cfg framework: @cfg_get supports nested calls

by Miklos Tirpak

Module: sip-router Branch: master Commit: 5afd88dd704ff40b3662157d7ea8217e1332b1b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5afd88d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jan 31 17:36:59 2011 +0100 cfg framework: @cfg_get supports nested calls @cfg_get.<group>.<variable> makes use of the already implemented nested select functions to parse the returned value. The following nested calls are supported: - @cfg.get.<group>.<variable>.nameaddr... - @cfg.get.<group>.<variable>.uri... - @cfg.get.<group>.<variable>.params... Credits go to Tomas Mandys --- cfg/cfg_select.c | 7 +++++-- select_core.h | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cfg/cfg_select.c b/cfg/cfg_select.c index cb0a2f1..e68f9dc 100644 --- a/cfg/cfg_select.c +++ b/cfg/cfg_select.c @@ -149,8 +149,8 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) /* fixup call */ /* two parameters are mandatory, group name and variable name */ - if (s->n != 3) { - LOG(L_ERR, "ERROR: select_cfg_var(): two parameters are expected\n"); + if (s->n < 3) { + LOG(L_ERR, "ERROR: select_cfg_var(): At least two parameters are expected\n"); return -1; } @@ -240,6 +240,9 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) return 0; } +/* fake function to eat the first parameter of @cfg_get */ +ABSTRACT_F(select_cfg_var1) + /* fix-up function for read_cfg_var() * * return value: diff --git a/select_core.h b/select_core.h index 8cec775..b1a8114 100644 --- a/select_core.h +++ b/select_core.h @@ -215,6 +215,7 @@ SELECT_F(select_identity) SELECT_F(select_identity_info) SELECT_F(select_cfg_var) +SELECT_F(select_cfg_var1) SELECT_F(cfg_selected_inst) static select_row_t select_core[] = { @@ -410,9 +411,14 @@ static select_row_t select_core[] = { { NULL, SEL_PARAM_STR, STR_STATIC_INIT("identity"), select_identity, 0}, { NULL, SEL_PARAM_STR, STR_STATIC_INIT("identity_info"), select_identity_info, 0}, - { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_get"), select_cfg_var, CONSUME_ALL | FIXUP_CALL }, + { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_get"), select_cfg_var1, SEL_PARAM_EXPECTED | CONSUME_NEXT_STR}, + { select_cfg_var1, SEL_PARAM_STR, STR_NULL, select_cfg_var, FIXUP_CALL }, { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_selected"), cfg_selected_inst, CONSUME_NEXT_STR | FIXUP_CALL }, + { select_cfg_var, SEL_PARAM_STR, STR_STATIC_INIT("nameaddr"), select_any_nameaddr, NESTED | CONSUME_NEXT_STR}, + { select_cfg_var, SEL_PARAM_STR, STR_STATIC_INIT("uri"), select_any_uri, NESTED | CONSUME_NEXT_STR}, + { select_cfg_var, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_anyheader_params, NESTED}, + { NULL, SEL_PARAM_INT, STR_NULL, NULL, 0} };

13 years, 10 months

git:master: cfg framework: @cfg_selected.group added

by Miklos Tirpak

Module: sip-router Branch: master Commit: f9ad9ccf83b9341fa5a063cb3bd844567f3f06e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9ad9cc… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jan 31 12:45:57 2011 +0100 cfg framework: @cfg_selected.group added @cfg_selected.<group_name> returns the selected instance id of the specified group. If no group instance is selected, i.e. the default is used, then empty string is returned. --- cfg/cfg_select.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++------- cfg/cfg_select.h | 3 ++ select_core.h | 2 + 3 files changed, 94 insertions(+), 13 deletions(-) diff --git a/cfg/cfg_select.c b/cfg/cfg_select.c index 68c7e41..cb0a2f1 100644 --- a/cfg/cfg_select.c +++ b/cfg/cfg_select.c @@ -60,14 +60,17 @@ static int cfg_new_select(str *gname, str *vname, void **group_p, void **var_p) if (!sel->gname.s) goto error; memcpy(sel->gname.s, gname->s, gname->len); sel->gname.len = gname->len; + sel->group_p = group_p; - sel->vname.s = (char *)pkg_malloc(sizeof(char)*vname->len); - if (!sel->vname.s) goto error; - memcpy(sel->vname.s, vname->s, vname->len); - sel->vname.len = vname->len; + if (vname) { + sel->vname.s = (char *)pkg_malloc(sizeof(char)*vname->len); + if (!sel->vname.s) goto error; + memcpy(sel->vname.s, vname->s, vname->len); + sel->vname.len = vname->len; + + sel->var_p = var_p; + } - sel->group_p = group_p; - sel->var_p = var_p; sel->next = cfg_non_fixed_selects; cfg_non_fixed_selects = sel; @@ -111,14 +114,23 @@ int cfg_fixup_selects() for (sel=cfg_non_fixed_selects; sel; sel=sel->next) { - if (cfg_lookup_var(&sel->gname, &sel->vname, &group, &var)) { - LOG(L_ERR, "ERROR: cfg_parse_selects(): unknown variable: %.*s.%.*s\n", - sel->gname.len, sel->gname.s, - sel->vname.len, sel->vname.s); - return -1; + if (sel->var_p) { + if (cfg_lookup_var(&sel->gname, &sel->vname, &group, &var)) { + LOG(L_ERR, "ERROR: cfg_parse_selects(): unknown variable: %.*s.%.*s\n", + sel->gname.len, sel->gname.s, + sel->vname.len, sel->vname.s); + return -1; + } + *(sel->group_p) = (void *)group; + *(sel->var_p) = (void *)var; + } else { + if (!(group = cfg_lookup_group(sel->gname.s, sel->gname.len))) { + LOG(L_ERR, "ERROR: cfg_parse_selects(): unknown configuration group: %.*s\n", + sel->gname.len, sel->gname.s); + return -1; + } + *(sel->group_p) = (void *)group; } - *(sel->group_p) = (void *)group; - *(sel->var_p) = (void *)var; } /* the select list is not needed anymore */ cfg_free_selects(); @@ -360,3 +372,67 @@ int read_cfg_var_str(struct cfg_read_handle *read_handle, str *val) *val = *(str *)(v2); return 0; } + +/* return the selected group instance */ +int cfg_selected_inst(str *res, select_t *s, struct sip_msg *msg) +{ + cfg_group_t *group; + cfg_group_inst_t *inst; + + if (msg == NULL) { + /* fixup call */ + + /* one parameter is mandatory: group name */ + if (s->n != 2) { + LOG(L_ERR, "ERROR: selected_inst(): One parameter is expected\n"); + return -1; + } + + if (s->params[1].type != SEL_PARAM_STR) { + LOG(L_ERR, "ERROR: selected_inst(): string parameter is expected\n"); + return -1; + } + + /* look-up the group and the variable */ + if (!(group = cfg_lookup_group(s->params[1].v.s.s, s->params[1].v.s.len))) { + if (cfg_shmized) { + LOG(L_ERR, "ERROR: selected_inst(): unknown configuration group: %.*s\n", + s->params[1].v.s.len, s->params[1].v.s.s); + return -1; + } + /* The group was not found, add it to the non-fixed select list. + * So we act as if the fixup was successful, and we retry it later */ + if (cfg_new_select(&s->params[1].v.s, NULL, + &s->params[1].v.p, NULL)) + return -1; + + LOG(L_DBG, "DEBUG: selected_inst(): select fixup is postponed: %.*s\n", + s->params[1].v.s.len, s->params[1].v.s.s); + + s->params[1].type = SEL_PARAM_PTR; + s->params[1].v.p = NULL; + + return 0; + } + + s->params[1].type = SEL_PARAM_PTR; + s->params[1].v.p = (void *)group; + + return 1; + } + + group = (cfg_group_t *)s->params[1].v.p; + if (!group) return -1; + + /* Get the current group instance from the group handle. */ + inst = CFG_HANDLE_TO_GINST(*(group->handle)); + + if (inst) { + res->s = int2str(inst->id, &res->len); + } else { + res->s = ""; + res->len = 0; + } + return 0; +} + diff --git a/cfg/cfg_select.h b/cfg/cfg_select.h index b7d454e..743b707 100644 --- a/cfg/cfg_select.h +++ b/cfg/cfg_select.h @@ -61,4 +61,7 @@ unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val); int read_cfg_var_int(struct cfg_read_handle *read_handle, int *val); int read_cfg_var_str(struct cfg_read_handle *read_handle, str *val); +/* return the selected group instance */ +int cfg_selected_inst(str *res, select_t *s, struct sip_msg *msg); + #endif /* _CFG_SELECT_H */ diff --git a/select_core.h b/select_core.h index d28e0e6..8cec775 100644 --- a/select_core.h +++ b/select_core.h @@ -215,6 +215,7 @@ SELECT_F(select_identity) SELECT_F(select_identity_info) SELECT_F(select_cfg_var) +SELECT_F(cfg_selected_inst) static select_row_t select_core[] = { { NULL, SEL_PARAM_STR, STR_STATIC_INIT("ruri"), select_ruri, 0}, /* not the same as request.uri because it is involved by new_uri */ @@ -410,6 +411,7 @@ static select_row_t select_core[] = { { NULL, SEL_PARAM_STR, STR_STATIC_INIT("identity_info"), select_identity_info, 0}, { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_get"), select_cfg_var, CONSUME_ALL | FIXUP_CALL }, + { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_selected"), cfg_selected_inst, CONSUME_NEXT_STR | FIXUP_CALL }, { NULL, SEL_PARAM_INT, STR_NULL, NULL, 0} };

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011