sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: modules/db_mysql, modules_k/db_oracle, modules_k/db_sqlite, modules_k/db_unixodbc: Updated to work with latest lib/srdb1

by Peter Dunkley

Module: sip-router Branch: master Commit: 09a79d78300c5f510278b5417da45a3999d27b9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09a79d7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 17:20:17 2012 +0100 modules/db_mysql, modules_k/db_oracle, modules_k/db_sqlite, modules_k/db_unixodbc: Updated to work with latest lib/srdb1 - db_do_init() in lib/srdb1 has an extra parameter to allow a unique (non-pooled) connection to be created. - These DB modules do not yet support non-pooled connections so the init functions in the modules just call db_do_init() with the new parameter set to 0. --- modules/db_mysql/km_dbase.c | 2 +- modules_k/db_oracle/dbase.c | 2 +- modules_k/db_sqlite/dbase.c | 2 +- modules_k/db_unixodbc/dbase.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 208f64e..14d4ce5 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -133,7 +133,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_mysql_init(const str* _url) { - return db_do_init(_url, (void *)db_mysql_new_connection); + return db_do_init(_url, (void *)db_mysql_new_connection, 0); } diff --git a/modules_k/db_oracle/dbase.c b/modules_k/db_oracle/dbase.c index 619cc4d..dfa9cde 100644 --- a/modules_k/db_oracle/dbase.c +++ b/modules_k/db_oracle/dbase.c @@ -163,7 +163,7 @@ const char* db_oracle_error(ora_con_t* con, sword status) */ db1_con_t* db_oracle_init(const str* _url) { - return db_do_init(_url, (void *)db_oracle_new_connection); + return db_do_init(_url, (void *)db_oracle_new_connection, 0); } diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index 67db13b..c529a7c 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -73,7 +73,7 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i db1_con_t* db_sqlite_init(const str* _url) { - return db_do_init(_url, (void *) db_sqlite_new_connection); + return db_do_init(_url, (void *) db_sqlite_new_connection, 0); } diff --git a/modules_k/db_unixodbc/dbase.c b/modules_k/db_unixodbc/dbase.c index 72edf1e..97b9194 100644 --- a/modules_k/db_unixodbc/dbase.c +++ b/modules_k/db_unixodbc/dbase.c @@ -172,7 +172,7 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_unixodbc_init(const str* _url) { - return db_do_init(_url, (void*)db_unixodbc_new_connection); + return db_do_init(_url, (void*)db_unixodbc_new_connection, 0); } /*

12 years, 5 months

git:master: lib/srdb1/schema, utils/kamctl: Updated db schemas for upcoming presence notifier development

by Peter Dunkley

Module: sip-router Branch: master Commit: ffb5799a51f6e2532fc1636d653d89ee3887bbc9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffb5799… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 16:27:03 2012 +0100 lib/srdb1/schema, utils/kamctl: Updated db schemas for upcoming presence notifier development - Added the new column to active_watchers so that the schemas don't change after the code freeze on Monday. --- lib/srdb1/schema/pr_active_watchers.xml | 12 ++++++++++++ utils/kamctl/db_berkeley/kamailio/active_watchers | 4 ++-- utils/kamctl/db_sqlite/presence-create.sql | 2 ++ utils/kamctl/dbtext/kamailio/active_watchers | 2 +- utils/kamctl/mysql/presence-create.sql | 2 ++ utils/kamctl/oracle/presence-create.sql | 2 ++ utils/kamctl/postgres/presence-create.sql | 2 ++ 7 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 0a5e3b7..7956a65 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -186,6 +186,13 @@ <description>From Domain</description> </column> + <column id="updated"> + <name>updated</name> + <type>int</type> + <size>&expires_len;</size> + <description>Update flag</description> + </column> + <index> <name>active_watchers_idx</name> <colref linkend="callid"/> @@ -205,4 +212,9 @@ <description>This index is needed only if you use DB_ONLY mode.</description> </index> + <index> + <name>updated_idx</name> + <colref linkend="updated"/> + </index> + </table> diff --git a/utils/kamctl/db_berkeley/kamailio/active_watchers b/utils/kamctl/db_berkeley/kamailio/active_watchers index 1780a14..bdb152d 100644 --- a/utils/kamctl/db_berkeley/kamailio/active_watchers +++ b/utils/kamctl/db_berkeley/kamailio/active_watchers @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) presentity_uri(str) watcher_username(str) watcher_domain(str) to_user(str) to_domain(str) event(str) event_id(str) to_tag(str) from_tag(str) callid(str) local_cseq(int) remote_cseq(int) contact(str) record_route(str) expires(int) status(int) reason(str) version(int) socket_info(str) local_contact(str) from_user(str) from_domain(str) +id(int) presentity_uri(str) watcher_username(str) watcher_domain(str) to_user(str) to_domain(str) event(str) event_id(str) to_tag(str) from_tag(str) callid(str) local_cseq(int) remote_cseq(int) contact(str) record_route(str) expires(int) status(int) reason(str) version(int) socket_info(str) local_contact(str) from_user(str) from_domain(str) updated(int) METADATA_KEY 1 6 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|'presence'|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|2|NIL|0|NIL|NIL|NIL|NIL +NIL|NIL|NIL|NIL|NIL|NIL|'presence'|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|2|NIL|0|NIL|NIL|NIL|NIL|NIL diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index e3fe435..517153e 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -40,11 +40,13 @@ CREATE TABLE active_watchers ( local_contact VARCHAR(128) NOT NULL, from_user VARCHAR(64) NOT NULL, from_domain VARCHAR(64) NOT NULL, + updated INTEGER NOT NULL, CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); CREATE INDEX active_watchers_active_watchers_expires ON active_watchers (expires); CREATE INDEX active_watchers_active_watchers_pres ON active_watchers (presentity_uri); +CREATE INDEX active_watchers_updated_idx ON active_watchers (updated); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index 0640d4f..01a89a2 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index eb735a5..05a3267 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -40,11 +40,13 @@ CREATE TABLE active_watchers ( local_contact VARCHAR(128) NOT NULL, from_user VARCHAR(64) NOT NULL, from_domain VARCHAR(64) NOT NULL, + updated INT(11) NOT NULL, CONSTRAINT active_watchers_idx UNIQUE (callid, to_tag, from_tag) ) ENGINE=MyISAM; CREATE INDEX active_watchers_expires ON active_watchers (expires); CREATE INDEX active_watchers_pres ON active_watchers (presentity_uri); +CREATE INDEX updated_idx ON active_watchers (updated); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 8a8b951..ccabd25 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -48,6 +48,7 @@ CREATE TABLE active_watchers ( local_contact VARCHAR2(128), from_user VARCHAR2(64), from_domain VARCHAR2(64), + updated NUMBER(10), CONSTRAINT ORA_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); @@ -61,6 +62,7 @@ BEGIN map2users('active_watchers'); END; / CREATE INDEX ORA_active_watchers_expires ON active_watchers (expires); CREATE INDEX ORA_active_watchers_pres ON active_watchers (presentity_uri); +CREATE INDEX active_watchers_updated_idx ON active_watchers (updated); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index b41e882..d063dff 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -40,11 +40,13 @@ CREATE TABLE active_watchers ( local_contact VARCHAR(128) NOT NULL, from_user VARCHAR(64) NOT NULL, from_domain VARCHAR(64) NOT NULL, + updated INTEGER NOT NULL, CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); CREATE INDEX active_watchers_active_watchers_expires ON active_watchers (expires); CREATE INDEX active_watchers_active_watchers_pres ON active_watchers (presentity_uri); +CREATE INDEX active_watchers_updated_idx ON active_watchers (updated); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers (

12 years, 5 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Peter Dunkley

Module: sip-router Branch: master Commit: 030273ffbc51964df4b35f4729ee3be0e32ef63f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=030273f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 16:12:29 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: dialog(k): table version in DB is 7 htable(k): Implement "delete" mi/rpc function. tm: reset T if t_continue() resumes a canceled transaction ---

12 years, 5 months

git:master: modules_k/rls: Updated module documentation and changed use of BEGIN/ COMMIT so it only happens in database only mode

by Peter Dunkley

Module: sip-router Branch: master Commit: d5b8c4f9091646597341e0d8dc08e2c3930f713a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5b8c4f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 16:11:48 2012 +0100 modules_k/rls: Updated module documentation and changed use of BEGIN/COMMIT so it only happens in database only mode --- modules_k/rls/README | 9 +++++++++ modules_k/rls/doc/rls_admin.xml | 11 +++++++++++ modules_k/rls/notify.c | 18 ++++++++++++------ modules_k/rls/resource_notify.c | 18 ++++++++++++------ 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index df3a879..40ebeae 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -259,6 +259,15 @@ modparam("rls", "xcap_db_url", "dbdriver://username:password@dbhost/dbname") in a database, allowing scalability at the expense of speed. Mode 1 is reserved. + The RLS modules uses SQL BEGIN/COMMIT statements around related sets of + database queries to make sure they are a single transaction when + database only mode is used. This means you should ensure that automatic + retries/reconnects are disabled for your database (for example, by + setting the retries parameter for db_mysql or db_postgres to 0). This + is needed because if the connection fails any unCOMMITed queries will + be automatically rolled back by the database. This means that automatic + retries could result in data inconsistencies. + Default value is “0” Example 1.4. Set db_mode parameter diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index 0669b70..db03b9f 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -175,6 +175,17 @@ modparam("rls", "xcap_db_url", "&exampledb;") Mode 1 is reserved. </para> <para> + The RLS modules uses SQL BEGIN/COMMIT statements around related + sets of database queries to make sure they are a single + transaction when database only mode is used. This means you + should ensure that automatic retries/reconnects are disabled + for your database (for example, by setting the retries + parameter for db_mysql or db_postgres to 0). This is needed + because if the connection fails any unCOMMITed queries will + be automatically rolled back by the database. This means that + automatic retries could result in data inconsistencies. + </para> + <para> <emphasis> Default value is <quote>0</quote> </emphasis> </para> diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 1836808..fbb7e17 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -128,10 +128,13 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } - if (db_begin(&rlpres_dbf, rlpres_db) < 0) + if (dbmode == RLS_DB_ONLY) { - LM_ERR("in BEGIN\n"); - goto error; + if (db_begin(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in BEGIN\n"); + goto error; + } } if(rlpres_dbf.query(rlpres_db, query_cols, 0, query_vals, result_cols, @@ -263,10 +266,13 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } - if (db_commit(&rlpres_dbf, rlpres_db) < 0) + if (dbmode == RLS_DB_ONLY) { - LM_ERR("in COMMIT\n"); - goto error; + if (db_commit(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in COMMIT\n"); + goto error; + } } xmlFree(rlmi_cont->s); diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 87ce806..910b098 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -1037,10 +1037,13 @@ static void timer_send_update_notifies(int round) goto done; } - if (db_begin(&rlpres_dbf, rlpres_db) < 0) + if (dbmode == RLS_DB_ONLY) { - LM_ERR("in BEGIN\n"); - goto error; + if (db_begin(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in BEGIN\n"); + goto error; + } } if(rlpres_dbf.query(rlpres_db, query_cols, 0, query_vals, result_cols, @@ -1060,10 +1063,13 @@ static void timer_send_update_notifies(int round) goto error; } - if (db_commit(&rlpres_dbf, rlpres_db) < 0) + if (dbmode == RLS_DB_ONLY) { - LM_ERR("in COMMIT\n"); - goto error; + if (db_commit(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in COMMIT\n"); + goto error; + } } send_notifies(result, did_col, resource_uri_col, auth_state_col, reason_col,

12 years, 5 months

git:master: modules_k/pua: Fixed bug in pua_update_contact() in DB only mode

by Peter Dunkley

Module: sip-router Branch: master Commit: 0220bad8ca1a22d212324102d489bb22d3076abd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0220bad… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 14:28:18 2012 +0100 modules_k/pua: Fixed bug in pua_update_contact() in DB only mode - This was updating the contact column when it should have been updating the remote_contact column. --- modules_k/pua/pua_db.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 2bc9e88..200e951 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -1407,7 +1407,7 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) n_query_cols++; /* we overwrite contact even if not changed */ - db_cols[n_update_cols] = &str_contact_col; /* had remote here, think was a bug */ + db_cols[n_update_cols] = &str_remote_contact_col; db_vals[n_update_cols].type = DB1_STR; db_vals[n_update_cols].nul = 0; db_vals[n_update_cols].val.str_val.s = contact->s; @@ -1566,4 +1566,4 @@ list_entry_t *get_subs_list_puadb(str *did) && (RES_ROWS(res)>0)); return list; -} \ No newline at end of file +}

