sr-dev November 2008

sr-dev@lists.kamailio.org

21 participants
83 discussions

git:sip-router: add trie to library directory
by Henning Westerholt 21 Nov '08

21 Nov '08

Module: sip-router Branch: henning/trie Commit: 99d1967f5c33325481eb427a27abc42f8ff50faf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99d1967… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 21 13:29:07 2008 +0100 add trie to library directory - add generic digit trie implementation to lib directory, needed from userblacklist and carrieroute - add a note to the README --- lib/README | 3 + lib/trie/Makefile | 9 ++ lib/trie/dtrie.c | 248 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/trie/dtrie.h | 174 +++++++++++++++++++++++++++++++++++++ 4 files changed, 434 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=99d…

1 0

git:sip-router: add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h
by Henning Westerholt 21 Nov '08

21 Nov '08

Module: sip-router Branch: henning/trie Commit: f34610e3ec970664efab940592dd2cbd0f48260b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f34610e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 21 13:23:02 2008 +0100 add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h --- mem/mem.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/mem/mem.h b/mem/mem.h index 8ba35b5..7cb79a8 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -152,4 +152,13 @@ int init_pkg_mallocs(); int init_shm_mallocs(int force_alloc); +/*! generic logging helper for allocation errors in private memory pool/ system */ +#ifdef SYSTEM_MALLOC +#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from system") +#else +#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from available pool") +#endif +/*! generic logging helper for allocation errors in shared memory pool */ +#define SHM_MEM_ERROR LM_ERR("could not allocate shared memory from available pool") + #endif

1 0

git:sip-router: added .gitignore
by Henning Westerholt 21 Nov '08

21 Nov '08

Module: sip-router Branch: henning/trie Commit: 94476acf20b8f084ef95d461989b3132a07c4281 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94476ac… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 18 00:20:30 2008 +0100 added .gitignore - .gitignore containing patterns for all the files that git should ignore (from *.o, *.d to config.mak, modules.lst a.s.o). --- .gitignore | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1a32c7e --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +# ignore autogenerated files +cfg.tab.c +cfg.tab.h +lex.yy.c +librpath.lst +makecfg.lst +config.mak +modules.lst +# ignore dependency files +*.d +# ignore binary files and objects +ser +*.so +*.so.* +*.o +# archives +*.tar.gz +*.deb +*.rpm +# tags +tags +TAGS +# vi swaps +.*.swp +# various other binaries +test/udp_flood +utils/gen_ha1/gen_ha1 +utils/sercmd/sercmd

1 0

git:sip-router: Merge branch 'fixups' into db_lib
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

Module: sip-router Branch: andrei/dbk_lib Commit: 7c5b8e41204d09970b82a16417dad292e175dfb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c5b8e4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 21 12:22:58 2008 +0100 Merge branch 'fixups' into db_lib * fixups: fixups: call them even for 0 params. functions more PV API integration ---

1 0

commit email generation changed
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

I've modified the scrip that generates the commit messages, so that it will not generate emails for merged commits. Now you should see only new commits messages and merge notices. For nice merge notices (including a changelog style summary of the merged commits), everybody should make sure that they have: [merge] log = true in your ~/.gitconfig. A quick way to check for it is: git config --get merge.log and to set it: git config --global merge.log true You could also add always --log to git-merge and git-pull, but there's a high chance that you will forget it at some point. Andrei

1 0

git:sip-router: more PV API integration
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

