sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: msilo(k): added callid and status columns

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3788a89f24f034c77db743d196745e0a8b2458d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3788a89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 23 22:26:42 2012 +0200 msilo(k): added callid and status columns - needed to eventually apply patch from FS#211 for notifying on message delivery - not in use right now, time version increased and db creation scripts were regenerated --- lib/srdb1/schema/silo.xml | 20 ++++++++++++++++++-- utils/kamctl/db_berkeley/kamailio/lcr_rule | 2 +- utils/kamctl/db_berkeley/kamailio/silo | 6 +++--- utils/kamctl/db_berkeley/kamailio/version | 4 ++-- utils/kamctl/db_sqlite/lcr-create.sql | 6 +++--- utils/kamctl/db_sqlite/msilo-create.sql | 6 ++++-- utils/kamctl/dbtext/kamailio/lcr_rule | 2 +- utils/kamctl/dbtext/kamailio/silo | 2 +- utils/kamctl/dbtext/kamailio/version | 4 ++-- utils/kamctl/mysql/lcr-create.sql | 6 +++--- utils/kamctl/mysql/msilo-create.sql | 6 ++++-- utils/kamctl/oracle/lcr-create.sql | 6 +++--- utils/kamctl/oracle/msilo-create.sql | 6 ++++-- utils/kamctl/postgres/lcr-create.sql | 6 +++--- utils/kamctl/postgres/msilo-create.sql | 6 ++++-- 15 files changed, 56 insertions(+), 32 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=378…

12 years, 8 months

git:master: dialg(k): possibility to send keep alives for dialogs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7d013ceb1e9e84c8579bdba17ecd9d7f249c8482 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d013ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 23 22:10:42 2012 +0200 dialg(k): possibility to send keep alives for dialogs - keepalives are OPTIONS requests - if keepalive request get 408 ot 481, dialog is timed out after 10 secs --- modules_k/dialog/dialog.c | 74 ++++++++++++++++++++++ modules_k/dialog/dlg_handlers.c | 3 + modules_k/dialog/dlg_hash.c | 122 +++++++++++++++++++++++++++++++++++++ modules_k/dialog/dlg_hash.h | 14 ++++ modules_k/dialog/dlg_req_within.c | 105 +++++++++++++++++++++++++++++++- modules_k/dialog/dlg_req_within.h | 1 + modules_k/dialog/dlg_var.h | 1 + 7 files changed, 319 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7d0…

12 years, 8 months

git:master: registrar(k): new parameter xavp_rcd - store details of UL record

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2e1a9d552488908cb92574581062aa2b702134ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e1a9d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 22 20:49:46 2012 +0200 registrar(k): new parameter xavp_rcd - store details of UL record - if set, the internal ruid field will be returned as inner xavp to it --- modules_k/registrar/README | 61 ++++++++++++++++++--------- modules_k/registrar/doc/registrar_admin.xml | 34 +++++++++++++++ modules_k/registrar/lookup.c | 22 ++++++++++ modules_k/registrar/reg_mod.c | 5 ++ modules_k/registrar/reg_mod.h | 1 + modules_k/registrar/reply.c | 32 ++++++++++++++ 6 files changed, 135 insertions(+), 20 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2e1…

12 years, 8 months

git:master: modules_k/pua: Documented new "pua_cleanup" MI command

by Peter Dunkley

