sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

Start a nNew thread

error route gives error
by jh＠tutpro.com 30 May '09

30 May '09

i get parse error from line error_route { what is the replacement? -- juha

2 4

CVS:commitlog: rtpproxy rtpproxy.8
by Maxim Sobolev 30 May '09

30 May '09

sobomax 2009/05/30 02:50:59 CEST SER CVS Repository Modified files: . rtpproxy.8 Log: Re-gen. Revision Changes Path 1.10 +2 -2 rtpproxy/rtpproxy.8 http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpproxy.8.diff?r1=1…

1 0

CVS:commitlog: rtpproxy main.c manpage.xml rtpp_command.c
by Maxim Sobolev 30 May '09

30 May '09

sobomax 2009/05/30 02:50:13 CEST SER CVS Repository Modified files: . main.c manpage.xml rtpp_command.c Log: Allow IP ToS (type of service) setting be disabled by specifying `-t -1' on command line. Suggested by: Inaki Baz Castillo While I am here, validabe used-supplied ToS value and throw error if it's too large. Revision Changes Path 1.90 +3 -1 rtpproxy/main.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/main.c.diff?r1=1.89&… 1.11 +4 -2 rtpproxy/manpage.xml http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/manpage.xml.diff?r1=… 1.27 +2 -2 rtpproxy/rtpp_command.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_command.c.diff?…

1 0

CVS:commitlog: rtpproxy rtpp_log.c
by Maxim Sobolev 30 May '09

30 May '09

sobomax 2009/05/30 02:15:28 CEST SER CVS Repository Modified files: . rtpp_log.c Log: Make it possible to specify syslog facility without the LOG_ prefix, i.e. -d warn:local5. Revision Changes Path 1.3 +3 -2 rtpproxy/rtpp_log.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_log.c.diff?r1=1…

1 0

CVS:commitlog: rtpproxy rtpproxy.8
by Maxim Sobolev 29 May '09

29 May '09

sobomax 2009/05/30 01:48:19 CEST SER CVS Repository Modified files: . rtpproxy.8 Log: Regen. Revision Changes Path 1.9 +8 -4 rtpproxy/rtpproxy.8 http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpproxy.8.diff?r1=1…

1 0

CVS:commitlog: rtpproxy main.c manpage.xml rtpp_defines.h rtpp_log.c rtpp_log.h
by Maxim Sobolev 29 May '09

29 May '09

sobomax 2009/05/30 01:48:04 CEST SER CVS Repository Modified files: . main.c manpage.xml rtpp_defines.h rtpp_log.c rtpp_log.h Log: Add ability to set syslog facility (by adding it after : to the argument of the -d option), i.e. -d WARN:LOG_LOCAL5. Suggested by: Inaki Baz Castillo Revision Changes Path 1.89 +11 -3 rtpproxy/main.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/main.c.diff?r1=1.88&… 1.10 +8 -4 rtpproxy/manpage.xml http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/manpage.xml.diff?r1=… 1.25 +2 -1 rtpproxy/rtpp_defines.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_defines.h.diff?… 1.2 +47 -1 rtpproxy/rtpp_log.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_log.c.diff?r1=1… 1.7 +2 -1 rtpproxy/rtpp_log.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_log.h.diff?r1=1…

1 0

script errors
by jh＠tutpro.com 29 May '09

29 May '09

this is my current list of unresolved script errors: - tm module lacks onreply_avp_mode param. how does sr tm behave related to avp visibility? - this kind of if expression results in parse error: if ([$avp(i:712) & 1]) { how to re-write it so that it is accepted? -- juha

2 1

git:master: pua: use load_tm_api() instead of find_export()/load_tm()
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: d961145661f0ea20ae799b5cb667d25fe9791a42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d961145… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 22:05:03 2009 +0300 pua: use load_tm_api() instead of find_export()/load_tm() --- modules_k/pua/pua.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 8a9f5f7..46dadd3 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -147,8 +147,6 @@ struct module_exports exports= { */ static int mod_init(void) { - load_tm_f load_tm; - LM_DBG("...\n"); if(min_expires< 0) @@ -157,15 +155,8 @@ static int mod_init(void) if(default_expires< 600) default_expires= 3600; - /* import the TM auto-loading function */ - if((load_tm=(load_tm_f)find_export("load_tm", 0, 0))==NULL) - { - LM_ERR("can't import load_tm\n"); - return -1; - } - /* let the auto-loading function load all TM stuff */ - - if(load_tm(&tmb)==-1) + /* load TM API */ + if(load_tm_api(&tmb)==-1) { LM_ERR("can't load tm functions\n"); return -1;

1 0

git:master: kex: added K pv_printf() function
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: f5cff79c5d6fa7270c56b1a7ca6e2d6902999c8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5cff79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 21:21:08 2009 +0300 kex: added K pv_printf() function --- modules_k/kex/kex_mod.c | 2 + modules_k/kex/km_core.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/km_core.h | 2 + 3 files changed, 78 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 64f26a8..7fa5830 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -74,6 +74,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"isdsturiset", (cmd_function)w_isdsturiset, 0, 0, 0, ANY_ROUTE }, + {"pv_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, + 0, ANY_ROUTE }, {0,0,0,0,0,0} }; diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c index cea12ea..72e2dde 100644 --- a/modules_k/kex/km_core.c +++ b/modules_k/kex/km_core.c @@ -27,6 +27,8 @@ #include "../../dprint.h" #include "../../dset.h" #include "../../flags.h" +#include "../../pvar.h" +#include "../../lvalue.h" #include "../../mod_fix.h" #include "km_core.h" @@ -95,3 +97,75 @@ int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2) return 1; } +int pv_printf_fixup(void** param, int param_no) +{ + pv_spec_t *spec=NULL; + pv_elem_t *pvmodel=NULL; + str tstr; + + if(param_no==1) + { + spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); + if(spec==NULL) + { + LM_ERR("out of pkg\n"); + return -1; + } + memset(spec, 0, sizeof(pv_spec_t)); + tstr.s = (char*)(*param); + tstr.len = strlen(tstr.s); + if(pv_parse_spec(&tstr, spec)==NULL) + { + LM_ERR("unknown script variable in first parameter"); + pkg_free(spec); + return -1; + } + if(!pv_is_w(spec)) + { + LM_ERR("read-only script variable in first parameter"); + pkg_free(spec); + return -1; + } + *param = spec; + } else if(param_no==2) { + pvmodel = 0; + tstr.s = (char*)(*param); + tstr.len = strlen(tstr.s); + if(pv_parse_format(&tstr, &pvmodel)<0) + { + LM_ERR("error in second parameter"); + return -1; + } + *param = pvmodel; + } + return 0; +} + +int w_pv_printf(struct sip_msg *msg, char *s1, str *s2) +{ + pv_spec_t *spec=NULL; + pv_elem_t *model=NULL; + pv_value_t val; + + spec = (pv_spec_t*)s1; + + model = (pv_elem_t*)s2; + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_printf_s(msg, model, &val.rs)!=0) + { + LM_ERR("cannot eval second parameter\n"); + goto error; + } + val.flags = PV_VAL_STR; + if(spec->setf(msg, &spec->pvp, EQ_T, &val)<0) + { + LM_ERR("setting PV failed\n"); + goto error; + } + + return 1; +error: + return -1; +} + diff --git a/modules_k/kex/km_core.h b/modules_k/kex/km_core.h index 84fe5dd..5fa08f8 100644 --- a/modules_k/kex/km_core.h +++ b/modules_k/kex/km_core.h @@ -29,5 +29,7 @@ int w_km_append_branch(struct sip_msg *msg, char *uri, str *s2); int w_setdsturi(struct sip_msg *msg, char *uri, str *s2); int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2); int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2); +int w_pv_printf(struct sip_msg *msg, char *s1, str *s2); +int pv_printf_fixup(void** param, int param_no); #endif

1 0

64b - lib or lib64?
by Daniel-Constantin Mierla 29 May '09

29 May '09

Hello, kamailio installs the modules under lib64 on 64b architecture, SR does it in lib. I do not recall exactly the discussion when we did the update in openser, but probably we got somehow to the conclusion that it should be so. Looking now in my deb distro, i see in the system (/ and /usr): lib lib32 lib64 where lib64 is symlink to lib, so I guess SR way is still right. How is in other distros? Opinions? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009