sr-dev

sr-dev@lists.kamailio.org

44307 discussions

Reseting a pseudo-variable for each new request/response

by Iñaki Baz Castillo

Hi, in a module I'm writting I export a script function which gives value to a new pseudo-variable. This pv is stored in a global variable into each worker process. I don't know how to solve this issue: - A request is handled by worker-1. - The script calls to the module function so the pv is filled (it's value is stored in a global str within the process). - Later in the script I can access to $new_pv (it reads the global str in the pv_get_new_pv() function). - The request processing ends (i.e: t_relay). - After some time the same worker-1 receives a new request. - If the script reads $new_pv (without calling the module function before) it will get the value generated during the previous SIP request. Of course the script configuration shouldn't try to read $new_pv without calling first to the exported function, but anyhow this could happen (due to a bad script file). Is there an ellegant way to avoid this? This is, I would like that when a process receives a request (or a response) $new_pv gets automatically reseted (to NULL), prior to executing the script logic. In this way accessing to $new_pv without calling the module function would return an empty value. Is it possible? how do other modules handle this case? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 4 months

git:3.1: modules/auth: fixed comment in nonce_count example

by Juha Heinanen

Module: sip-router Branch: 3.1 Commit: 405fb620d1bba43c159012772175f533a40a3a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=405fb62… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 7 15:57:27 2010 +0300 modules/auth: fixed comment in nonce_count example --- modules/auth/README | 6 ++++-- modules/auth/doc/params.xml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index e70cf07..92e4641 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index af44e2a..ad84251 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the

14 years, 4 months

git:master: modules/auth: fixed comment in nonce_count example

by Juha Heinanen

Module: sip-router Branch: master Commit: d5634f0e2e9f25395e312a98aa6814d78e39b16f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5634f0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 7 15:57:27 2010 +0300 modules/auth: fixed comment in nonce_count example --- modules/auth/README | 6 ++++-- modules/auth/doc/params.xml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index e70cf07..92e4641 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index af44e2a..ad84251 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the

14 years, 4 months

git:tirpi/cfg_framework_multivalue: ctl: rpc-> scan does not immediately send out errors

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 77576163bacf3d25ba5694563df173ce2aa4aa5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7757616… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Oct 5 16:09:27 2010 +0200 ctl: rpc->scan does not immediately send out errors When the rpc scan function cannot read a parameter because of a type mismatch, the function only prepares the error reply but does not send it out immediately. The scan can be retried with different parameter specification which resets the prepared error message. This allows variable types of parameters of the same rpc function, for example: if (rpc->scan(c, "d", &i) == 1) /* int parameter */ else if (rpc->scan(c, "s", &ch) == 1) /* char* parameter */ else return /* error */ --- modules/ctl/binrpc_run.c | 124 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 99 insertions(+), 25 deletions(-) diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 989f889..4732c19 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -97,6 +97,8 @@ struct binrpc_ctx{ char* method; struct binrpc_gc_block* gc; /**< garbage collection */ int replied; + int err_code; + str err_phrase; /**< Leading zero must be included! */ }; @@ -388,6 +390,10 @@ inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) pkg_free(ctx->out.pkt.body); ctx->out.pkt.body=0; } + if (ctx->err_phrase.s){ + pkg_free(ctx->err_phrase.s); + ctx->err_phrase.s=NULL; + } binrpc_gc_collect(ctx); } @@ -395,32 +401,23 @@ inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) #define MAX_FAULT_LEN 256 #define FAULT_START_BUF (3 /* maxint*/+2/*max str header*/) -static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) +static void _rpc_fault(struct binrpc_ctx* ctx, int code, + char *phrase, int phrase_len) { - char buf[MAX_FAULT_LEN]; static unsigned char fault_start[FAULT_START_BUF]; static unsigned char hdr[BINRPC_MAX_HDR_SIZE]; struct iovec v[3]; struct binrpc_pkt body; int b_len; - va_list ap; - int len; int hdr_len; int err; - + if (ctx->replied){ LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" " more then once\n", ctx->method?ctx->method:""); return; } err=0; - va_start(ap, fmt); - len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ - if ((len<0) || (len > MAX_FAULT_LEN)) - len=MAX_FAULT_LEN-1; - va_end(ap); - - len++; /* vnsprintf doesn't include the terminating 0 */ err=binrpc_init_pkt(&body, fault_start, FAULT_START_BUF); if (err<0){ LOG(L_ERR, "ERROR: binrpc_init_pkt error\n"); @@ -429,22 +426,22 @@ static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) /* adding a fault "manually" to avoid extra memcpys */ err=binrpc_addint(&body, code); if (err<0){ - LOG(L_ERR, "ERROR: rpc_fault: addint error\n"); + LOG(L_ERR, "ERROR: _rpc_fault: addint error\n"); goto error; } - err=binrpc_add_str_mark(&body, BINRPC_T_STR, len); + err=binrpc_add_str_mark(&body, BINRPC_T_STR, phrase_len); if (err<0){ - LOG(L_ERR, "ERROR: rpc_fault: add_str_mark error\n"); + LOG(L_ERR, "ERROR: _rpc_fault: add_str_mark error\n"); goto error; } /* - err=binrpc_addfault(&body, code, buf, len); + err=binrpc_addfault(&body, code, phrase, phrase_len); if (err<0){ LOG(L_ERR, "ERROR: binrpc_addfault error\n"); goto error; }*/ b_len=binrpc_pkt_len(&body); - err=hdr_len=binrpc_build_hdr(BINRPC_FAULT, b_len+len, + err=hdr_len=binrpc_build_hdr(BINRPC_FAULT, b_len+phrase_len, ctx->in.ctx.cookie, hdr, BINRPC_MAX_HDR_SIZE); if (err<0){ LOG(L_ERR, "ERROR: binrpc_build_hdr error\n"); @@ -454,25 +451,90 @@ static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) v[0].iov_len=hdr_len; v[1].iov_base=body.body; v[1].iov_len=b_len; - v[2].iov_base=buf; - v[2].iov_len=len; + v[2].iov_base=phrase; + v[2].iov_len=phrase_len; if ((err=sock_send_v(ctx->send_h, v, 3))<0){ if (err==-2){ - LOG(L_ERR, "ERROR: binrpc_fault: send failed: " + LOG(L_ERR, "ERROR: _rpc_fault: send failed: " "datagram too big\n"); return; } - LOG(L_ERR, "ERROR: binrpc_fault: send failed\n"); + LOG(L_ERR, "ERROR: _rpc_fault: send failed\n"); return; } ctx->replied=1; return; error: - LOG(L_ERR, "ERROR: binrpc_fault: binrpc_* failed with: %s (%d)\n", + LOG(L_ERR, "ERROR: _rpc_fault: binrpc_* failed with: %s (%d)\n", binrpc_error(err), err); } +static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) +{ + char buf[MAX_FAULT_LEN]; + va_list ap; + int len; + if (ctx->replied){ + LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" + " more then once\n", ctx->method?ctx->method:""); + return; + } + va_start(ap, fmt); + len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ + if ((len<0) || (len > MAX_FAULT_LEN)) + len=MAX_FAULT_LEN-1; + va_end(ap); + + len++; /* vnsprintf doesn't include the terminating 0 */ + return _rpc_fault(ctx, code, buf, len); +} + +/* Prepare the error reply without sending out the message */ +static int rpc_fault_prepare(struct binrpc_ctx* ctx, int code, char* fmt, ...) +{ + char buf[MAX_FAULT_LEN]; + va_list ap; + int len; + + if (ctx->replied){ + LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" + " more then once\n", ctx->method?ctx->method:""); + return -1; + } + va_start(ap, fmt); + len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ + if ((len<0) || (len > MAX_FAULT_LEN)) + len=MAX_FAULT_LEN-1; + va_end(ap); + + len++; /* vnsprintf doesn't include the terminating 0 */ + + ctx->err_code = code; + if (ctx->err_phrase.s) + pkg_free(ctx->err_phrase.s); + ctx->err_phrase.s = (char*)pkg_malloc(sizeof(char)*len); + if (!ctx->err_phrase.s) { + ctx->err_code = 0; + ctx->err_phrase.len = 0; + LOG(L_ERR, "ERROR: rpc_fault_prepare: not enough memory\n"); + return -1; + } + memcpy(ctx->err_phrase.s, buf, len); + ctx->err_phrase.len = len; + return 0; +} + +/* Reset the saved error code */ +static void rpc_fault_reset(struct binrpc_ctx* ctx) +{ + ctx->err_code = 0; + if (ctx->err_phrase.s) { + pkg_free(ctx->err_phrase.s); + ctx->err_phrase.s = NULL; + ctx->err_phrase.len = 0; + } +} /* build the reply from the current body */ static int rpc_send(struct binrpc_ctx* ctx) @@ -596,14 +658,21 @@ int process_rpc_req(unsigned char* buf, int size, int* bytes_needed, f_ctx.method=val.u.strval.s; rpc_e->function(&binrpc_callbacks, &f_ctx); if (f_ctx.replied==0){ + if ((binrpc_pkt_len(&f_ctx.out.pkt)==0) + && f_ctx.err_code && f_ctx.err_phrase.s + ) { + _rpc_fault(&f_ctx, f_ctx.err_code, + f_ctx.err_phrase.s, f_ctx.err_phrase.len); /* to get an error reply if the rpc handlers hasn't replied * uncomment the following code: - * if (binrpc_pkt_len(&f_ctx.out.pkt)==0){ + * } else if (binrpc_pkt_len(&f_ctx.out.pkt)==0){ rpc_fault(&f_ctx, 500, "internal server error: no reply"); LOG(L_ERR, "ERROR: rpc method %s hasn't replied\n", val.u.strval.s); - }else */ + */ + } else { rpc_send(&f_ctx); + } } end: *bytes_needed=0; /* full read */ @@ -749,6 +818,9 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) double d; str* s; + /* clear the previously saved error code */ + rpc_fault_reset(ctx); + va_start(ap, fmt); orig_fmt=fmt; nofault = 0; @@ -823,8 +895,10 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) va_end(ap); return (int)(fmt-orig_fmt)-modifiers; error_read: + /* Do not immediately send out the error message, the user might retry the scan with + different parameters */ if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) - rpc_fault(ctx, 400, "error at parameter %d: expected %s type but" + rpc_fault_prepare(ctx, 400, "error at parameter %d: expected %s type but" " %s", ctx->in.record_no, rpc_type_name(v.type), binrpc_error(err)); /*