Module: sip-router Branch: master Commit: 5ae271e248313fc1a3870cda90a8f3b128f0c105 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ae271e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 19:26:44 2012 +0100 modules_k/pua: Documented new "pua_cleanup" MI command --- modules_k/pua/README | 67 ++++++++++++++++++++++++++------------ modules_k/pua/doc/pua_admin.xml | 24 ++++++++++++++ 2 files changed, 70 insertions(+), 21 deletions(-) diff --git a/modules_k/pua/README b/modules_k/pua/README index 3ec5266..2451954 100644 --- a/modules_k/pua/README +++ b/modules_k/pua/README @@ -8,7 +8,7 @@ Edited by Anca-Maria Vamanu - Copyright � 2006 Voice Sistem SRL + Copyright © 2006 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -40,7 +40,11 @@ Anca-Maria Vamanu 4.1. pua_update_contact() - 5. Installation + 5. MI Commands + + 5.1. pua_cleanup + + 6. Installation 2. Developer Guide @@ -100,7 +104,11 @@ Chapter 1. Admin Guide 4.1. pua_update_contact() - 5. Installation + 5. MI Commands + + 5.1. pua_cleanup + + 6. Installation 1. Overview @@ -165,7 +173,7 @@ Chapter 1. Admin Guide information. This parameter will be used as the power of 2 when computing table size. - Default value is "9". + Default value is “9”. Example 1.1. Set hash_size parameter ... @@ -176,7 +184,7 @@ modparam("pua", "hash_size", 11) Database url. - Default value is ">mysql://openser:openserrw@localhost/openser". + Default value is “>mysql://openser:openserrw@localhost/openser”. Example 1.2. Set db_url parameter ... @@ -187,7 +195,7 @@ modparam("pua", "db_url" "dbdriver://username:password@dbhost/dbname") The name of the database table. - Default value is "pua". + Default value is “pua”. Example 1.3. Set db_table parameter ... @@ -198,7 +206,7 @@ modparam("pua", "db_table", "pua") The inferior expires limit for both Publish and Subscribe. - Default value is "0". + Default value is “0”. Example 1.4. Set min_expires parameter ... @@ -210,7 +218,7 @@ modparam("pua", "min_expires", 0) The default expires value used in case this information is not provisioned. - Default value is "3600". + Default value is “3600”. Example 1.5. Set default_expires parameter ... @@ -224,7 +232,7 @@ modparam("pua", "default_expires", 3600) expired messages. Setting a value less than or equal to zero, disables updates. - Default value is "100". + Default value is “100”. Example 1.6. Set update_period parameter ... @@ -253,7 +261,7 @@ modparam("pua", "outbound_proxy", "sip:outbound.example.com") presence_dialoginfo module) it makes no sense to waste CPU resources for parsing the XML body and the parameter should be set to 0. - Default value is "0". + Default value is “0”. Example 1.8. Set dlginfo_increase_version parameter ... @@ -271,7 +279,7 @@ modparam("pua", "dlginfo_increase_version", 1) presence_reginfo module) it makes no sense to waste CPU resources for parsing the XML body and the parameter should be set to 0. - Default value is "0". + Default value is “0”. Example 1.9. Set reginfo_increase_version parameter ... @@ -285,7 +293,7 @@ modparam("pua", "reginfo_increase_version", 1) in a database, allowing scalability at the expense of speed. Mode 1 is reserved. - Default value is "0". + Default value is “0”. Example 1.10. Set db_mode parameter ... @@ -302,7 +310,7 @@ modparam("pua", "db_mode", 0) anyway. Set this parameter to 0 to disable checking of remote contact for SUBSCRIBE dialog matching. - Default value is "1". + Default value is “1”. Example 1.11. Set check_remote_contact parameter ... @@ -324,7 +332,7 @@ modparam("pua", "fetch_rows", 1000) 4.1. pua_update_contact() -4.1. pua_update_contact() +4.1. pua_update_contact() The remote target can be updated by the Contact of a subsequent in dialog request. In the PUA watcher case (sending a SUBSCRIBE messages), @@ -345,7 +353,24 @@ if(method=="NOTIFY") pua_update_contact(); ... -5. Installation +5. MI Commands + + 5.1. pua_cleanup + +5.1. pua_cleanup + + Manually triggers the cleanup functions for the pua table. Useful if + you have set update_period to zero or less. + + Name: pua_cleanup + + Parameters: none + + MI FIFO Command Format: + :pua_cleanup:fifo_reply + _empty_line_ + +6. Installation The module requires one table in the Kamailio database: pua. The SQL syntax to create it can be found in presence_xml-create.sql script in @@ -367,7 +392,7 @@ Chapter 2. Developer Guide The module provides the following functions that can be used by other Kamailio modules. -1. bind_pua(pua_api_t* api) +1. bind_pua(pua_api_t* api) This function binds the pua modules and fills the structure with the two exported functions. @@ -383,7 +408,7 @@ typedef struct pua_api { } pua_api_t; ... -2. send_publish +2. send_publish Field type: ... @@ -423,7 +448,7 @@ typedef struct publ_info }publ_info_t; ... -3. send_subscribe +3. send_subscribe Field type: ... @@ -462,7 +487,7 @@ typedef struct subs_info }subs_info_t; ... -4. is_dialog +4. is_dialog Field type: ... @@ -481,7 +506,7 @@ typedef int (*query_dialog_t)(ua_pres_t* presentity); } ... -5. register_puacb +5. register_puacb Field type: ... @@ -510,7 +535,7 @@ typedef int (*register_puacb_t)(int types, pua_cb f, void* param ); typedef int (pua_cb)(ua_pres_t* hentity, struct sip_msg*); ... -6. add_event +6. add_event Field type: ... diff --git a/modules_k/pua/doc/pua_admin.xml b/modules_k/pua/doc/pua_admin.xml index b8c9752..162db99 100644 --- a/modules_k/pua/doc/pua_admin.xml +++ b/modules_k/pua/doc/pua_admin.xml @@ -375,6 +375,30 @@ if(method=="NOTIFY") </section> </section> +<section> + <title>MI Commands</title> + <section> + <title> + <function moreinfo="none">pua_cleanup</function> + </title> + <para> + Manually triggers the cleanup functions for the pua table. + Useful if you have set <varname>update_period</varname> to zero or less. + </para> + <para> + Name: <emphasis>pua_cleanup</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :pua_cleanup:fifo_reply + _empty_line_ + </programlisting> + </section> +</section> <section> <title>Installation</title>