12 years, 5 months

reminder - freezing development for next major release v3.3.0

by Daniel-Constantin Mierla

Hello, a short reminder about freezing the development for next major release v3.3.0. It is planned for April 23, less than two weeks away. If you have new features to add for v3.3.0, commit them or send the patches before the date. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

12 years, 5 months

git:master: dialog(k): table version in DB is 7

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8a22bf5bf2b5fe3c65a214f071159107427263a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a22bf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 20 16:14:18 2012 +0200 dialog(k): table version in DB is 7 - updated by Timo Reimann, but sources was still using 6 --- modules_k/dialog/dlg_db_handler.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_db_handler.h b/modules_k/dialog/dlg_db_handler.h index a3c5f05..ad0116d 100644 --- a/modules_k/dialog/dlg_db_handler.h +++ b/modules_k/dialog/dlg_db_handler.h @@ -56,7 +56,7 @@ #define REQ_URI_COL "req_uri" #define XDATA_COL "xdata" #define DIALOG_TABLE_NAME "dialog" -#define DLG_TABLE_VERSION 6 +#define DLG_TABLE_VERSION 7 #define DIALOG_TABLE_COL_NO 23

12 years, 5 months

Random number generation

by Hugh Waite

Hello, I have a question about random number generation within kamailio. A number of modules use rand() to get a random value and in some places is re-seeding with srand(). I believe this is dangerous because rand() is used in the Via branch tag generator. We have detected some real bugs (where srand is reseeding with 0 for every message, causing transaction mis-matching) but I'm not sure of the correct way to fix this (other than remove srand()). Should all modules be using a 'core' random function (e.g. in srutils?) ? And if so, is this library documented? Regards, Hugh -- Hugh Waite Senior Design Engineer Crocodile RCS Ltd.

12 years, 5 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Andreas Granig

Module: sip-router Branch: master Commit: 385befa3d7f97ed4dc5f6724ec5f88eea61f369d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=385befa… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Fri Apr 20 16:01:53 2012 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

12 years, 5 months

git:master: htable(k): Implement "delete" mi/rpc function.

by Andreas Granig

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

12 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
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