sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

git:master: * modules_s/xmlrpc: allow use of k ls module api

by Juha Heinanen

Module: sip-router Branch: master Commit: f90164d0f430ab891f29e82125a56eddc3cf319a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f90164d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jul 4 22:36:41 2009 +0300 * modules_s/xmlrpc: allow use of k ls module api - Added Makefile #define for choosing between s and k sl API. --- modules_s/xmlrpc/Makefile | 8 +++++++- modules_s/xmlrpc/xmlrpc.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/modules_s/xmlrpc/Makefile b/modules_s/xmlrpc/Makefile index f0d76c2..93651a6 100644 --- a/modules_s/xmlrpc/Makefile +++ b/modules_s/xmlrpc/Makefile @@ -3,6 +3,9 @@ # # WARNING: do not run this directly, it should be run by the master Makefile +# Set to true if you want to use K sl module API +USE_K_SL_API=false + include ../../Makefile.defs auto_gen= NAME=xmlrpc.so @@ -11,5 +14,8 @@ LIBS +=-lxml2 DEFS+=-DSER_MOD_INTERFACE -include ../../Makefile.modules +ifeq ($(USE_K_SL_API),true) +DEFS+=-DUSE_K_SL_API +endif +include ../../Makefile.modules diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index f97bf89..6b90298 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -55,7 +55,11 @@ #include "../../msg_translator.h" #include "../../select.h" #include "../../receive.h" /* needed by process_rpc / receive_msg() */ +#ifdef USE_K_SL_API +#include "../../modules_k/sl/sl_api.h" +#else #include "../sl/sl.h" +#endif #include "../../nonsip_hooks.h" #include "../../action.h" /* run_actions */ #include "../../script_cb.h" /* exec_*_script_cb */ @@ -378,7 +382,11 @@ static char* xmlrpc_route=0; /* default is the main route */ /** Reference to the sl (stateless replies) module of SER The sl module of SER * is needed so that the xmlrpc SER module can send replies back to clients */ +#ifdef USE_K_SL_API +struct sl_binds sl; +#else sl_api_t sl; +#endif static int xmlrpc_route_no=DEFAULT_RT; @@ -725,10 +733,20 @@ static int send_reply(sip_msg_t* msg, str* body) return -1; } +#ifdef USE_K_SL_API + str s; + s.s = "OK"; + s.len = 2; + if (sl.send_reply(msg, 200, &s) == -1) { + ERR("Error while sending reply\n"); + return -1; + } +#else if (sl.reply(msg, 200, "OK") == -1) { ERR("Error while sending reply\n"); return -1; } +#endif return 0; } @@ -1961,7 +1979,6 @@ select_row_t xmlrpc_sel[] = { static int mod_init(void) { - bind_sl_t bind_sl; struct nonsip_hook nsh; int route_no; @@ -1984,12 +2001,20 @@ static int mod_init(void) * We will need sl_send_reply from stateless * module for sending replies */ - bind_sl = (bind_sl_t)find_export("bind_sl", 0, 0); +#ifdef USE_K_SL_API + if (load_sl_api(&sl)!=0) { + ERR("This module requires sl module\n"); + return -1; + } +#else + bind_sl_t bind_sl; + bind_sl = (bind_sl_t)find_export("bind_sl", 0, 0); if (!bind_sl) { ERR("This module requires sl module\n"); return -1; } if (bind_sl(&sl) < 0) return -1; +#endif func_param.send = (rpc_send_f)rpc_send; func_param.fault = (rpc_fault_f)rpc_fault;

15 years, 4 months

