sr-dev

sr-dev@lists.kamailio.org

4 participants
44157 discussions

git:sip-router: fixups: call them even for 0 params. functions

by Andrei Pelinescu-Onciul

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++) {

16 years, 1 month

git:sip-router: Merge commit 'origin/daniel/pv' into fixups

by Andrei Pelinescu-Onciul

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 ---

16 years, 1 month

git:sip-router: more PV API integration

by Andrei Pelinescu-Onciul

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;

16 years, 1 month

first kamailio module ran on the sip-router core

by Andrei Pelinescu-Onciul

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

16 years, 1 month

git:sip-router: SER 2.0 and Kamailio mysql driver intergrated.

by Jan Janak

Module: sip-router Branch: janakj/db Commit: 25700524f8270115f2ffa647b5868d30f768535a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2570052… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Nov 21 04:09:48 2008 +0100 SER 2.0 and Kamailio mysql driver intergrated. This is the integrated version of the mysql db driver from SER 2.0 and Kamailio. The module supports both API versions and links with both database libraries. Currently only compiles, untested. --- modules/db_mysql/Makefile | 25 + modules/db_mysql/dbase.c | 535 +++++++++++++ modules/db_mysql/dbase.h | 128 ++++ modules/db_mysql/doc/mysql_parser.dia | Bin 0 -> 2461 bytes modules/db_mysql/my_cmd.c | 1341 +++++++++++++++++++++++++++++++++ modules/db_mysql/my_cmd.h | 73 ++ modules/db_mysql/my_con.c | 195 +++++ modules/db_mysql/my_con.h | 69 ++ modules/db_mysql/my_con1.c | 131 ++++ modules/db_mysql/my_con1.h | 75 ++ modules/db_mysql/my_fld.c | 65 ++ modules/db_mysql/my_fld.h | 54 ++ modules/db_mysql/my_res.c | 80 ++ modules/db_mysql/my_res.h | 41 + modules/db_mysql/my_uri.c | 282 +++++++ modules/db_mysql/my_uri.h | 51 ++ modules/db_mysql/mysql_mod.c | 187 +++++ modules/db_mysql/mysql_mod.h | 54 ++ modules/db_mysql/res.c | 215 ++++++ modules/db_mysql/res.h | 48 ++ modules/db_mysql/row.c | 79 ++ modules/db_mysql/row.h | 48 ++ modules/db_mysql/val.c | 265 +++++++ modules/db_mysql/val.h | 51 ++ 24 files changed, 4092 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=257…

16 years, 1 month

git:sip-router: LM_ macros added for compatibility

by Jan Janak

Module: sip-router Branch: janakj/db Commit: f1484d04b58e0c4273ce413e2299952d2bbfc73d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1484d0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Nov 21 04:08:50 2008 +0100 LM_ macros added for compatibility --- dprint.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dprint.h b/dprint.h index 9535adc..67b23f9 100644 --- a/dprint.h +++ b/dprint.h @@ -252,5 +252,9 @@ int log_facility_fixup(void *handle, str *name, void **val); #define BUG(fmt, args...) LOG(L_CRIT, "BUG: " LOC_INFO fmt, ## args) #endif +#define LM_ERR ERR +#define LM_CRIT(fmt, args...) LOG(L_CRIT, "BUG: " LOC_INFO fmt, ## args) +#define LM_DBG DBG +#define LM_WARN WARN #endif /* ifndef dprint_h */

16 years, 1 month

git:sip-router: Added both SER and Kamailio db apis.

by Jan Janak

Module: sip-router Branch: janakj/db Commit: 827c32466b157d39fd6f06d9841162a8d0b1ecfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=827c324… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Nov 21 04:07:18 2008 +0100 Added both SER and Kamailio db apis. Both SER 2.0 and Kamailio APIs are added as libraries and the original DB stuff has been removed. Some data structures and typedefs were removed (db_con db_res) in order to avoid conflicts when both libraries are used from one module --- db/Makefile | 8 - db/README | 7 - db/schema/Makefile | 97 ------ db/schema/acc.xml | 464 ---------------------------- db/schema/aliases.xml | 124 -------- db/schema/attr_types.xml | 569 ----------------------------------- db/schema/contact_attrs.xml | 63 ---- db/schema/cpl.xml | 38 --- db/schema/credentials.xml | 260 ---------------- db/schema/customers.xml | 76 ----- db/schema/domain.xml | 243 --------------- db/schema/domain_attrs.xml | 211 ------------- db/schema/domain_settings.xml | 114 ------- db/schema/entities.xml | 9 - db/schema/extra_attrs.xml | 60 ---- db/schema/global_attrs.xml | 270 ----------------- db/schema/grp.xml | 40 --- db/schema/gw.xml | 64 ---- db/schema/gw_grp.xml | 33 -- db/schema/i18n-cs.xml | 526 -------------------------------- db/schema/i18n-en.xml | 267 ---------------- db/schema/i18n.xml | 54 ---- db/schema/ipmatch.xml | 50 --- db/schema/lcr.xml | 53 ---- db/schema/location.xml | 158 ---------- db/schema/missed_calls.xml | 452 --------------------------- db/schema/offline_winfo.xml | 95 ------ db/schema/pdt.xml | 31 -- db/schema/phonebook.xml | 77 ----- db/schema/presentity.xml | 78 ----- db/schema/presentity_contact.xml | 92 ------ db/schema/presentity_extensions.xml | 68 ----- db/schema/presentity_notes.xml | 74 ----- db/schema/rls_subscription.xml | 76 ----- db/schema/rls_vs.xml | 44 --- db/schema/rls_vs_names.xml | 40 --- db/schema/sd_attrs.xml | 53 ---- db/schema/ser.xml | 182 ----------- db/schema/silo.xml | 77 ----- db/schema/speed_dial.xml | 65 ---- db/schema/trusted.xml | 39 --- db/schema/tuple_extensions.xml | 51 --- db/schema/tuple_notes.xml | 48 --- db/schema/uri.xml | 128 -------- db/schema/uri_attrs.xml | 78 ----- db/schema/user_attrs.xml | 57 ---- db/schema/watcherinfo.xml | 134 -------- lib/db1/Makefile | 14 + lib/db1/Makefile.nonser | 12 + lib/db1/db.c | 419 ++++++++++++++++++++++++++ lib/db1/db.h | 402 +++++++++++++++++++++++++ lib/db1/db_cap.h | 69 +++++ lib/db1/db_con.h | 52 ++++ lib/db1/db_id.c | 291 ++++++++++++++++++ lib/db1/db_id.h | 70 +++++ lib/db1/db_key.h | 43 +++ lib/db1/db_op.h | 53 ++++ lib/db1/db_pool.c | 122 ++++++++ lib/db1/db_pool.h | 83 +++++ lib/db1/db_query.c | 322 ++++++++++++++++++++ lib/db1/db_query.h | 187 ++++++++++++ lib/db1/db_res.c | 164 ++++++++++ lib/db1/db_res.h | 123 ++++++++ lib/db1/db_row.c | 100 ++++++ lib/db1/db_row.h | 66 ++++ lib/db1/db_ut.c | 373 +++++++++++++++++++++++ lib/db1/db_ut.h | 209 +++++++++++++ lib/db1/db_val.h | 168 ++++++++++ lib/db2/Makefile | 14 + lib/db2/Makefile.nonser | 12 + {db => lib/db2}/db.c | 12 +- {db => lib/db2}/db.h | 0 {db => lib/db2}/db_cmd.c | 6 +- {db => lib/db2}/db_cmd.h | 0 {db => lib/db2}/db_con.c | 4 +- {db => lib/db2}/db_con.h | 0 {db => lib/db2}/db_ctx.c | 4 +- {db => lib/db2}/db_ctx.h | 4 +- {db => lib/db2}/db_drv.c | 6 +- {db => lib/db2}/db_drv.h | 4 +- {db => lib/db2}/db_fld.c | 4 +- {db => lib/db2}/db_fld.h | 2 +- {db => lib/db2}/db_gen.c | 0 {db => lib/db2}/db_gen.h | 4 +- {db => lib/db2}/db_pool.c | 2 +- {db => lib/db2}/db_pool.h | 2 +- {db => lib/db2}/db_rec.c | 4 +- {db => lib/db2}/db_rec.h | 0 {db => lib/db2}/db_res.c | 4 +- {db => lib/db2}/db_res.h | 0 {db => lib/db2}/db_uri.c | 6 +- {db => lib/db2}/db_uri.h | 2 +- 92 files changed, 3403 insertions(+), 5932 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=827…

16 years, 1 month

git:sip-router: str: kamailio str_init compatibility macro

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 8eb94bf9288083732bcab871c23be1a82498e4b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8eb94bf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 21 01:03:51 2008 +0100 str: kamailio str_init compatibility macro --- str.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/str.h b/str.h index 02a8d99..10be113 100644 --- a/str.h +++ b/str.h @@ -84,6 +84,9 @@ typedef struct _str str; */ #define STR_STATIC_INIT(v) {(v), sizeof(v) - 1} +/* kamailio compatibility macro (same thing as above) */ +#define str_init(v) STR_STATIC_INIT(v) + /** Initializes ::str string with NULL pointer and zero length. * This is a convenience macro that can be used to initialize * ::str string variable to NULL string with zero length:

16 years, 1 month

git:sip-router: added .gitignore

by Jan Janak

Module: sip-router Branch: janakj/db 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

16 years, 1 month

git:sip-router: more PV API integration

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv 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;

16 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev