sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
347 discussions

git:master: htable(k): Implement "delete" mi/rpc function.
by Andreas Granig 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 2f3ff59394450fa76cdbb46db4f8f605d6ad471e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f3ff59… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Fri Apr 20 15:59:28 2012 +0200 htable(k): Implement "delete" mi/rpc function. - Lets you delete specific keys from an htable via the MI or RPC interface. --- modules_k/htable/doc/htable_admin.xml | 37 ++++++++++++++++++++- modules_k/htable/htable.c | 57 +++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index 09ee23c..9749c9b 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -620,7 +620,7 @@ sht_rm_value_re("ha=>.*"); _empty_line_ </programlisting> </section> - <section> + <section> <title> <function moreinfo="none">sht_dump</function> </title> @@ -635,12 +635,45 @@ sht_rm_value_re("ha=>.*"); <para> MI FIFO Command Format: </para> - <programlisting format="linespecific"> + <programlisting format="linespecific"> :sht_dump:_reply_fifo_file_ _hash_table_name_ _empty_line_ </programlisting> </section> + <section> + <title> + <function moreinfo="none">sht_delete</function> + </title> + <para> + Delete a key from a hash table via MI. + </para> + <para> + Name: <emphasis>sht_delete</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para><emphasis>_hash_table_name: </emphasis>The table name to delete the key from</para></listitem> + <listitem><para><emphasis>_key_name: </emphasis>The key to delete from the htable</para></listitem> + </itemizedlist> + + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :sht_delete:_reply_fifo_file_ + _hash_table_name_ + _key_name_ + _empty_line_ + </programlisting> + + <para> + Example (note the quoting when executing it via FIFO): + </para> + <programlisting format="linespecific"> + kamctl fifo sht_delete auth '"user@example.org::last_auth"' + </programlisting> + </section> </section> <section> <title>Event routes</title> diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 66bde1c..702bda9 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -66,6 +66,7 @@ int ht_param(modparam_t type, void* val); static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param); static struct mi_root* ht_mi_dump(struct mi_root* cmd_tree, void* param); +static struct mi_root* ht_mi_delete(struct mi_root* cmd_tree, void* param); static pv_export_t mod_pvs[] = { { {"sht", sizeof("sht")-1}, PVT_OTHER, pv_get_ht_cell, pv_set_ht_cell, @@ -87,6 +88,7 @@ static pv_export_t mod_pvs[] = { static mi_export_t mi_cmds[] = { { "sht_reload", ht_mi_reload, 0, 0, 0}, { "sht_dump", ht_mi_dump, 0, 0, 0}, + { "sht_delete", ht_mi_delete, 0, 0, 0}, { 0, 0, 0, 0, 0} }; @@ -414,6 +416,39 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); } +static struct mi_root* ht_mi_delete(struct mi_root* cmd_tree, void* param) { + struct mi_node *node; + str *htname, *key; + ht_t *ht; + + node = cmd_tree->node.kids; + if (!node) + goto param_err; + + htname = &node->value; + if (!htname->len) + goto param_err; + + node = node->next; + if (!node) + goto param_err; + + key = &node->value; + if (!key->len) + goto param_err; + + ht = ht_get_table(htname); + if (!ht) + return init_mi_tree(404, MI_BAD_PARM_S, MI_BAD_PARM_LEN); + + ht_del_cell(ht, key); + + return init_mi_tree(200, MI_OK_S, MI_OK_LEN); + +param_err: + return init_mi_tree(400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); +} + static struct mi_root* ht_mi_dump(struct mi_root* cmd_tree, void* param) { struct mi_node* node; @@ -487,6 +522,27 @@ static const char* htable_dump_doc[2] = { "Dump the contents of hash table.", 0 }; +static const char* htable_delete_doc[2] = { + "Delete one key from a hash table.", + 0 +}; + +static void htable_rpc_delete(rpc_t* rpc, void* c) { + str htname, keyname; + ht_t *ht; + + if (rpc->scan(c, "SS", &htname, &keyname) < 2) { + rpc->fault(c, 500, "Not enough parameters (htable name & key name"); + return; + } + ht = ht_get_table(&htname); + if (!ht) { + rpc->fault(c, 500, "No such htable"); + return; + } + + ht_del_cell(ht, &keyname); +} static void htable_rpc_dump(rpc_t* rpc, void* c) { @@ -568,6 +624,7 @@ error: rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, 0}, + {"htable.delete", htable_rpc_delete, htable_delete_doc, 0}, {0, 0, 0, 0} };

1 0

git:master: tm: reset T if t_continue() resumes a canceled transaction
by Daniel-Constantin Mierla 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 00193f5e1f0e9e12b55c50d33eaf6f3d32e8bb92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00193f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 20 15:35:49 2012 +0200 tm: reset T if t_continue() resumes a canceled transaction - when the suspended transaction was already canceled, and t_continue was executed before transaction was destroyed, global variable T was left set, causing an extra unref by post script callback --- modules/tm/t_suspend.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index e6e2e35..35adcb1 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -133,6 +133,8 @@ int t_continue(unsigned int hash_index, unsigned int label, /* The transaction has already been canceled, * needless to continue */ UNREF(t); /* t_unref would kill the transaction */ + /* reset T as we have no working T anymore */ + set_t(T_UNDEFINED, T_BR_UNDEFINED); return 1; }

1 0

git:3.2: modules/db_postgres: Fixed copy-and-paste error in module documentation
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: 3.2 Commit: 91b6dd8d1fbf649e6fe3075f59ae92892fb6cb1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91b6dd8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 14:15:36 2012 +0100 modules/db_postgres: Fixed copy-and-paste error in module documentation (cherry picked from commit c5a51e4236498cfe3ca31c8aae96d3b422a9da23) --- modules/db_postgres/README | 2 +- modules/db_postgres/doc/db_postgres_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/README b/modules/db_postgres/README index 3859294..76f10ce 100644 --- a/modules/db_postgres/README +++ b/modules/db_postgres/README @@ -85,7 +85,7 @@ Chapter 1. Admin Guide Example 1.1. Set retries parameter ... -modparam("db_mysql", "retries", 3) +modparam("db_postgres", "retries", 3) ... 4. Functions diff --git a/modules/db_postgres/doc/db_postgres_admin.xml b/modules/db_postgres/doc/db_postgres_admin.xml index 4f36f53..3092c56 100644 --- a/modules/db_postgres/doc/db_postgres_admin.xml +++ b/modules/db_postgres/doc/db_postgres_admin.xml @@ -76,7 +76,7 @@ <title>Set <varname>retries</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("db_mysql", "retries", 3) +modparam("db_postgres", "retries", 3) ... </programlisting> </example>

1 0

git:master: modules/db_postgres: Fixed copy-and-paste error in module documentation
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: c5a51e4236498cfe3ca31c8aae96d3b422a9da23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5a51e4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 14:15:36 2012 +0100 modules/db_postgres: Fixed copy-and-paste error in module documentation --- modules/db_postgres/README | 2 +- modules/db_postgres/doc/db_postgres_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/README b/modules/db_postgres/README index 3859294..76f10ce 100644 --- a/modules/db_postgres/README +++ b/modules/db_postgres/README @@ -85,7 +85,7 @@ Chapter 1. Admin Guide Example 1.1. Set retries parameter ... -modparam("db_mysql", "retries", 3) +modparam("db_postgres", "retries", 3) ... 4. Functions diff --git a/modules/db_postgres/doc/db_postgres_admin.xml b/modules/db_postgres/doc/db_postgres_admin.xml index 4f36f53..3092c56 100644 --- a/modules/db_postgres/doc/db_postgres_admin.xml +++ b/modules/db_postgres/doc/db_postgres_admin.xml @@ -76,7 +76,7 @@ <title>Set <varname>retries</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("db_mysql", "retries", 3) +modparam("db_postgres", "retries", 3) ... </programlisting> </example>

1 0

git:master: modules_k/rls: RLS full-state NOTIFY requests now sent by notifier process(es)
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: dff68160e4decc43f2da8948ea03bc4d469ded96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dff6816… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:29:32 2012 +0100 modules_k/rls: RLS full-state NOTIFY requests now sent by notifier process(es) - Also modified the notifier process stuff to only work when in DB only mode. This is because the full-state handling stuff in the notifier processes relies on DB only mode. - Leaving the full-state stuff outside of the notifier process didn't work because there was a row update race between the notifier process and non-notifier process when full-state and non- full-state NOTIFY requests were generated at the same time. - This ensures that (with default options) you get at most one NOTIFY (or set of NOTIFYs when splitting large NOTIFYs is enabled) per 5s per watcher from RLS. - It also helps spread out the NOTIFY generation load more evenly across time. --- modules_k/rls/README | 6 ++ modules_k/rls/doc/rls_admin.xml | 8 ++ modules_k/rls/resource_notify.c | 175 +++++++++++++++++++++++++++++++++++++-- modules_k/rls/rls.c | 25 ++++-- modules_k/rls/rls.h | 3 + modules_k/rls/rls_db.c | 20 ++++- modules_k/rls/subscribe.c | 40 ++++++---- 7 files changed, 240 insertions(+), 37 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dff…

2 4

git:master: lib/srdb1: Added db_begin()/db_commit()/db_rollback() wrapper functions
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 5da9a4e773d2c3c625a870dd4639408d99676d69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5da9a4e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 13:56:37 2012 +0100 lib/srdb1: Added db_begin()/db_commit()/db_rollback() wrapper functions - These are helper functions to enable blocks of DB queries/updates in modules to be handled as a single transaction. - These functions wrap db_raw_query() and only perform the BEGIN/COMMIT/ ROLLBACK when the db module supports raw_query(). --- lib/srdb1/db.h | 17 ++++++++++++ lib/srdb1/db_query.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 6d3a45d..5258e2c 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -473,5 +473,22 @@ int db_fetch_query(db_func_t *dbf, int frows, int db_fetch_next(db_func_t *dbf, int frows, db1_con_t* _h, db1_res_t** _r); +/** + * \brief wrapper around db raw_query to perform BEGIN + * \return -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability + */ +int db_begin(db_func_t *dbf, db1_con_t* _h); + +/** + * \brief wrapper around db raw_query to perform COMMIT + * \return -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability + */ +int db_commit(db_func_t *dbf, db1_con_t* _h); + +/** + * \wrapper around db raw_query to perform ROLLBACK + * \return -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability + */ +int db_rollback(db_func_t *dbf, db1_con_t* _h); #endif /* DB1_H */ diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c index 004d10c..1305f46 100644 --- a/lib/srdb1/db_query.c +++ b/lib/srdb1/db_query.c @@ -456,3 +456,72 @@ error: } return -1; } + +/** + * wrapper around db raw_query to perform BEGIN + * return: -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability + */ +int db_begin(db_func_t *dbf, db1_con_t* _h) +{ + db1_res_t *res = NULL; + int ret = 0; + str query_str = str_init("BEGIN"); + + if (DB_CAPABILITY(*dbf, DB_CAP_RAW_QUERY)) { + if (dbf->raw_query(_h, &query_str, &res)) { + LM_ERR("unable to run raw query\n"); + ret = -1; + goto done; + } + ret = 1; + } +done: + if (res) dbf->free_result(_h, res); + return ret; +} + +/** + * wrapper around db raw_query to perform COMMIT + * return: -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability + */ +int db_commit(db_func_t *dbf, db1_con_t* _h) +{ + db1_res_t *res = NULL; + int ret = 0; + str query_str = str_init("COMMIT"); + + if (DB_CAPABILITY(*dbf, DB_CAP_RAW_QUERY)) { + if (dbf->raw_query(_h, &query_str, &res)) { + LM_ERR("unable to run raw query\n"); + ret = -1; + goto done; + } + ret = 1; + } +done: + if (res) dbf->free_result(_h, res); + return ret; +} + +/** + * wrapper around db raw_query to perform ROLLBACK + * return: -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability + */ +int db_rollback(db_func_t *dbf, db1_con_t* _h) +{ + db1_res_t *res = NULL; + int ret = 0; + str query_str = str_init("COMMIT"); + + if (DB_CAPABILITY(*dbf, DB_CAP_RAW_QUERY)) { + if (dbf->raw_query(_h, &query_str, &res)) { + LM_ERR("unable to run raw query\n"); + ret = -1; + goto done; + } + ret = 1; + } +done: + if (res) dbf->free_result(_h, res); + return ret; +}

1 0

git:master: htable(k): Fix stale lock on errors.
by Andreas Granig 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 4d99664a9bad77988ee7b8b386820d41fa919a6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d99664… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Fri Apr 20 14:06:38 2012 +0200 htable(k): Fix stale lock on errors. --- modules_k/htable/htable.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 58e9755..66bde1c 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -519,7 +519,7 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) if (rpc->add(c, "{", &th) < 0) { rpc->fault(c, 500, "Internal error creating rpc"); - return; + goto error; } if(rpc->struct_add(th, "dd{", "entry", i, @@ -527,7 +527,7 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) "slot", &ih)<0) { rpc->fault(c, 500, "Internal error creating rpc"); - return; + goto error; } while(it) { @@ -535,7 +535,7 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) "item", &vh)<0) { rpc->fault(c, 500, "Internal error creating rpc"); - return; + goto error; } if(it->flags&AVP_VAL_STR) { if(rpc->struct_add(vh, "SS", @@ -543,7 +543,7 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) "value", &it->value.s)<0) { rpc->fault(c, 500, "Internal error adding item"); - return; + goto error; } } else { if(rpc->struct_add(vh, "Sd", @@ -551,7 +551,7 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) "value", (int)it->value.n)) { rpc->fault(c, 500, "Internal error adding item"); - return; + goto error; } } it = it->next; @@ -559,6 +559,11 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) } lock_release(&ht->entries[i].lock); } + + return; + +error: + lock_release(&ht->entries[i].lock); } rpc_export_t htable_rpc[] = {

1 0

git:master: modules_k/rls: RLS does not send NOTIFY requests when rls_watchers are cleaned in DB only mode
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 6d33ee03ffbd963bd248ad800eee3378d2fdf9c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d33ee0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 11:43:41 2012 +0100 modules_k/rls: RLS does not send NOTIFY requests when rls_watchers are cleaned in DB only mode - Fixed now. The DB only clean function sets the updated flag. The notifier process will detect that a record needs updated (and that its expires time is in the past) and send a terminated-state NOTIFY and delete the record. --- modules_k/rls/resource_notify.c | 55 ++++++++++++--------- modules_k/rls/rls_db.c | 105 ++++++++++++++++++++++++++++++++++----- 2 files changed, 124 insertions(+), 36 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index b69cdd5..29e0b11 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -852,6 +852,7 @@ static void timer_send_full_state_notifies(int round) event_t parsed_event; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; + int now = (int)time(NULL); query_cols[0] = &str_updated_col; query_vals[0].type = DB1_INT; @@ -945,33 +946,41 @@ static void timer_send_full_state_notifies(int round) sub.remote_cseq = VAL_INT(&values[18]); sub.status = VAL_INT(&values[19]); sub.version = VAL_INT(&values[20]); - sub.expires = VAL_INT(&values[21]) - (int)time(NULL); - if (sub.expires < 0) sub.expires = 0; - - if (rls_get_service_list(&sub.pres_uri, &sub.watcher_user, - &sub.watcher_domain, &service_node, &doc) < 0) - { - LM_ERR("failed getting resource list\n"); - goto done; - } - if (doc == NULL) - { - LM_WARN("no document returned for uri <%.*s>\n", - sub.pres_uri.len, sub.pres_uri.s); - goto done; - } + if (VAL_INT(&values[21]) > now) + sub.expires = VAL_INT(&values[21]) - now; + else + sub.expires = 0; + + if (sub.expires < rls_expires_offset) sub.expires = 0; - if (send_full_notify(&sub, service_node, &sub.pres_uri, 0) < 0) + if (sub.expires != 0) { - LM_ERR("failed sending full state notify\n"); - goto done; - } + if (rls_get_service_list(&sub.pres_uri, &sub.watcher_user, + &sub.watcher_domain, &service_node, &doc) < 0) + { + LM_ERR("failed getting resource list\n"); + goto done; + } + if (doc == NULL) + { + LM_WARN("no document returned for uri <%.*s>\n", + sub.pres_uri.len, sub.pres_uri.s); + goto done; + } - if (sub.expires == 0) + if (send_full_notify(&sub, service_node, &sub.pres_uri, 0) < 0) + { + LM_ERR("failed sending full state notify\n"); + goto done; + } + xmlFreeDoc(doc); + doc = NULL; + } + else + { + rls_send_notify(&sub, NULL, NULL, NULL); delete_rlsdb(&sub.callid, &sub.to_tag, &sub.from_tag); - - xmlFreeDoc(doc); - doc = NULL; + } } done: diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 3ee2d28..6a00c21 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -33,6 +33,7 @@ #include "../../lib/srdb1/db.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" +#include "../../hashes.h" #include "rls.h" @@ -113,34 +114,112 @@ void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, int delete_expired_subs_rlsdb( void ) { - db_key_t query_cols[1]; - db_val_t query_vals[1]; + db_key_t query_cols[3], result_cols[3], update_cols[1]; + db_val_t query_vals[3], update_vals[1], *values; db_op_t query_ops[1]; + db_row_t *rows; + db1_res_t *result = NULL; + int n_query_cols = 0, n_result_cols = 0, n_update_cols = 0; + int r_callid_col = 0, r_to_tag_col = 0, r_from_tag_col = 0; + int i; + subs_t subs; + str rlsubs_did = {0, 0}; if(rls_db == NULL) { LM_ERR("null database connection\n"); - return(-1); + goto error; } if(rls_dbf.use_table(rls_db, &rlsubs_table)< 0) { LM_ERR("use table failed\n"); - return(-1); + goto error; } - query_cols[0]= &str_expires_col; - query_vals[0].type = DB1_INT; - query_vals[0].nul = 0; - query_vals[0].val.int_val= (int)time(NULL) - rls_expires_offset; - query_ops[0]= OP_LT; - if (rls_dbf.delete(rls_db, query_cols, query_ops, query_vals, 1) < 0) + query_cols[n_query_cols]= &str_expires_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val= (int)time(NULL) - rls_expires_offset; + query_ops[n_query_cols]= OP_LT; + n_query_cols++; + + result_cols[r_callid_col=n_result_cols++] = &str_callid_col; + result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; + result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col; + + if(rls_dbf.query(rls_db, query_cols, query_ops, query_vals, result_cols, + n_query_cols, n_result_cols, 0, &result )< 0) { - LM_ERR("db delete failed for expired subs\n"); - return(-1); + LM_ERR("Can't query db\n"); + goto error; } - return(1); + if(result == NULL) goto error; + + for (i = 0; i <RES_ROW_N(result); i++) + { + rows = RES_ROWS(result); + values = ROW_VALUES(rows); + + subs.callid.s = (char *) VAL_STRING(&values[r_callid_col]); + subs.callid.len = strlen(subs.callid.s); + subs.to_tag.s = (char *) VAL_STRING(&values[r_to_tag_col]); + subs.to_tag.len = strlen(subs.to_tag.s); + subs.from_tag.s = (char *) VAL_STRING(&values[r_from_tag_col]); + subs.from_tag.len = strlen(subs.from_tag.s); + + if (CONSTR_RLSUBS_DID(&subs, &rlsubs_did) < 0) + { + LM_ERR("cannot build rls subs did\n"); + goto error; + } + subs.updated = core_hash(&rlsubs_did, NULL, + (waitn_time * rls_notifier_poll_rate * rls_notifier_processes) - 1); + + n_query_cols = 0; + + query_cols[n_query_cols] = &str_callid_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs.callid; + n_query_cols++; + + query_cols[n_query_cols] = &str_to_tag_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs.to_tag; + n_query_cols++; + + query_cols[n_query_cols] = &str_from_tag_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs.from_tag; + n_query_cols++; + + update_cols[n_update_cols] = &str_updated_col; + update_vals[n_update_cols].type = DB1_INT; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.int_val = subs.updated; + n_update_cols++; + + if(rls_dbf.update(rls_db, query_cols, 0, query_vals, + update_cols,update_vals,n_query_cols,n_update_cols) < 0) + { + LM_ERR("db update failed for expired subs\n"); + goto error; + } + + pkg_free(rlsubs_did.s); + } + + if(result) rls_dbf.free_result(rls_db, result); + return 1; + +error: + if (result) rls_dbf.free_result(rls_db, result); + if (rlsubs_did.s) pkg_free(rlsubs_did.s); + return -1; } /******************************************************************************/