git:master: tm: fix cloning parsed uri for to/from headers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d9d008e34130f2e85e3df78580e589f98f8c447a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9d008e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jul 4 21:10:36 2009 +0200 tm: fix cloning parsed uri for to/from headers - parsed structure was not cloned - several fields in struct uri were not cloned --- modules/tm/sip_msg.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index 6b31eb0..65c2ac8 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -288,6 +288,24 @@ static void uri_trans(char *new_buf, char *org_buf, struct sip_uri *uri) uri->port.s=translate_pointer(new_buf,org_buf,uri->port.s); uri->params.s=translate_pointer(new_buf,org_buf,uri->params.s); uri->headers.s=translate_pointer(new_buf,org_buf,uri->headers.s); + /* parameters */ + uri->transport.s=translate_pointer(new_buf,org_buf,uri->transport.s); + uri->ttl.s=translate_pointer(new_buf,org_buf,uri->ttl.s); + uri->user_param.s=translate_pointer(new_buf,org_buf,uri->user_param.s); + uri->maddr.s=translate_pointer(new_buf,org_buf,uri->maddr.s); + uri->method.s=translate_pointer(new_buf,org_buf,uri->method.s); + uri->lr.s=translate_pointer(new_buf,org_buf,uri->lr.s); + uri->r2.s=translate_pointer(new_buf,org_buf,uri->r2.s); + /* values */ + uri->transport_val.s + =translate_pointer(new_buf,org_buf,uri->transport_val.s); + uri->ttl_val.s=translate_pointer(new_buf,org_buf,uri->ttl_val.s); + uri->user_param_val.s + =translate_pointer(new_buf,org_buf,uri->user_param_val.s); + uri->maddr_val.s=translate_pointer(new_buf,org_buf,uri->maddr_val.s); + uri->method_val.s=translate_pointer(new_buf,org_buf,uri->method_val.s); + uri->lr_val.s=translate_pointer(new_buf,org_buf,uri->lr_val.s); + uri->r2_val.s=translate_pointer(new_buf,org_buf,uri->r2_val.s); } @@ -685,6 +703,10 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) ((struct to_body*)new_hdr->parsed)->tag_value.s = translate_pointer( new_msg->buf , org_msg->buf , ((struct to_body*)hdr->parsed)->tag_value.s ); + if ( (((struct to_body*)new_hdr->parsed)->parsed_uri.user.s) + || (((struct to_body*)new_hdr->parsed)->parsed_uri.host.s) ) + uri_trans(new_msg->buf, org_msg->buf, + &((struct to_body*)new_hdr->parsed)->parsed_uri); /*to params*/ to_prm = ((struct to_body*)(hdr->parsed))->param_lst; for(;to_prm;to_prm=to_prm->next) {

15 years, 4 months

lookup_domain does not accept pvar $var as argument

by jh＠tutpro.com

at one point in my script i need to make this kind of domain_lookup: xlog("L_INFO", "looking for domain $var(from_uri_domain)\n"); lookup_domain("$fd", "$var(from_uri_domain)"); looks like second argument is not understood. because i get into syslog Jul 4 20:29:41 localhost /usr/sbin/sip-router[26491]: INFO: looking for domain test.fi Jul 4 20:29:41 localhost /usr/sbin/sip-router[26491]: ERROR: domain [domain_mod.c:531]: Cannot get domain name to lookup the latter line comes, when i changed in lookup_domain this DBG to ERR: if (get_str_fparam(&domain, msg, (fparam_t*)fp) != 0) { ERR("Cannot get domain name to lookup\n"); return -1; } i cannot replace $var(from_uri_domain) with a select. so is this it? should i go back to the original plan and add attribute support to k's domain module? -- juha

15 years, 4 months

git:master: modules_s/xmlrpc: fixed typo in name of module parameter

by Juha Heinanen

Module: sip-router Branch: master Commit: f717262c67a45419d457989cf408fd81264ba900 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f717262… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jul 4 15:17:58 2009 +0300 modules_s/xmlrpc: fixed typo in name of module parameter - enable_instrospection => enable_introspection. --- modules_s/xmlrpc/xmlrpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index 4ca7ab2..f97bf89 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -397,7 +397,7 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"enable_instrospection", PARAM_INT, &enable_introspection}, + {"enable_introspection", PARAM_INT, &enable_introspection}, {"route", PARAM_STRING, &xmlrpc_route}, {0, 0, 0} };