Module: sip-router Branch: andrei/fixups Commit: d79388b32114357ca98159d5c49fc2b3996d18a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d79388b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 20 23:17:26 2008 +0200 more PV API integration - register PV exported by modules - added functions to evaluate PVs - xlog module from Kamailio/OpenSER should run now in sip-router compiled with DEFS+= -DKAMAILIO_MOD_INTERFACE --- pvapi.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pvar.h | 5 +- sr_module.c | 12 +++ 3 files changed, 242 insertions(+), 2 deletions(-) diff --git a/pvapi.c b/pvapi.c index eb4ea7a..f3d7b58 100644 --- a/pvapi.c +++ b/pvapi.c @@ -31,6 +31,7 @@ #include <unistd.h> #include "mem/mem.h" +#include "mem/shm_mem.h" #include "ut.h" #include "dprint.h" #include "hashes.h" @@ -301,6 +302,7 @@ static int pv_get_marker(struct sip_msg *msg, pv_param_t *param, } static str pv_str_empty = { "", 0 }; +static str pv_str_null = { "<null>", 6 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(res==NULL) @@ -628,6 +630,175 @@ error: } /* end: pv_parse_spec */ +/** + * + */ +int pv_parse_format(str *in, pv_elem_p *el) +{ + char *p, *p0; + int n = 0; + pv_elem_p e, e0; + str s; + + if(in==NULL || in->s==NULL || el==NULL) + return -1; + + /*LM_DBG("parsing [%.*s]\n", in->len, in->s);*/ + + if(in->len == 0) + { + *el = pkg_malloc(sizeof(pv_elem_t)); + if(*el == NULL) + goto error; + memset(*el, 0, sizeof(pv_elem_t)); + (*el)->text = *in; + return 0; + } + + p = in->s; + *el = NULL; + e = e0 = NULL; + + while(is_in_str(p,in)) + { + e0 = e; + e = pkg_malloc(sizeof(pv_elem_t)); + if(!e) + goto error; + memset(e, 0, sizeof(pv_elem_t)); + n++; + if(*el == NULL) + *el = e; + if(e0) + e0->next = e; + + e->text.s = p; + while(is_in_str(p,in) && *p!=PV_MARKER) + p++; + e->text.len = p - e->text.s; + + if(*p == '\0' || !is_in_str(p,in)) + break; + s.s = p; + s.len = in->s+in->len-p; + p0 = pv_parse_spec(&s, &e->spec); + + if(p0==NULL) + goto error; + if(*p0 == '\0') + break; + p = p0; + } + /*LM_DBG("format parsed OK: [%d] items\n", n);*/ + + if(*el == NULL) + return -1; + + return 0; + +error: + pv_elem_free_all(*el); + *el = NULL; + return -1; +} + +int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value) +{ + int ret = 0; + + if(msg==NULL || sp==NULL || sp->getf==NULL || value==NULL + || sp->type==PVT_NONE) + { + LM_ERR("bad parameters\n"); + return -1; + } + + memset(value, 0, sizeof(pv_value_t)); + + ret = (*sp->getf)(msg, &(sp->pvp), value); + if(ret!=0) + return ret; + if(sp->trans) + return tr_exec(msg, (trans_t*)sp->trans, value); + return ret; +} + +/** + * + */ +int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) +{ + int n, h; + pv_value_t tok; + pv_elem_p it; + char *cur; + + if(msg==NULL || list==NULL || buf==NULL || len==NULL) + return -1; + + if(*len <= 0) + return -1; + + *buf = '\0'; + cur = buf; + + h = 0; + n = 0; + for (it=list; it; it=it->next) + { + /* put the text */ + if(it->text.s && it->text.len>0) + { + if(n+it->text.len < *len) + { + memcpy(cur, it->text.s, it->text.len); + n += it->text.len; + cur += it->text.len; + } else { + LM_ERR("no more space for text [%d]\n", it->text.len); + goto overflow; + } + } + /* put the value of the specifier */ + if(it->spec.type!=PVT_NONE + && pv_get_spec_value(msg, &(it->spec), &tok)==0) + { + if(tok.flags&PV_VAL_NULL) + tok.rs = pv_str_null; + if(n+tok.rs.len < *len) + { + if(tok.rs.len>0) + { + memcpy(cur, tok.rs.s, tok.rs.len); + n += tok.rs.len; + cur += tok.rs.len; + } + } else { + LM_ERR("no more space for spec value\n"); + goto overflow; + } + } + } + + goto done; + +overflow: + LM_ERR("buffer overflow -- increase the buffer size...\n"); + return -1; + +done: +#ifdef EXTRA_DEBUG + LM_DBG("final buffer length %d\n", n); +#endif + *cur = '\0'; + *len = n; + return 0; +} + + +/** + * + */ void pv_spec_free(pv_spec_t *spec) { if(spec==0) return; @@ -637,6 +808,40 @@ void pv_spec_free(pv_spec_t *spec) pkg_free(spec); } +/** + * + */ +int pv_elem_free_all(pv_elem_p log) +{ + pv_elem_p t; + while(log) + { + t = log; + log = log->next; + pkg_free(t); + } + return 0; +} + +/** + * + */ +void pv_value_destroy(pv_value_t *val) +{ + if(val==0) return; + if(val->flags&PV_VAL_PKG) pkg_free(val->rs.s); + if(val->flags&PV_VAL_SHM) shm_free(val->rs.s); + memset(val, 0, sizeof(pv_value_t)); +} + + +/******************************************************** + * Transformations API + ********************************************************/ + +/** + * + */ static inline char* tr_get_class(str *in, char *p, str *tclass) { tclass->s = p; @@ -652,6 +857,9 @@ static inline char* tr_get_class(str *in, char *p, str *tclass) return p; } +/** + * + */ static inline trans_t* tr_new() { trans_t *t = NULL; @@ -757,6 +965,25 @@ void tr_destroy(trans_t *t) memset(t, 0, sizeof(trans_t)); } +int tr_exec(struct sip_msg *msg, trans_t *t, pv_value_t *v) +{ + int r; + trans_t *i; + + if(t==NULL || v==NULL) + { + LM_DBG("invalid parameters\n"); + return -1; + } + + for(i = t; i!=NULL; i=i->next) + { + r = (*i->trf)(msg, i->params, i->subtype, v); + if(r!=0) + return r; + } + return 0; +} /*! * \brief Free allocated memory of transformation list diff --git a/pvar.h b/pvar.h index be7b3bc..811ea34 100644 --- a/pvar.h +++ b/pvar.h @@ -72,8 +72,8 @@ enum _pv_type { PVT_NONE=0, PVT_EMPTY, PVT_NULL, - PVT_MARKER, PVT_AVP, PVT_OTHER, - PVT_EXTRA /* keep it last */ + PVT_MARKER, PVT_AVP, PVT_COLOR, + PVT_OTHER, PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t; @@ -248,6 +248,7 @@ typedef struct _tr_export { char* tr_lookup(str *in, trans_t **tr); tr_export_t* tr_lookup_class(str *tclass); +int tr_exec(struct sip_msg *msg, trans_t *t, pv_value_t *v); #endif diff --git a/sr_module.c b/sr_module.c index 491e971..6d803f8 100644 --- a/sr_module.c +++ b/sr_module.c @@ -164,6 +164,18 @@ static int register_module(unsigned ver, union module_exports_u* e, mod->exports=e; mod->next=modules; modules=mod; + + /* register module pseudo-variables */ + if (ver==1 && e->v1.items) { + LM_DBG("register PV from: %s\n", e->c.name); + if (register_pvars_mod(e->c.name, e->v1.items)!=0) { + LM_ERR("failed to register pseudo-variables for module %s\n", + e->c.name); + pkg_free(mod); + return -1; + } + } + return 0; error: return ret;