1 0

git:3.2: presence_xml: updates to docs to refer to embedded xcap server
by Daniel-Constantin Mierla 20 Apr '12

20 Apr '12

Module: sip-router Branch: 3.2 Commit: da0eff88c7467365e9f7300960baee5aac36f27a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da0eff8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 20 09:42:39 2012 +0200 presence_xml: updates to docs to refer to embedded xcap server (cherry picked from commit 171f560f768b43e140c24b6cc4823a92f13b2f05) --- modules_k/presence_xml/README | 29 +++++++++++---------- modules_k/presence_xml/doc/presence_xml_admin.xml | 11 ++++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README index 84b0da2..b53cc01 100644 --- a/modules_k/presence_xml/README +++ b/modules_k/presence_xml/README @@ -21,7 +21,7 @@ Anca-Maria Vamanu 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Exported Parameters + 3. Parameters 3.1. db_url(str) 3.2. xcap_table(str) @@ -34,7 +34,7 @@ Anca-Maria Vamanu 3.9. xcap_server (str) 3.10. passive_mode(int) - 4. Exported Functions + 4. Functions 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Exported Parameters + 3. Parameters 3.1. db_url(str) 3.2. xcap_table(str) @@ -82,7 +82,7 @@ Chapter 1. Admin Guide 3.9. xcap_server (str) 3.10. passive_mode(int) - 4. Exported Functions + 4. Functions 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) @@ -127,7 +127,7 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * libxml. -3. Exported Parameters +3. Parameters 3.1. db_url(str) 3.2. xcap_table(str) @@ -236,14 +236,15 @@ modparam("presence_xml", "pidf_manipulation", 1) 3.8. integrated_xcap_server (int) - This parameter is a flag for the type of XCAP server or servers used. - If the XCAP server is integrated with Kamailio presence_XML module and - access the same database tables directly, like the XCAP-lite server - from AG Projects, the parameter should be set to a positive value. - Apart from updating in xcap table, the integrated server must send an - MI command refershWatchers [pres_uri] [event] when a user modifies a - rules document, to instruct the presence_xml module to update states - from the database and, if needed, send NOTIFY updates. + This parameter is a flag for the type of XCAP servers used. If the XCAP + server is integrated with Kamailio presence_xml module and access the + same database tables directly, like the embedded XCAP server + implemented in xcap_server module, the parameter should be set to a + positive value. Apart from updating in xcap table, if the integrated + server is not running on the same Kamailio instance, it must send an MI + command refershWatchers [pres_uri] [event] when a user modifies a rules + document, to instruct the presence_xml module to update states from the + database and, if needed, send NOTIFY updates. Otherwise, it uses xcap_client module to fetch documents from the XCAP servers with HTTP requests. This mode is currently not supported. @@ -281,7 +282,7 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") modparam("presence_xml", "passive_mode", 1) ... -4. Exported Functions +4. Functions 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml index b7832a9..ffab8b9 100644 --- a/modules_k/presence_xml/doc/presence_xml_admin.xml +++ b/modules_k/presence_xml/doc/presence_xml_admin.xml @@ -246,12 +246,13 @@ modparam("presence_xml", "pidf_manipulation", 1) <section> <title><varname>integrated_xcap_server</varname> (int)</title> <para> - This parameter is a flag for the type of XCAP server or servers - used. If the XCAP server is integrated with &kamailio; presence_XML - module and access the same database tables directly, like the XCAP-lite - server from AG Projects, the parameter should be + This parameter is a flag for the type of XCAP servers + used. If the XCAP server is integrated with &kamailio; presence_xml + module and access the same database tables directly, like the embedded + XCAP server implemented in xcap_server module, the parameter should be set to a positive value. Apart from updating in xcap table, - the integrated server must send an MI command refershWatchers + if the integrated server is not running on the same &kamailio; instance, + it must send an MI command refershWatchers [pres_uri] [event] when a user modifies a rules document, to instruct the presence_xml module to update states from the database and, if needed, send NOTIFY updates.