14 years, 4 months

[ openser-Feature Requests-3082812 ] comment2, zolpidem, winston cigarette adatives, allopurinol

by SourceForge.net

Feature Requests item #3082812, was opened at 2010-10-07 08:30 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3082812&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: core Group: ver devel Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: comment2, zolpidem, winston cigarette adatives, allopurinol Initial Comment: comment2, zolpidem, winston cigarette adatives, allopurinol without prescription, ultram, alprazolam, pall mall cigarettes, propranolol used, adult dating sites, breastfeed and metformin, reductil, boards cat prednisone, dunhill international cigarettes, baclofen side effects, christian dating website singles, dunhill menthol cigarettes, lipitor, book buy de fluoxetine guest site, female spray viagra, ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3082812&group_…

14 years, 4 months

tls warning

by Juha Heinanen

when i start sr, i get this warning: Oct 2 12:13:12 sip /usr/sbin/sip-proxy[10603]: WARNING: tls [tls_init.c:592]: init_tls_h(): tls: ser compiled without MALLOC_STATS support: the workaround for low mem. openssl bugs will _not_ work if TLS is enabled when sr is build, would it be possible to automatically compile it also with MALLOC_STATS support so that the workaround would work? -- juha

14 years, 4 months

org name in server/client certificate

by Juha Heinanen