12 years, 8 months

git:master: modules_k/presence: Updated presence "cleanup" MI command to clean active_watchers table as well

by Peter Dunkley

Module: sip-router Branch: master Commit: db231b3985c2fae1b8cf94e92f6ff9965a7da1b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db231b3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 19:27:50 2012 +0100 modules_k/presence: Updated presence "cleanup" MI command to clean active_watchers table as well --- modules_k/presence/presence.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index afc7532..1580942 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -787,6 +787,7 @@ static struct mi_root* mi_cleanup(struct mi_root* cmd, void* param) (void)msg_watchers_clean(0,0); (void)msg_presentity_clean(0,0); + (void)timer_db_update(0,0); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); }

12 years, 8 months

git:master: modules_k/presence: Updated documentation for "cleanup" MI command

by Peter Dunkley

Module: sip-router Branch: master Commit: 7945158083b5f7b34bd3f9b2b754c459293ba428 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7945158… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 19:28:39 2012 +0100 modules_k/presence: Updated documentation for "cleanup" MI command --- modules_k/presence/README | 7 ++++--- modules_k/presence/doc/presence_admin.xml | 12 +++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules_k/presence/README b/modules_k/presence/README index 17c3365..761c1ce 100644 --- a/modules_k/presence/README +++ b/modules_k/presence/README @@ -728,12 +728,13 @@ pres_update_presentity("$xcapuri(u=>xuid)", "$xcapuri(u=>uri_adoc)", "$xcapuri(u 5.2. cleanup - Manually triggers the cleanup functions for watchers and presentity - tables. Useful if you have set clean_period to zero or less. + Manually triggers the cleanup functions for the active_watchers, + presentity, and watchers tables. Useful if you have set clean_period + and/or db_update_period to zero or less. Name: cleanup - Parameters:none.emphasis> + Parameters: none MI FIFO Command Format: :cleanup:fifo_reply diff --git a/modules_k/presence/doc/presence_admin.xml b/modules_k/presence/doc/presence_admin.xml index c0982a3..cb9f90d 100644 --- a/modules_k/presence/doc/presence_admin.xml +++ b/modules_k/presence/doc/presence_admin.xml @@ -878,13 +878,14 @@ pres_update_presentity("$xcapuri(u=>xuid)", "$xcapuri(u=>uri_adoc)", "$xcapuri(u <function moreinfo="none">cleanup</function> </title> <para> - Manually triggers the cleanup functions for watchers and presentity tables. Useful if you - have set <varname>clean_period</varname> to zero or less. + Manually triggers the cleanup functions for the active_watchers, presentity, + and watchers tables. Useful if you have set <varname>clean_period</varname> + and/or <varname>db_update_period</varname> to zero or less. </para> <para> Name: <emphasis>cleanup</emphasis> </para> - <para>Parameters:<emphasis>none.</emphasis>emphasis></para> + <para>Parameters: <emphasis>none</emphasis></para> <para> MI FIFO Command Format: @@ -894,10 +895,7 @@ pres_update_presentity("$xcapuri(u=>xuid)", "$xcapuri(u=>uri_adoc)", "$xcapuri(u _empty_line_ </programlisting> </section> - - </section> - - +</section> <section> <title>Installation</title>

12 years, 8 months

git:master: modules_k/rls: Documented new "rls_cleanup" MI command

by Peter Dunkley

Module: sip-router Branch: master Commit: c740f0fca228376159895874a2534ebe5c0d8df1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c740f0f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 19:27:21 2012 +0100 modules_k/rls: Documented new "rls_cleanup" MI command --- modules_k/rls/README | 32 +++++++++++++++++++++++++++++--- modules_k/rls/doc/rls_admin.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index 40ebeae..955b16d 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -55,7 +55,11 @@ Anca-Maria Vamanu 4.2. rls_handle_notify() 4.3. rls_update_subs(uri, event) - 5. Installation + 5. MI Commands + + 5.1. rls_cleanup + + 6. Installation 2. Developer Guide @@ -134,7 +138,11 @@ Chapter 1. Admin Guide 4.2. rls_handle_notify() 4.3. rls_update_subs(uri, event) - 5. Installation + 5. MI Commands + + 5.1. rls_cleanup + + 6. Installation 1. Overview @@ -640,7 +648,25 @@ Within event_route[xhttp:request]: break; ... -5. Installation +5. MI Commands + + 5.1. rls_cleanup + +5.1. rls_cleanup + + Manually triggers the cleanup functions forthe rls_watchers and + rls_presentity tables. Useful if you have set clean_period to zero or + less. + + Name: rls_cleanup + + Parameters: none + + MI FIFO Command Format: + :rls_cleanup:fifo_reply + _empty_line_ + +6. Installation The module requires 2 tables in Kamailio database: rls_presentity and rls_watchers.The SQL syntax to create them can be found in diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index db03b9f..18f784f 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -767,6 +767,32 @@ Within event_route[xhttp:request]: </section> <section> + <title>MI Commands</title> + <section> + <title> + <function moreinfo="none">rls_cleanup</function> + </title> + <para> + Manually triggers the cleanup functions forthe rls_watchers and + rls_presentity tables. Useful if you have set + <varname>clean_period</varname> to zero or less. + </para> + <para> + Name: <emphasis>rls_cleanup</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :rls_cleanup:fifo_reply + _empty_line_ + </programlisting> + </section> +</section> + +<section> <title>Installation</title> <para> The module requires 2 tables in &kamailio; database: rls_presentity

12 years, 8 months

git:master: modules_k/pua: Added MI command to "clean" the pua table

by Peter Dunkley

Module: sip-router Branch: master Commit: aca1f7ac71788a947be3d70a21773f5f94c81694 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aca1f7a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 18:55:27 2012 +0100 modules_k/pua: Added MI command to "clean" the pua table - This is similar to the clean MI commands in presence and RLS - Useful on multi-server systems where you don't want to run the timers and have each Kamailio instance try and clean. The MI command allows you to kick of a clean on a specific server as required. --- modules_k/pua/Makefile | 1 + modules_k/pua/pua.c | 107 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 78 insertions(+), 30 deletions(-) diff --git a/modules_k/pua/Makefile b/modules_k/pua/Makefile index 2b81d14..c556ac5 100644 --- a/modules_k/pua/Makefile +++ b/modules_k/pua/Makefile @@ -13,6 +13,7 @@ LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 3deef9c..5d11066 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -42,6 +42,7 @@ #include "../../mem/mem.h" #include "../../pt.h" #include "../../lib/srdb1/db.h" +#include "../../lib/kmi/mi.h" #include "../../modules/tm/tm_load.h" #include "pua.h" #include "send_publish.h" @@ -102,7 +103,9 @@ static str str_version_col = str_init("version"); static int mod_init(void); static int child_init(int); +static int mi_child_init(void); static void destroy(void); +static struct mi_root* mi_cleanup(struct mi_root* cmd, void* param); static ua_pres_t* build_uppubl_cbparam(ua_pres_t* p); @@ -112,42 +115,47 @@ static void hashT_clean(unsigned int ticks,void *param); static cmd_export_t cmds[]= { - {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, - {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, - {"pua_update_contact", (cmd_function)update_contact, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0} + {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, + {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, + {"pua_update_contact", (cmd_function)update_contact, 0, 0, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} }; static param_export_t params[]={ - {"hash_size" , INT_PARAM, &HASH_SIZE }, - {"db_url" , STR_PARAM, &db_url.s }, - {"db_table" , STR_PARAM, &db_table.s }, - {"min_expires", INT_PARAM, &min_expires }, - {"default_expires", INT_PARAM, &default_expires }, - {"update_period", INT_PARAM, &update_period }, - {"outbound_proxy", STR_PARAM, &outbound_proxy.s }, - {"dlginfo_increase_version", INT_PARAM, &dlginfo_increase_version}, - {"reginfo_increase_version", INT_PARAM, &reginfo_increase_version}, - {"check_remote_contact", INT_PARAM, &check_remote_contact }, - {"db_mode", INT_PARAM, &dbmode }, - {"fetch_rows", INT_PARAM, &pua_fetch_rows }, - {0, 0, 0 } + {"hash_size", INT_PARAM, &HASH_SIZE}, + {"db_url", STR_PARAM, &db_url.s}, + {"db_table", STR_PARAM, &db_table.s}, + {"min_expires", INT_PARAM, &min_expires}, + {"default_expires", INT_PARAM, &default_expires}, + {"update_period", INT_PARAM, &update_period}, + {"outbound_proxy", STR_PARAM, &outbound_proxy.s}, + {"dlginfo_increase_version", INT_PARAM, &dlginfo_increase_version}, + {"reginfo_increase_version", INT_PARAM, &reginfo_increase_version}, + {"check_remote_contact", INT_PARAM, &check_remote_contact}, + {"db_mode", INT_PARAM, &dbmode}, + {"fetch_rows", INT_PARAM, &pua_fetch_rows}, + {0, 0, 0} +}; + +static mi_export_t mi_cmds[] = { + { "pua_cleanup", mi_cleanup, 0, 0, mi_child_init}, + { 0, 0, 0, 0, 0} }; /** module exports */ struct module_exports exports= { - "pua", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported statistics */ - 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* response handling function */ - destroy, /* destroy function */ - child_init /* per-child init function */ + "pua", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported statistics */ + mi_cmds, /* exported MI functions */ + 0, /* exported pseudo-variables */ + 0, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* response handling function */ + destroy, /* destroy function */ + child_init /* per-child init function */ }; /** @@ -157,6 +165,12 @@ static int mod_init(void) { LM_DBG("...\n"); + if (register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if(min_expires< 0) min_expires= 0; @@ -298,7 +312,32 @@ static int child_init(int rank) LM_DBG("child %d: Database connection opened successfully\n", rank); return 0; -} +} + +static int mi_child_init(void) +{ + if (pua_dbf.init==0) + { + LM_CRIT("database not bound\n"); + return -1; + } + pua_db = pua_dbf.init(&db_url); + if (!pua_db) + { + LM_ERR("connecting to database failed\n"); + return -1; + } + + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("Error in use_table pua\n"); + return -1; + } + + LM_DBG("Database connection opened successfully\n"); + + return 0; +} static void destroy(void) { @@ -1172,3 +1211,11 @@ static ua_pres_t* build_uppubl_cbparam(ua_pres_t* p) return cb_param; } +static struct mi_root* mi_cleanup(struct mi_root* cmd, void *param) +{ + LM_DBG("mi_cleanup:start\n"); + + (void)hashT_clean(0,0); + + return init_mi_tree(200, MI_OK_S, MI_OK_LEN); +}

12 years, 8 months

git:master: modules_k/rls: Fixed issues with new RLS MI command

by Peter Dunkley

Module: sip-router Branch: master Commit: bdaeb24dd8fbc3f2bb5db2c14d0ea9741efacb8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdaeb24… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 17:32:36 2012 +0100 modules_k/rls: Fixed issues with new RLS MI command - Renamed "cleanup" to "rls_cleanup" so it doesn't conflict with the presence MI command of the same name. - I'd forgotton to register the MI commands in mod_init() --- modules_k/rls/rls.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 026b9b3..7e73a27 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -256,24 +256,24 @@ static param_export_t params[]={ }; static mi_export_t mi_cmds[] = { - { "cleanup", mi_cleanup, 0, 0, mi_child_init}, + { "rls_cleanup", mi_cleanup, 0, 0, mi_child_init}, { 0, 0, 0, 0, 0} }; /** module exports */ struct module_exports exports= { - "rls", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported statistics */ - mi_cmds, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* response handling function */ - (destroy_function) destroy, /* destroy function */ - child_init /* per-child init function */ + "rls", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported statistics */ + mi_cmds, /* exported MI functions */ + 0, /* exported pseudo-variables */ + 0, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* response handling function */ + (destroy_function) destroy, /* destroy function */ + child_init /* per-child init function */ }; /** @@ -293,6 +293,12 @@ static int mod_init(void) LM_DBG("start\n"); + if (register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if (dbmode <RLS_DB_DEFAULT || dbmode > RLS_DB_ONLY) { LM_ERR( "Invalid dbmode-set to default mode\n" );

12 years, 8 months

git:3.2: userblacklist(k): fix some doc errors, pointed out from Daniel Vukicevic, daniel at vukicevic dot com

by Henning Westerholt

Module: sip-router Branch: 3.2 Commit: 349969b5a91744eebd7c269cb747d2332245df6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=349969b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Mon Apr 23 18:21:46 2012 +0200 userblacklist(k): fix some doc errors, pointed out from Daniel Vukicevic, daniel at vukicevic dot com (cherry picked from commit 7fc5aa2c050379063212c4bb5f06697e8a97c665) --- modules_k/userblacklist/README | 6 +++--- .../userblacklist/doc/userblacklist_admin.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/userblacklist/README b/modules_k/userblacklist/README index 2227526..6089c60 100644 --- a/modules_k/userblacklist/README +++ b/modules_k/userblacklist/README @@ -220,7 +220,7 @@ table) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { sl_send_reply("403", "Forbidden"); exit; } @@ -241,7 +241,7 @@ table) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) { # process request exit; } @@ -256,7 +256,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) Example 1.5. check_blacklist usage ... -if (!check_blacklist("global_blacklist"))) +if (!check_blacklist("globalblacklist")) { sl_send_reply("403", "Forbidden"); exit; } diff --git a/modules_k/userblacklist/doc/userblacklist_admin.xml b/modules_k/userblacklist/doc/userblacklist_admin.xml index 910b930..2900a02 100644 --- a/modules_k/userblacklist/doc/userblacklist_admin.xml +++ b/modules_k/userblacklist/doc/userblacklist_admin.xml @@ -140,7 +140,7 @@ modparam("userblacklist", "match_mode", 128) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { sl_send_reply("403", "Forbidden"); exit; } @@ -167,7 +167,7 @@ if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) { # process request exit; } @@ -189,7 +189,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) <title><function>check_blacklist</function> usage</title> <programlisting format="linespecific"> ... -if (!check_blacklist("global_blacklist"))) +if (!check_blacklist("globalblacklist")) { sl_send_reply("403", "Forbidden"); exit; }

12 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012