1 0

git:master: presence_xml: updates to docs to refer to embedded xcap server
by Daniel-Constantin Mierla 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 171f560f768b43e140c24b6cc4823a92f13b2f05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=171f560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 20 09:42:39 2012 +0200 presence_xml: updates to docs to refer to embedded xcap server --- modules_k/presence_xml/README | 29 +++++++++++---------- modules_k/presence_xml/doc/presence_xml_admin.xml | 11 ++++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README index 84b0da2..b53cc01 100644 --- a/modules_k/presence_xml/README +++ b/modules_k/presence_xml/README @@ -21,7 +21,7 @@ Anca-Maria Vamanu 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Exported Parameters + 3. Parameters 3.1. db_url(str) 3.2. xcap_table(str) @@ -34,7 +34,7 @@ Anca-Maria Vamanu 3.9. xcap_server (str) 3.10. passive_mode(int) - 4. Exported Functions + 4. Functions 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Exported Parameters + 3. Parameters 3.1. db_url(str) 3.2. xcap_table(str) @@ -82,7 +82,7 @@ Chapter 1. Admin Guide 3.9. xcap_server (str) 3.10. passive_mode(int) - 4. Exported Functions + 4. Functions 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) @@ -127,7 +127,7 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * libxml. -3. Exported Parameters +3. Parameters 3.1. db_url(str) 3.2. xcap_table(str) @@ -236,14 +236,15 @@ modparam("presence_xml", "pidf_manipulation", 1) 3.8. integrated_xcap_server (int) - This parameter is a flag for the type of XCAP server or servers used. - If the XCAP server is integrated with Kamailio presence_XML module and - access the same database tables directly, like the XCAP-lite server - from AG Projects, the parameter should be set to a positive value. - Apart from updating in xcap table, the integrated server must send an - MI command refershWatchers [pres_uri] [event] when a user modifies a - rules document, to instruct the presence_xml module to update states - from the database and, if needed, send NOTIFY updates. + This parameter is a flag for the type of XCAP servers used. If the XCAP + server is integrated with Kamailio presence_xml module and access the + same database tables directly, like the embedded XCAP server + implemented in xcap_server module, the parameter should be set to a + positive value. Apart from updating in xcap table, if the integrated + server is not running on the same Kamailio instance, it must send an MI + command refershWatchers [pres_uri] [event] when a user modifies a rules + document, to instruct the presence_xml module to update states from the + database and, if needed, send NOTIFY updates. Otherwise, it uses xcap_client module to fetch documents from the XCAP servers with HTTP requests. This mode is currently not supported. @@ -281,7 +282,7 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") modparam("presence_xml", "passive_mode", 1) ... -4. Exported Functions +4. Functions 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml index b7832a9..ffab8b9 100644 --- a/modules_k/presence_xml/doc/presence_xml_admin.xml +++ b/modules_k/presence_xml/doc/presence_xml_admin.xml @@ -246,12 +246,13 @@ modparam("presence_xml", "pidf_manipulation", 1) <section> <title><varname>integrated_xcap_server</varname> (int)</title> <para> - This parameter is a flag for the type of XCAP server or servers - used. If the XCAP server is integrated with &kamailio; presence_XML - module and access the same database tables directly, like the XCAP-lite - server from AG Projects, the parameter should be + This parameter is a flag for the type of XCAP servers + used. If the XCAP server is integrated with &kamailio; presence_xml + module and access the same database tables directly, like the embedded + XCAP server implemented in xcap_server module, the parameter should be set to a positive value. Apart from updating in xcap table, - the integrated server must send an MI command refershWatchers + if the integrated server is not running on the same &kamailio; instance, + it must send an MI command refershWatchers [pres_uri] [event] when a user modifies a rules document, to instruct the presence_xml module to update states from the database and, if needed, send NOTIFY updates.

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012