sr-dev November 2008

sr-dev@lists.kamailio.org

21 participants
83 discussions

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

git:sip-router: modules: support for mod_register

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: ea31876f3efd0d33fd86352299981dd16e3f7908 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea31876… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 20 17:33:44 2008 +0100 modules: support for mod_register - new mod_register function added to the module interface (separate from exports structure): If a module exports a mod_register function it will be called immediately after loading the module and checking the module version and module interface (this means way before calling mod_init). The mod_register function prototype is: int mod_register(char* path, int* dlflags, void* r1, void* r2) where path is the module path including the filename, dlflags is a pointer to the dlflags used when loading the module (If the value is changed to a different and non-zero value, the module will be reloaded with the new flags), and r1 and r2 are parameters reserved for future use. A 0 return means success and -1 means error (the module will not be loaded). This new function can be used to register new parsing functions, alter dynamically the mod_exports structure contents a.s.o. - kamailio compatible mod exports dlflags handling (but a warning will be printed saying this is deprecated and the preferred way is using mod_register(). --- sr_module.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- sr_module.h | 14 ++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/sr_module.c b/sr_module.c index 21d89ac..491e971 100644 --- a/sr_module.c +++ b/sr_module.c @@ -216,17 +216,29 @@ static inline int version_control(void *handle, char *path) return 0; } -/* returns 0 on success , <0 on error */ +/** load a sr module. + * tries to load the module specified by path. + * If modname does contain a '/' or a '.' it would be assumed to contain a + * path to the module and it will be used as give. + * else <MODS_DIR>/<modname>.so will be tried and if this fails + * <MODS_DIR>/<modname>/<modname>.so + * @param modname - path or module name + * @return 0 on success , <0 on error + */ int load_module(char* path) { void* handle; char* error; + mod_register_function mr; union module_exports_u* exp; unsigned* mod_if_ver; struct sr_module* t; struct stat stat_buf; char* modname; int len; + int dlflags; + int new_dlflags; + int retries; #ifndef RTLD_NOW /* for openbsd */ @@ -287,7 +299,9 @@ int load_module(char* path) } #endif /* !EXTRA_DEBUG */ } - + retries=2; + dlflags=RTLD_NOW; +reload: handle=dlopen(path, RTLD_NOW); /* resolve all symbols now */ if (handle==0){ LOG(L_ERR, "ERROR: load_module: could not open module <%s>: %s\n", @@ -314,11 +328,47 @@ int load_module(char* path) goto error1; } /* launch register */ + mr = (mod_register_function)dlsym(handle, DLSYM_PREFIX "mod_register"); + if (((error =(char*)dlerror())==0) && mr) { + /* no error call it */ + new_dlflags=dlflags; + if (mr(path, &dlflags, 0, 0)!=0) { + LOG(L_ERR, "ERROR: load_module: %s: mod_register failed\n", path); + goto error1; + } + if (new_dlflags!=dlflags && new_dlflags!=0) { + /* we have to reload the module */ + dlclose(handle); + dlflags=new_dlflags; + retries--; + if (retries>0) goto reload; + LOG(L_ERR, "ERROR: load_module: %s: cannot agree" + " on the dlflags\n", path); + goto error; + } + } exp = (union module_exports_u*)dlsym(handle, DLSYM_PREFIX "exports"); if ( (error =(char*)dlerror())!=0 ){ LOG(L_ERR, "ERROR: load_module: %s\n", error); goto error1; } + /* hack to allow for kamailio style dlflags inside exports */ + if (*mod_if_ver == 1) { + new_dlflags = exp->v1.dlflags; + if (new_dlflags!=dlflags && new_dlflags!=DEFAULT_DLFLAGS) { + /* we have to reload the module */ + dlclose(handle); + WARN("%s: exports dlflags interface is deprecated and it will not" + "be supported in newer versions; consider using" + " mod_register() instead", path); + dlflags=new_dlflags; + retries--; + if (retries>0) goto reload; + LOG(L_ERR, "ERROR: load_module: %s: cannot agree" + " on the dlflags\n", path); + goto error; + } + } if (register_module(*mod_if_ver, exp, path, handle)<0) goto error1; return 0; diff --git a/sr_module.h b/sr_module.h index f2aea0e..13474cd 100644 --- a/sr_module.h +++ b/sr_module.h @@ -89,6 +89,20 @@ #endif +/** type used for the mod_register function export. + * mod_register is a function called when loading a module + * (if present), prior to registering the module exports. + * @param path - path to the module, including file name + * @param dlflags - pointer to the dlflags used when loading the module. + * If the value is changed to a different and non-zero + * value, the module will be reloaded with the new flags. + * @param reserved1 - reserved for future use. + * @param reserved2 - reserver for future use + * @return 0 on success, -1 on error, all the other values are reserved + * for future use (<0 meaning error and >0 success) + */ +typedef int (*mod_register_function)(char*, int*, void*, void*); + typedef struct module_exports* (*module_register)(void); typedef int (*cmd_function)(struct sip_msg*, char*, char*); typedef int (*cmd_function3)(struct sip_msg*, char*, char*, char*);

16 years, 1 month

git:sip-router: Merge branch 'andrei/mod_register' of ssh://git.sip-router. org/sip-router into daniel

by Daniel-Constantin Mierla

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

16 years, 1 month

git:sip-router: minor macro additions for kamailio compatibility

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 7000945a879bb3f0e003fb1d866164a47b3554c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7000945… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 20 20:02:05 2008 +0100 minor macro additions for kamailio compatibility --- dprint.h | 1 + sr_module.h | 1 + statistics.h | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dprint.h b/dprint.h index 41e9a45..6005a32 100644 --- a/dprint.h +++ b/dprint.h @@ -87,6 +87,7 @@ int log_facility_fixup(void *handle, str *name, void **val); #define LOC_INFO __FILE__ ":" CT2STR(__LINE__) ": " +#define is_printable(level) (cfg_get(core, core_cfg, debug)>=(level)) #ifdef NO_DEBUG #ifdef __SUNPRO_C diff --git a/sr_module.h b/sr_module.h index 13474cd..51e3382 100644 --- a/sr_module.h +++ b/sr_module.h @@ -152,6 +152,7 @@ typedef int (*param_func_t)( modparam_t type, void* val); #define BRANCH_ROUTE 8 /* Function can be used in branch_route blocks */ #define ONSEND_ROUTE 16 /* Function can be used in onsend_route blocks */ #define ERROR_ROUTE 32 /* Function can be used in an error route */ +#define LOCAL_ROUTE 64 /* Function can be used in a local route */ /* Macros - used as rank in child_init function */ #define PROC_MAIN 0 /* Main ser process */ diff --git a/statistics.h b/statistics.h index a5ba144..3fd311a 100644 --- a/statistics.h +++ b/statistics.h @@ -61,9 +61,10 @@ typedef struct stat_export_ { #define get_stat(name) 0 #define get_stat_val(v) 0 +#define get_stat_var_from_num_code(num_code, in_code) 0 #define update_stat(v, n) #define reset_stat(v) -#define if_update_stat (cond, v, n) +#define if_update_stat(cond, v, n) #ifdef STATISTICS #warning "sorry sip-router does not support STATISTICS"

16 years, 1 month

git:sip-router: mod if: more prototypes and defines

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/mod_f_params Commit: ca19a01ec657d1a431b1616a261a5a5f1d53a691 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca19a01… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 18 23:59:14 2008 +0100 mod if: more prototypes and defines - prototypes for module (cmd_function) with 3, 4, 5, 6 and variable number of parameters added. The 3-6 versions just extend the old version with more char* parameters and are kamailio compatible. The variable number of parameters function is something new and experimental. It takes the sip_msg, the number of extra parameters and an array of action_u_t values (the internal routing engine parameters representation). - added a magic value for the parameters numbers, to be used by variable parameter functions (VAR_PARAM_NO) - moved/added the NO_SCRIPT macro (parameters number magic value for functions that should not be called from the script) from tm. --- sr_module.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/sr_module.h b/sr_module.h index 1301138..f2aea0e 100644 --- a/sr_module.h +++ b/sr_module.h @@ -44,6 +44,8 @@ * 2008-11-17 sip-router version: includes some of the openser/kamailio * changes: f(void) instead of f(), free_fixup_function() * dual module interface support: ser & kamailio (andrei) + * 2008-11-18 prototypes for various fixed parameters numbers module + * functions (3, 4, 5 & 6) and variable parameters (andrei) */ /*! @@ -89,6 +91,15 @@ typedef struct module_exports* (*module_register)(void); typedef int (*cmd_function)(struct sip_msg*, char*, char*); +typedef int (*cmd_function3)(struct sip_msg*, char*, char*, char*); +typedef int (*cmd_function4)(struct sip_msg*, char*, char*, char*, char*); +typedef int (*cmd_function5)(struct sip_msg*, char*, char*, char*, + char*, char*); +typedef int (*cmd_function6)(struct sip_msg*, char*, char*, char*, + char*, char*, char*); +/* variable number of param module function, takes as param the sip_msg, + extra paremeters number and a pointer to an array of parameters */ +typedef int (*cmd_function_var)(struct sip_msg*, int no, action_u_t* vals ); typedef int (*fixup_function)(void** param, int param_no); typedef int (*free_fixup_function)(void** param, int param_no); typedef int (*response_function)(struct sip_msg*); @@ -114,6 +125,13 @@ typedef unsigned int modparam_t; typedef int (*param_func_t)( modparam_t type, void* val); +/* magic parameter number values */ + +#define NO_SCRIPT -1 /* export not usable from scripts */ +#define VAR_PARAM_NO -128 /* function has variable number of parameters + (see cmd_function_var for the prototype) */ + +/* functions flags */ #define REQUEST_ROUTE 1 /* Function can be used in request route blocks */ #define FAILURE_ROUTE 2 /* Function can be used in reply route blocks */ #define ONREPLY_ROUTE 4 /* Function can be used in on_reply */

16 years, 1 month

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2008