tls module README says: Creating a server/client certificate ------------------------------------ 1. create a certificate request (and its private key in privkey.pem) openssl req -out ser1_cert_req.pem -new -nodes WARNING: the organization name should be the same as in the ca certificate. why the warning? i followed the tuto and there they are not the same and still tls works. -- juha

14 years, 4 months

Kamailio v3.1.0 Released

by Daniel-Constantin Mierla

Kamailio (OpenSER) v3.1.0 is out – major release with impressing number of new features and improvements. This release is a result of more than 8 months of development and testing from the teams of Kamailio (OpenSER) and SIP Express Router (SER) projects. Backed up by a solid development group, we are proud to announce that this release brings a large set of features, many for first time on the SIP server market, such as asynchronous TLS, UDP raw sockets, embedded HTTP and XCAP servers, embedded Lua, configuration file debugger. All together, there are over 15 new modules and countless improvements to old components. Since last major release (version 3.0.0, which was out in January 10, 2010), the two SIP servers, Kamailio and SER, are practically the same application, the name making the difference regarding the database structure and the extensions used for certain features, such as user database based authentication or location service. Therefore another development direction was towards smooth integration of Kamailio and SER extensions, previously duplicated modules such as auth, sl, ratelimit or sms were merged during this development cycle. Continue reading the release notes at: http://www.kamailio.org/w/kamailio-openser-v3.1.0-release-notes/ Many thanks to all developers and community members that made possible this release. -- Daniel-Constantin Mierla http://www.asipto.com

14 years, 4 months

git messing again

by Jon Bonilla

Hi all In the past I broke the repo because I erased a couple of folders and created symlinks with the same name. That caused several problems to git. Now, I want to do it again. I realized that symlinks where a mistake and want to erase them and create the folders again. I need some assistance not to break the repo :) Would it be safe if I erase the symlinks and recreate the folders in two different commits? Maybe the problem was doing so in the same commit/push?

14 years, 4 months

git:master: app_lua: fix finding lua libs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2489d57d6a6ba632d04da04271a0a2825aa7cbd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2489d57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 5 23:38:20 2010 +0200 app_lua: fix finding lua libs - if pkg-config fails to find lua libs, use default values (cherry picked from commit 6e65634bb10568767700d999437ee5194765d6e8) --- modules/app_lua/Makefile | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile index 74e0460..89fc8d6 100644 --- a/modules/app_lua/Makefile +++ b/modules/app_lua/Makefile @@ -16,8 +16,14 @@ ifeq ($(BUILDER),) DEFS+=-I/usr/include/lua5.1 LIBS= -llua5.1 else - DEFS+ = $(shell pkg-config --cflags lua) - LIBS = $(shell pkg-config --libs lua) + LUALIBS = $(shell pkg-config --silence-errors --libs lua) + ifeq ($(LUALIBS),) + DEFS+=-I/usr/include/lua5.1 + LIBS= -llua5.1 + else + DEFS+ = $(shell pkg-config --cflags lua) + LIBS = $(shell pkg-config --libs lua) + endif endif else DEFS+ = $(shell lua-config --include)

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev