sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: modules/app_lua: added lots of new modules and functions

by Peter Dunkley

Module: sip-router Branch: master Commit: 8aa79820843e276083e582c2d0e17c88e81f5add URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8aa7982… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 13:03:14 2011 +0100 modules/app_lua: added lots of new modules and functions - Newly exported modules: textops, pua_usrloc, siputils, rls, alias_db, msilo. - Extra functions in existing modules: t_newtran, t_release, rr_add_param, registered, handle_publish, handle_subscribe - Changes by Peter Dunkley and Hugh Waite at Crocodile RCS --- modules/app_lua/app_lua_exp.c | 666 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 666 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8aa…

12 years, 7 months

git:master: modules_k/rls: added DB only mode to rls

by Peter Dunkley

Module: sip-router Branch: master Commit: 7665c7947f839ade0e9decbad0c2db41ea29f924 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7665c79… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 12:52:21 2011 +0100 modules_k/rls: added DB only mode to rls - By using DB only mode RLS can be distributed across many Kamailio servers for scaling and resilience. - This change has been in use internally at Crocodile RCS for some time, but it is extensive. - The DB only mode changes have been made in a way that changes the pre- existing (hash-table based) mode of operation as little as possible. This original mode of operation SHOULD be unaffected by this change. - This enhancement was made by Paul Pankhurst at Crocodile RCS. - Also contains a small bug-fix to RLS indices by Hugh Waite. - I have also exported the RLS API for use in app_lua --- modules_k/rls/README | 373 +++++++----- modules_k/rls/api.h | 28 + modules_k/rls/doc/rls_admin.xml | 70 +++ modules_k/rls/notify.c | 85 ++- modules_k/rls/resource_notify.c | 46 ++- modules_k/rls/rls.c | 216 ++++++- modules_k/rls/rls.h | 20 +- modules_k/rls/rls_db.c | 1220 +++++++++++++++++++++++++++++++++++++++ modules_k/rls/subscribe.c | 179 ++++-- 9 files changed, 1958 insertions(+), 279 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=766…

12 years, 7 months

git:master: modules_k/presence: added db_only mode support for presentity table

by Peter Dunkley