15 years, 4 months

wrong warning message during config check

by jh＠tutpro.com

line if (is_local("@ruri.host")) { in branch_route block that caused "Command cannot be used in the block" parse error, also caused warning: 0(4462) WARNING: tm [tm.c:503]: WARNING: on_sl_reply("stateless_reply"): empty/non existing route when i changed the above line to if (1) { both the parse error and the warning disappeared. looks like syntax checking got somehow confused and produced warning on something that was ok. -- juha

15 years, 4 months

is_local cannot be used in branch_route block

by jh＠tutpro.com

i tried to replace k domain module with s, but got this kind of show stopper: 0(3499) : <core> [cfg.y:3020]: parse error in config file, line 1877, column 30: Command cannot be used in the block the line in question is if (is_local("@ruri.host")) { and the block is branch_route block. can BRANCH_ROUTE be just added to the list {"is_local", is_local, 1, fixup_var_str_1, REQUEST_ROUTE|FAILURE_ROUTE }, or will it result into problems? -- juha

15 years, 4 months

[Kamailio] Dialog bridge_controller URI.

by Alex Balashov

Greetings, I've begun heavily using dlg_bridge() and SEMS for some applications - dlg_bridge() was a brilliant idea, thank you very much Daniel. This finally lets me get out of using Asterisk for certain media-related purposes entirely. Problem is that the bridge_controller From URI is statically defined in the configuration. When outbound leg is initiated that, upon pickup, is REFER'd to an announcement RURI on SEMS, the caller ID hence always stays the same. Would it be possible to make this parameter dynamic, i.e. from an AVP? I suppose a useful workaround in the meantime is to simply override that RURI with whatever I prefer in an appended RPID header, but in this case I am dealing with a gateway that does not trust RPID over From. :( Cheers, -- Alex -- Alex Balashov Evariste Systems Web : http://www.evaristesys.com/ Tel : (+1) (678) 954-0670 Direct : (+1) (678) 954-0671 Mobile : (+1) (678) 237-1775

15 years, 4 months

LCR/CR and prefix mask (REGEX?)

by Edson - Lists

Hi... Normally, dial plans are based on some sort of mask. For example, in Brazil, local fix destination have all 8 digits and start with [2-5] (mask [2-5][0-9]{7}), local mobile numbers have also 8 digits, but start with [6-9] (mask [6-9][0-9]{7}); so all local numbers mask would be [2-9][0-9]{7}... I could continue but You got the idea... ;) Well, what I'm trying to find is a way to use this kind of definition in place of (or as) the 'prefix' field, either from LCR or CR module. The advantages are that with this, not only prefix are matched, but also some sanity checks, like length, can be done in a single step. Is this a new feature or is there a way to accomplish this? Edson.

15 years, 4 months

type column of domain_attrs table

by jh＠tutpro.com

what are the possible values of 'type' column of 'domain_attrs' table? it would be nice if s domain module README would contain a reference to a file where they are described. -- juha

15 years, 4 months

git:master: core: km_parse_avp_spec() update

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9c77d5329b45a493b741527bc8902456dbf51e7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c77d53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 3 20:19:47 2009 +0200 core: km_parse_avp_spec() update - fallback to ser style of avp name in $avp(id) if 'id' has no ':' and there is no avp alias defined - behavior was changed when I added support for K compatible avp aliases in pv module - issue reported by Andrei Pelinscu-Onciul --- usr_avp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index 6c06721..53f38e4 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -1041,11 +1041,11 @@ int km_parse_avp_spec( str *name, int *type, int_str *avp_name) p = (char*)memchr((void*)name->s, ':', name->len); if (p==NULL) { - /* it's an avp alias */ - return lookup_avp_galias( name, type, avp_name); - } else { - return parse_avp_name( name, type, avp_name, &index); + /* might be kamailio avp alias or ser avp name style */ + if(lookup_avp_galias( name, type, avp_name)==0) + return 0; /* found */ } + return parse_avp_name( name, type, avp_name, &index); }

15 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009