1 0

git:sip-router: Merge commit 'origin/daniel/pv' into fixups
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

Module: sip-router Branch: andrei/fixups Commit: d388e9f859e6e4179f5fcb3017ed87a759f6741f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d388e9f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 21 11:47:56 2008 +0100 Merge commit 'origin/daniel/pv' into fixups * commit 'origin/daniel/pv': more PV API integration ---

1 0

git:sip-router: fixups: call them even for 0 params. functions
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

Module: sip-router Branch: andrei/fixups Commit: e692101f920b5221112fcf0dd688c64dfbcfe3b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e692101… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 21 11:49:48 2008 +0100 fixups: call them even for 0 params. functions - kamailio compatibility: fixups for function with no parameters can be used --- route.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/route.c b/route.c index 5c39764..b57364b 100644 --- a/route.c +++ b/route.c @@ -512,6 +512,11 @@ static int fix_actions(struct action* a) if (cmd && cmd->c.fixup) { int i; DBG("fixing %s()\n", cmd->c.name); + if (t->val[1].u.number==0) { + ret = cmd->c.fixup(0, 0); + if (ret < 0) + return ret; + } /* type cast NUMBER to STRING, old modules may expect * all STRING params during fixup */ for (i=0; i<t->val[1].u.number; i++) {

1 0

git:sip-router: Merge branch 'andrei/mod_register' of ssh://git.sip-router. org/sip-router into daniel
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

Module: sip-router Branch: andrei/fixups Commit: 343d7baa4c2fe71497a9a574ad3f734c7899cd90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=343d7ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 20 22:05:38 2008 +0200 Merge branch 'andrei/mod_register' of ssh://git.sip-router.org/sip-router into daniel * 'andrei/mod_register' of ssh://git.sip-router.org/sip-router: minor macro additions for kamailio compatibility modules: support for mod_register ---

1 0

first kamailio module ran on the sip-router core
by Andrei Pelinescu-Onciul 21 Nov '08

21 Nov '08

siputils is the first kamailio module that did succesfully run on sip-core. I did only 2 small changes: - added DEFS+=-DKAMAILIO_MOD_INTERFACE to the Makefile - s/MIN/MIN_int There are a few modules that would need a little bit more changes, like everything using core send functions (they changed a bit in ser), do_action() and build_*, but in all this cases these are minor updates. More will be compileable as soon as we unify the fixups, but I think the biggest problem right now is the DB interface (from a module point of view, we still haven't unified the config file). Andrei

4 8

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2008