Module: sip-router Branch: master Commit: f6149f8d960a8c46166d48d570ed2391e34f67c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6149f8… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:57:36 2011 +0100 modules_k/presence: added db_only mode support for presentity table - This enhancement was made by Paul Pankhurst at Crocodile RCS --- modules_k/presence/presence.c | 44 ++++++++++++++++++++-------------- modules_k/presence/presentity.c | 49 +++++++++++++++++++++++--------------- modules_k/presence/publish.c | 2 +- 3 files changed, 57 insertions(+), 38 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 1bb6c9b..b0ec644 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -140,7 +140,7 @@ int timeout_rm_subs = 1; int send_fast_notify = 1; int phtable_size= 9; -phtable_t* pres_htable; +phtable_t* pres_htable=NULL; static cmd_export_t cmds[]= { @@ -330,22 +330,25 @@ static int mod_init(void) } } - if(phtable_size< 1) - phtable_size= 256; - else - phtable_size= 1<< phtable_size; + if(dbmode != DB_ONLY) + { + if(phtable_size< 1) + phtable_size= 256; + else + phtable_size= 1<< phtable_size; - pres_htable= new_phtable(); - if(pres_htable== NULL) - { - LM_ERR("initializing presentity hash table\n"); - return -1; - } + pres_htable= new_phtable(); + if(pres_htable== NULL) + { + LM_ERR("initializing presentity hash table\n"); + return -1; + } - if(pres_htable_restore()< 0) - { - LM_ERR("filling in presentity hash table from database\n"); - return -1; + if(pres_htable_restore()< 0) + { + LM_ERR("filling in presentity hash table from database\n"); + return -1; + } } startup_time = (int) time(NULL); @@ -366,9 +369,14 @@ static int mod_init(void) /* for legacy, we also keep the fallback2db parameter, but make sure for consistency */ if(fallback2db) { - dbmode = DB_FALLBACK; + if (dbmode == DB_ONLY) + LM_ERR( "fallback2db ignored as in DB_ONLY mode\n" ); + else + dbmode = DB_FALLBACK; } + if (dbmode == DB_ONLY) + LM_INFO( "Database mode set to DB_ONLY\n" ); return 0; } @@ -751,7 +759,7 @@ int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, } /* save in the list all affected dialogs */ /* if status switches to terminated -> delete dialog */ - if(update_pw_dialogs(&subs, subs.db_flag, subs_array)< 0) + if(dbmode != DB_ONLY && update_pw_dialogs(&subs, subs.db_flag, subs_array)< 0) { LM_ERR( "extracting dialogs from [watcher]=%.*s(a)%.*s to" " [presentity]=%.*s\n", subs.from_user.len, subs.from_user.s, diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index 427a572..75c3cfc 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -336,8 +336,9 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, if(new_t) { /* insert new record in hash_table */ - - if(insert_phtable(&pres_uri, presentity->event->evp->type, sphere)< 0) + + if ( dbmode != DB_ONLY && + insert_phtable(&pres_uri, presentity->event->evp->type, sphere)< 0) { LM_ERR("inserting record in hash table\n"); goto error; @@ -489,7 +490,8 @@ after_dialog_check: /* delete from hash table */ - if(delete_phtable(&pres_uri, presentity->event->evp->type)< 0) + if(dbmode != DB_ONLY && + delete_phtable(&pres_uri, presentity->event->evp->type)< 0) { LM_ERR("deleting record from hash table\n"); goto error; @@ -584,7 +586,8 @@ after_dialog_check: if(sphere_enable && presentity->event->evp->type== EVENT_PRESENCE) { - if(update_phtable(presentity, pres_uri, *body)< 0) + if(dbmode != DB_ONLY && + update_phtable(presentity, pres_uri, *body)< 0) { LM_ERR("failed to update sphere for presentity\n"); goto error; @@ -695,6 +698,12 @@ int pres_htable_restore(void) event_t ev; char* sphere= NULL; + if ( dbmode == DB_ONLY ) + { + LM_ERR( "Can't restore when dbmode is DB_ONLY\n" ); + return(-1); + } + result_cols[user_col= n_result_cols++]= &str_username_col; result_cols[domain_col= n_result_cols++]= &str_domain_col; result_cols[event_col= n_result_cols++]= &str_event_col; @@ -871,30 +880,32 @@ char* get_sphere(str* pres_uri) if(!sphere_enable) return NULL; - /* search in hash table*/ - hash_code= core_hash(pres_uri, NULL, phtable_size); + if ( dbmode != DB_ONLY ) + { + /* search in hash table*/ + hash_code= core_hash(pres_uri, NULL, phtable_size); - lock_get(&pres_htable[hash_code].lock); + lock_get(&pres_htable[hash_code].lock); - p= search_phtable(pres_uri, EVENT_PRESENCE, hash_code); + p= search_phtable(pres_uri, EVENT_PRESENCE, hash_code); - if(p) - { - if(p->sphere) + if(p) { - sphere= (char*)pkg_malloc(strlen(p->sphere)* sizeof(char)); - if(sphere== NULL) + if(p->sphere) { - lock_release(&pres_htable[hash_code].lock); - ERR_MEM(PKG_MEM_STR); + sphere= (char*)pkg_malloc(strlen(p->sphere)* sizeof(char)); + if(sphere== NULL) + { + lock_release(&pres_htable[hash_code].lock); + ERR_MEM(PKG_MEM_STR); + } + strcpy(sphere, p->sphere); } - strcpy(sphere, p->sphere); + lock_release(&pres_htable[hash_code].lock); + return sphere; } lock_release(&pres_htable[hash_code].lock); - return sphere; } - lock_release(&pres_htable[hash_code].lock); - /* if record not found and subscriptions are held also in database, query database*/ if(dbmode == DB_MEMORY_ONLY) diff --git a/modules_k/presence/publish.c b/modules_k/presence/publish.c index c2738bb..79bb65d 100644 --- a/modules_k/presence/publish.c +++ b/modules_k/presence/publish.c @@ -187,7 +187,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) } /* delete from hash table */ - if(delete_phtable(&p[i].uri, ev.type)< 0) + if(dbmode != DB_ONLY && delete_phtable(&p[i].uri, ev.type)< 0) { LM_ERR("deleting from pres hash table\n"); free_event_params(ev.params.list, PKG_MEM_TYPE);

12 years, 7 months

git:master: lib/srdb1: added the ability to use bitwise-and in DB queries

by Peter Dunkley

Module: sip-router Branch: master Commit: 659fe4b6aef276f6925e1ba08b6e61ca40e838d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=659fe4b… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:58:43 2011 +0100 lib/srdb1: added the ability to use bitwise-and in DB queries - This is used in the changes to add db only mode to pua - This enhancement was made by Paul Pankhurst at Crocodile RCS --- lib/srdb1/db_op.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_op.h b/lib/srdb1/db_op.h index 10ee44a..b2d04dd 100644 --- a/lib/srdb1/db_op.h +++ b/lib/srdb1/db_op.h @@ -42,6 +42,8 @@ #define OP_GEQ ">=" /** operator negation */ #define OP_NEQ "!=" +/** bitise AND */ +#define OP_BITWISE_AND "&" /**

12 years, 7 months

git:master: modules_k/pua: added DB only mode to PUA

by Peter Dunkley

Module: sip-router Branch: master Commit: 90e9d7fc8fb339194c6be6eec2b1ec793e32af78 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90e9d7f… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 12:45:28 2011 +0100 modules_k/pua: added DB only mode to PUA - By using DB only mode PUA (and modules that use PUA like RLS) can be distributed across many Kamailio servers for scaling and resilience. - This change has been in use internally at Crocodile RCS for some time, but it is extensive. - The DB only mode changes have been made in a way that changes the pre- existing (hash-table based) mode of operation as little as possible. This original mode of operation SHOULD be unaffected by this change. - This enhancement was made by Paul Pankhurst at Crocodile RCS. --- modules_k/pua/README | 218 +++--- modules_k/pua/doc/pua_admin.xml | 32 +- modules_k/pua/hash.c | 73 ++- modules_k/pua/hash.h | 8 +- modules_k/pua/pua.c | 71 ++- modules_k/pua/pua.h | 8 + modules_k/pua/pua_db.c | 1657 +++++++++++++++++++++++++++++++++++++++ modules_k/pua/pua_db.h | 64 ++ modules_k/pua/send_publish.c | 149 +++- modules_k/pua/send_subscribe.c | 181 ++++- 10 files changed, 2262 insertions(+), 199 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=90e…

12 years, 7 months

git:master: modules/textopsx, modules_k/alias_db, modules_k/pua_usrloc: added missing api.h files from previous commits

by Peter Dunkley

Module: sip-router Branch: master Commit: 8f00ae7a9b4e2d19bc49f62b0ab3507c283f74f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f00ae7… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:56:15 2011 +0100 modules/textopsx, modules_k/alias_db, modules_k/pua_usrloc: added missing api.h files from previous commits --- modules/textopsx/api.h | 48 ++++++++++++++++++++++++++++++++++++++++++++ modules_k/alias_db/api.h | 26 +++++++++++++++++++++++ modules_k/pua_usrloc/api.h | 26 +++++++++++++++++++++++ 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/modules/textopsx/api.h b/modules/textopsx/api.h new file mode 100644 index 0000000..d88abfa --- /dev/null +++ b/modules/textopsx/api.h @@ -0,0 +1,48 @@ +/* + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef TEXTOPSX_API_H_ +#define TEXTOPSX_API_H_ +#include "../../str.h" +#include "../../sr_module.h" + + +/* + * Struct with the textopsx api. + */ +typedef struct textopsx_binds { + cmd_function msg_apply_changes; +} textopsx_api_t; + +typedef int (*bind_textopsx_f)(textopsx_api_t*); + +/* + * Function to be called direclty from other modules to load + * the textops API. + */ +inline static int load_textopsx_api(textopsx_api_t *tob){ + bind_textopsx_f bind_textopsx_exports; + if(!(bind_textopsx_exports=(bind_textopsx_f)find_export("bind_textopsx", 1, 0))){ + LM_ERR("Failed to import bind_textopsx\n"); + return -1; + } + return bind_textopsx_exports(tob); +} + +#endif /*TEXTX_OPS_API_H_*/ diff --git a/modules_k/alias_db/api.h b/modules_k/alias_db/api.h new file mode 100644 index 0000000..b5c81b6 --- /dev/null +++ b/modules_k/alias_db/api.h @@ -0,0 +1,26 @@ +#ifndef ALIASDB_API_H +#define ALIASDB_API_H +#include "../../str.h" + +typedef int (*alias_db_lookup_t)(struct sip_msg*, str table); + +typedef struct alias_db_binds { + alias_db_lookup_t alias_db_lookup; +} alias_db_api_t; + +typedef int (*bind_alias_db_f)(alias_db_api_t*); + +int bind_alias_db(struct alias_db_binds*); + +inline static int alias_db_load_api(alias_db_api_t *pxb) +{ + bind_alias_db_f bind_alias_db_exports; + if (!(bind_alias_db_exports = (bind_alias_db_f)find_export("bind_alias_db", 1, 0))) + { + LM_ERR("Failed to import bind_alias_db\n"); + return -1; + } + return bind_alias_db_exports(pxb); +} + +#endif /*ALIASDB_API_H*/ diff --git a/modules_k/pua_usrloc/api.h b/modules_k/pua_usrloc/api.h new file mode 100644 index 0000000..b341d55 --- /dev/null +++ b/modules_k/pua_usrloc/api.h @@ -0,0 +1,26 @@ +#ifndef PUAUSRLOC_API_H +#define PUAUSRLOC_API_H +#include "../../str.h" + +typedef int (*pua_set_publish_t)(struct sip_msg*, char *, char *); + +typedef struct pua_usrloc_binds { + pua_set_publish_t pua_set_publish; +} pua_usrloc_api_t; + +typedef int (*bind_pua_usrloc_f)(pua_usrloc_api_t*); + +int bind_pua_usrloc(struct pua_usrloc_binds*); + +inline static int pua_usrloc_load_api(pua_usrloc_api_t *pxb) +{ + bind_pua_usrloc_f bind_pua_usrloc_exports; + if (!(bind_pua_usrloc_exports = (bind_pua_usrloc_f)find_export("bind_pua_usrloc", 1, 0))) + { + LM_ERR("Failed to import bind_pua_usrloc\n"); + return -1; + } + return bind_pua_usrloc_exports(pxb); +} + +#endif /*PUAUSRLOC_API_H*/

12 years, 7 months

git:master: modules_k/rr: added record_route_preset() to exported API for use in app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: ccf3045d3d91d821081f0812336a9140856b7bf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ccf3045… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:46:36 2011 +0100 modules_k/rr: added record_route_preset() to exported API for use in app_lua - Enhancement made by Hugh Waite at Crocodile RCS --- modules_k/rr/api.c | 1 + modules_k/rr/api.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/rr/api.c b/modules_k/rr/api.c index 55af538..9e3bb46 100644 --- a/modules_k/rr/api.c +++ b/modules_k/rr/api.c @@ -56,6 +56,7 @@ extern int append_fromtag; */ int load_rr( struct rr_binds *rrb ) { + rrb->record_route_preset = record_route_preset; rrb->record_route = record_route; rrb->loose_route = loose_route; rrb->add_rr_param = add_rr_param; diff --git a/modules_k/rr/api.h b/modules_k/rr/api.h index d25a13b..c0c09e9 100644 --- a/modules_k/rr/api.h +++ b/modules_k/rr/api.h @@ -56,6 +56,7 @@ typedef int (*loose_route_f)(struct sip_msg*); /*! record-route API export binding */ typedef struct rr_binds { record_route_f record_route; + record_route_f record_route_preset; loose_route_f loose_route; add_rr_param_t add_rr_param; check_route_param_t check_route_param;

12 years, 7 months

git:master: modules_k/siputils: added has_totag() to exported API for use in app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: c8fa3d8c28d4d1d918b09d0e9dc29ee59bd38928 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8fa3d8… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:48:22 2011 +0100 modules_k/siputils: added has_totag() to exported API for use in app_lua --- modules_k/siputils/siputils.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/siputils.h b/modules_k/siputils/siputils.h index f9afcf8..b640a25 100644 --- a/modules_k/siputils/siputils.h +++ b/modules_k/siputils/siputils.h @@ -24,10 +24,13 @@ #ifndef _SIPUTILS_H_ #define _SIPUTILS_H_ +typedef int (*siputils_has_totag_t)(struct sip_msg*, char*, char*); + /*! Siputils module API */ typedef struct siputils_api { int_str rpid_avp; /*!< Name of AVP containing Remote-Party-ID */ int rpid_avp_type; /*!< type of the RPID AVP */ + siputils_has_totag_t has_totag; } siputils_api_t; typedef int (*bind_siputils_t)(siputils_api_t* api); @@ -39,4 +42,15 @@ typedef int (*bind_siputils_t)(siputils_api_t* api); */ int bind_siputils(siputils_api_t* api); +inline static int siputils_load_api(siputils_api_t *pxb) +{ + bind_siputils_t bind_siputils_exports; + if (!(bind_siputils_exports = (bind_siputils_t)find_export("bind_siputils", 1, 0))) + { + LM_ERR("Failed to import bind_siputils\n"); + return -1; + } + return bind_siputils_exports(pxb); +} + #endif

12 years, 7 months

git:master: modules_k/registrar: added registered() to exported API for use in app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: fc287bc74e838052914eeeee1af1857533cb4ab1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc287bc… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:44:56 2011 +0100 modules_k/registrar: added registered() to exported API for use in app_lua --- modules_k/registrar/api.c | 16 ++++++++++++++++ modules_k/registrar/api.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/api.c b/modules_k/registrar/api.c index 4d01110..e30be9f 100644 --- a/modules_k/registrar/api.c +++ b/modules_k/registrar/api.c @@ -66,6 +66,21 @@ int regapi_lookup(struct sip_msg *msg, char *table) /** * */ +int regapi_registered(struct sip_msg *msg, char *table) +{ + udomain_t* d; + + if(ul.get_udomain(table, &d)<0) + { + LM_ERR("usrloc domain [%s] not found\n", table); + return -1; + } + return registered(msg, (char*)d, NULL); +} + +/** + * + */ int bind_registrar(registrar_api_t* api) { if (!api) { @@ -74,6 +89,7 @@ int bind_registrar(registrar_api_t* api) } api->save = regapi_save; api->lookup = regapi_lookup; + api->registered = regapi_registered; return 0; } diff --git a/modules_k/registrar/api.h b/modules_k/registrar/api.h index e559ec5..efdd2d7 100644 --- a/modules_k/registrar/api.h +++ b/modules_k/registrar/api.h @@ -43,6 +43,7 @@ int regapi_lookup(struct sip_msg *msg, char *table); typedef struct registrar_api { regapi_save_f save; regapi_lookup_f lookup; + regapi_lookup_f registered; } registrar_api_t; typedef int (*bind_registrar_f)(registrar_api_t* api);

12 years, 7 months

git:master: modules_k/alias_db: exported alias_db API for use in app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: ac560678f44064bffb263e199f66029da926162b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac56067… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:40:20 2011 +0100 modules_k/alias_db: exported alias_db API for use in app_lua --- modules_k/alias_db/alias_db.c | 30 +++++++++++++++++++++++++++++- modules_k/alias_db/alookup.c | 10 ++-------- modules_k/alias_db/alookup.h | 2 +- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/modules_k/alias_db/alias_db.c b/modules_k/alias_db/alias_db.c index 0606cd9..c36ce1f 100644 --- a/modules_k/alias_db/alias_db.c +++ b/modules_k/alias_db/alias_db.c @@ -38,6 +38,7 @@ #include "../../mod_fix.h" #include "alookup.h" +#include "api.h" MODULE_VERSION @@ -53,6 +54,7 @@ static int child_init(int rank); /* Module initialization function prototype */ static int mod_init(void); +static int w_alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2); /* Module parameter variables */ static str db_url = str_init(DEFAULT_RODB_URL); @@ -69,8 +71,10 @@ db_func_t adbf; /* DB functions */ /* Exported functions */ static cmd_export_t cmds[] = { - {"alias_db_lookup", (cmd_function)alias_db_lookup, 1, fixup_spve_null, 0, + {"alias_db_lookup", (cmd_function)w_alias_db_lookup, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"bind_alias_db", (cmd_function)bind_alias_db, 1, 0, 0, + 0}, {0, 0, 0, 0, 0, 0} }; @@ -166,3 +170,27 @@ static void destroy(void) } } +static int w_alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2) +{ + str table_s; + + if(_table==NULL || fixup_get_svalue(_msg, (gparam_p)_table, &table_s)!=0) + { + LM_ERR("invalid table parameter\n"); + return -1; + } + + return alias_db_lookup(_msg, table_s); +} + +int bind_alias_db(struct alias_db_binds *pxb) +{ + if (pxb == NULL) + { + LM_WARN("bind_alias_db: Cannot load alias_db API into a NULL pointer\n"); + return -1; + } + + pxb->alias_db_lookup = alias_db_lookup; + return 0; +} diff --git a/modules_k/alias_db/alookup.c b/modules_k/alias_db/alookup.c index 33bb65a..f353981 100644 --- a/modules_k/alias_db/alookup.c +++ b/modules_k/alias_db/alookup.c @@ -70,20 +70,14 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) /** * */ -int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2) +int alias_db_lookup(struct sip_msg* _msg, str table_s) { - str user_s, table_s; + str user_s; db_key_t db_keys[2] = {&alias_user_column, &alias_domain_column}; db_val_t db_vals[2]; db_key_t db_cols[] = {&user_column, &domain_column}; db1_res_t* db_res = NULL; int i; - - if(_table==NULL || fixup_get_svalue(_msg, (gparam_p)_table, &table_s)!=0) - { - LM_ERR("invalid table parameter\n"); - return -1; - } if (parse_sip_msg_uri(_msg) < 0) return -1; diff --git a/modules_k/alias_db/alookup.h b/modules_k/alias_db/alookup.h index 0ff0d0d..e397186 100644 --- a/modules_k/alias_db/alookup.h +++ b/modules_k/alias_db/alookup.h @@ -32,6 +32,6 @@ #include "../../parser/msg_parser.h" -int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2); +int alias_db_lookup(struct sip_msg* _msg, str _table); #endif /* _ALOOKUP_H_ */

12 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011