sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
272 discussions

git:carstenbock/ims: More bug-fixes:
by Carsten Bock 18 Apr '11

18 Apr '11

Module: sip-router Branch: carstenbock/ims Commit: 7d74d4d9f57e35ee98d6d56b2b393098c0edb581 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d74d4d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Apr 18 10:00:31 2011 +0200 More bug-fixes: - Fix proper lookup of dialog, so a dialog does not get inserted many times - Fix return code of reginfo_handle_notify - Make sure, the string buffers are set to "0" before using them --- modules_k/pua_reginfo/notify.c | 2 +- modules_k/pua_reginfo/usrloc_cb.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_reginfo/notify.c b/modules_k/pua_reginfo/notify.c index 0f5416d..b006633 100644 --- a/modules_k/pua_reginfo/notify.c +++ b/modules_k/pua_reginfo/notify.c @@ -104,7 +104,7 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal /* Now we start looking for the contact: */ if (((*ul_record)->contacts == 0) - || (ul.get_ucontact(*ul_record, &aor, &callid, &no_str, cseq, &ul_contact) != 0)) { + || (ul.get_ucontact(*ul_record, &aor, &callid, &no_str, cseq+1, &ul_contact) != 0)) { if (ul.insert_ucontact(*ul_record, &aor, &ci, &ul_contact) < 0) { LM_ERR("failed to insert new contact\n"); return RESULT_ERROR; diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c index 40dfe1e..addeea9 100644 --- a/modules_k/pua_reginfo/usrloc_cb.c +++ b/modules_k/pua_reginfo/usrloc_cb.c @@ -127,26 +127,32 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { else if (type & UL_CONTACT_EXPIRE) xmlNewProp(contact_node, BAD_CAST "event", BAD_CAST "expired"); else if (type & UL_CONTACT_DELETE) xmlNewProp(contact_node, BAD_CAST "event", BAD_CAST "unregistered"); else xmlNewProp(contact_node, BAD_CAST "event", BAD_CAST "unknown"); + memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%i", (int)(ptr->expires-time(0))); xmlNewProp(contact_node, BAD_CAST "expires", BAD_CAST buf); } else { xmlNewProp(contact_node, BAD_CAST "state", BAD_CAST "active"); xmlNewProp(contact_node, BAD_CAST "event", BAD_CAST "registered"); + memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%i", (int)(ptr->expires-time(0))); xmlNewProp(contact_node, BAD_CAST "expires", BAD_CAST buf); } if (ptr->q != Q_UNSPECIFIED) { float q = (float)ptr->q/1000; + memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%.3f", q); xmlNewProp(contact_node, BAD_CAST "q", BAD_CAST buf); } /* CallID Attribute */ + memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->callid.len, ptr->callid.s); xmlNewProp(contact_node, BAD_CAST "callid", BAD_CAST ptr->callid.s); /* CSeq Attribute */ + memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%d", ptr->cseq); xmlNewProp(contact_node, BAD_CAST "cseq", BAD_CAST buf); /* URI-Node */ + memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->c.len, ptr->c.s); uri_node = xmlNewChild(contact_node, NULL, BAD_CAST "uri", BAD_CAST buf) ; if(uri_node == NULL) {

1 0

git:3.1: htable: safety check for null db values
by Daniel-Constantin Mierla 18 Apr '11

18 Apr '11

Module: sip-router Branch: 3.1 Commit: 3b6a5953a368b1856a6b1eb7bdda62d397291920 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b6a595… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 16 15:21:32 2011 +0200 htable: safety check for null db values - with some db engines the non-null condition might not be enforced, resulting in working with null values - reported by Eric Hiller (cherry picked from commit 5cd534834b7ee529adbcef3f758a19ed93d29210) --- modules_k/htable/ht_db.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 0f88500..82495e1 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -183,6 +183,10 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) cnt++; /* not NULL values enforced in table definition ?!?! */ kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } kname.len = strlen(kname.s); ktype = RES_ROWS(db_res)[i].values[1].val.int_val; if(ktype==0 && last_ktype==1) @@ -241,6 +245,10 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) last_ktype = ktype; vtype = RES_ROWS(db_res)[i].values[2].val.int_val; kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); + if(kvalue.s==NULL) { + LM_ERR("null value in row %d\n", i); + goto error; + } kvalue.len = strlen(kvalue.s); /* add to hash */

1 0

git:carstenbock/ims: Various, minor bug-fixes.
by Carsten Bock 18 Apr '11

18 Apr '11

Module: sip-router Branch: carstenbock/ims Commit: 3b6afb48f802e776c5361dbcabcaafd22a3b30b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b6afb4… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Apr 18 09:09:27 2011 +0200 Various, minor bug-fixes. --- modules_k/pua_reginfo/notify.c | 9 ++++++--- modules_k/pua_reginfo/usrloc_cb.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules_k/pua_reginfo/notify.c b/modules_k/pua_reginfo/notify.c index aca9134..0f5416d 100644 --- a/modules_k/pua_reginfo/notify.c +++ b/modules_k/pua_reginfo/notify.c @@ -202,7 +202,7 @@ int process_body(str notify_body, udomain_t * domain) { str contact_uri = {0, 0}; int state, event, expires, result, final_result = RESULT_ERROR; char * expires_char, * cseq_char; - int cseq; + int cseq = 0; urecord_t * ul_record; ucontact_t * ul_contact; struct sip_uri parsed_aor; @@ -333,6 +333,9 @@ int process_body(str notify_body, udomain_t * domain) { contact_uri.len = strlen(contact_uri.s); LM_DBG("Contact: %.*s\n", contact_uri.len, contact_uri.s); + + /* Add to Usrloc: */ + result = process_contact(domain, &ul_record, parsed_aor.user, callid, cseq, expires, event, contact_uri); /* Process the result */ if (final_result != RESULT_CONTACTS_FOUND) final_result = result; @@ -344,7 +347,7 @@ next_contact: } } next_registration: - if (ul_record) ul.release_urecord(ul_record); + // if (ul_record) ul.release_urecord(ul_record); /* Unlock the domain for this AOR: */ ul.unlock_udomain(domain, &parsed_aor.user); @@ -358,7 +361,7 @@ error: int reginfo_handle_notify(struct sip_msg* msg, char* domain, char* s2) { str body; - int result = 0; + int result = 1; /* If not done yet, parse the whole message now: */ if (parse_headers(msg, HDR_EOH_F, 0) == -1) { diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c index 6fb807c..40dfe1e 100644 --- a/modules_k/pua_reginfo/usrloc_cb.c +++ b/modules_k/pua_reginfo/usrloc_cb.c @@ -115,7 +115,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { } memset(buf, 0, sizeof(buf)); buf_len = snprintf(buf, sizeof(buf), "%p", ptr); - xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST ptr->callid.s); + xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); /* Check, if this is the modified contact: */ if (ptr == c) { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE)) @@ -145,7 +145,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { xmlNewProp(contact_node, BAD_CAST "callid", BAD_CAST ptr->callid.s); /* CSeq Attribute */ buf_len = snprintf(buf, sizeof(buf), "%d", ptr->cseq); - uri_node = xmlNewChild(contact_node, NULL, BAD_CAST "cseq", BAD_CAST buf) ; + xmlNewProp(contact_node, BAD_CAST "cseq", BAD_CAST buf); /* URI-Node */ buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->c.len, ptr->c.s); uri_node = xmlNewChild(contact_node, NULL, BAD_CAST "uri", BAD_CAST buf) ;

1 0

git:master: dialplan: added rpc commands
by Daniel-Constantin Mierla 17 Apr '11

17 Apr '11

Module: sip-router Branch: master Commit: c8dcf049d81a79ab5733ae25a4b3dcd0e06a3fcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8dcf04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 17 14:22:31 2011 +0200 dialplan: added rpc commands - dialplan.reload - to reload the records from database - dialplan.translate - to translate a string using a specific dialplan id --- modules/dialplan/dialplan.c | 121 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 8d2b808..5d3a100 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -56,6 +56,8 @@ #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" #include "../../parser/parse_to.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "../../lvalue.h" #include "dialplan.h" #include "dp_db.h" @@ -69,6 +71,8 @@ static int child_init(int rank); static void mod_destroy(); static int mi_child_init(); +static int dialplan_init_rpc(void); + static struct mi_root * mi_reload_rules(struct mi_root *cmd_tree,void *param); static struct mi_root * mi_translate(struct mi_root *cmd_tree, void *param); static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2); @@ -136,6 +140,12 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(dialplan_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + dp_db_url.len = dp_db_url.s ? strlen(dp_db_url.s) : 0; LM_DBG("db_url=%s/%d/%p\n", ZSW(dp_db_url.s), dp_db_url.len,dp_db_url.s); @@ -564,3 +574,114 @@ error: return 0; } +static const char* dialplan_rpc_reload_doc[2] = { + "Reload dialplan table from database", + 0 +}; + + +/* + * RPC command to reload dialplan table + */ +static void dialplan_rpc_reload(rpc_t* rpc, void* ctx) +{ + if (dp_connect_db() < 0) { + LM_ERR("failed to reload rules fron database (db connect)\n"); + rpc->fault(ctx, 500, "DB Connection Error"); + return; + } + + if(dp_load_db() != 0){ + LM_ERR("failed to reload rules fron database (db load)\n"); + dp_disconnect_db(); + rpc->fault(ctx, 500, "Dialplan Reload Failed"); + return; + } + + dp_disconnect_db(); + return; +} + + + +static const char* dialplan_rpc_translate_doc[2] = { + "Perform dialplan translation", + 0 +}; + + +/* + * RPC command to perform dialplan translation + */ +static void dialplan_rpc_translate(rpc_t* rpc, void* ctx) +{ + dpl_id_p idp; + str input; + int dpid; + str attrs = {"", 0}; + str output = {0, 0}; + void* th; + + if (rpc->scan(ctx, "dS", &dpid, &input) < 2) + { + rpc->fault(ctx, 500, "Invalid parameters"); + return; + } + + if ((idp = select_dpid(dpid)) == 0 ){ + LM_ERR("no information available for dpid %i\n", dpid); + rpc->fault(ctx, 500, "Dialplan ID not matched"); + return; + } + + if(input.s == NULL || input.len== 0) { + LM_ERR("empty input parameter\n"); + rpc->fault(ctx, 500, "Empty input parameter"); + return; + } + + LM_DBG("trying to translate %.*s with dpid %i\n", + input.len, input.s, idp->dp_id); + if (translate(NULL, input, &output, idp, &attrs)!=0){ + LM_DBG("could not translate %.*s with dpid %i\n", + input.len, input.s, idp->dp_id); + rpc->fault(ctx, 500, "No translation"); + return; + } + LM_DBG("input %.*s with dpid %i => output %.*s\n", + input.len, input.s, idp->dp_id, output.len, output.s); + + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "SS", + "Output", &output, + "Attributes", &attrs)<0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + + return; +} + + +rpc_export_t dialplan_rpc_list[] = { + {"dialplan.reload", dialplan_rpc_reload, + dialplan_rpc_reload_doc, 0}, + {"dialplan.dump", dialplan_rpc_translate, + dialplan_rpc_translate_doc, 0}, + {0, 0, 0, 0} +}; + +static int dialplan_init_rpc(void) +{ + if (rpc_register_array(dialplan_rpc_list)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

1 0

git:master: dialplan: rpc commands documented
by Daniel-Constantin Mierla 17 Apr '11

17 Apr '11

Module: sip-router Branch: master Commit: e9c660ef2ced5c479deeddac75c499f7bfabfa47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9c660e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 17 14:28:00 2011 +0200 dialplan: rpc commands documented --- modules/dialplan/README | 47 +++++++++++++++++++++++++++-- modules/dialplan/doc/dialplan_admin.xml | 50 +++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 5 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index e03067d..466d034 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -56,7 +56,12 @@ Juha Heinanen 7.1. dp_reload 7.2. dp_translate - 8. Installation + 8. Exported RPC Commands + + 8.1. dialplan.reload + 8.2. dialplan.translate + + 9. Installation 2. Developer's Guide @@ -113,7 +118,12 @@ Chapter 1. Admin Guide 7.1. dp_reload 7.2. dp_translate - 8. Installation + 8. Exported RPC Commands + + 8.1. dialplan.reload + 8.2. dialplan.translate + + 9. Installation 1. Overview @@ -410,7 +420,38 @@ xlog("translated to var $var(y) \n"); input _empty_line_ -8. Installation +8. Exported RPC Commands + + 8.1. dialplan.reload + 8.2. dialplan.translate + +8.1. dialplan.reload + + Forces an update of the translation rules from the database. + + Name: dialplan.reload + + Parameters: none + + Example: + sercmd dialplan.reload + +8.2. dialplan.translate + + Will apply a translation rule identified by a dialplan id and an input + string. + + Name: dialplan.translate + + Parameters: 2 + * Dial plan ID + * Input String + + Example: + # sercmd dp_translate dpid "input" + sercmd dp_translate 1 "abcdxyz" + +9. Installation The modules requires one table in Kamailio database: dialplan. The SQL syntax to create them can be found in dialplan-create.sql script in the diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index 43c418b..24b2597 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -511,8 +511,56 @@ xlog("translated to var $var(y) \n"); </programlisting> </section> </section> + + <section> + <title>Exported RPC Commands</title> + + <section> + <title><varname>dialplan.reload</varname></title> + <para> + Forces an update of the translation rules from the database. + </para> + <para> + Name: <emphasis>dialplan.reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> + sercmd dialplan.reload + </programlisting> + </section> <section> + <title><varname>dialplan.translate</varname></title> + <para> + Will apply a translation rule identified by a dialplan + id and an input string. + </para> + <para> + Name: <emphasis>dialplan.translate</emphasis> + </para> + <para>Parameters: <emphasis>2</emphasis></para> + <itemizedlist> + <listitem> + <para><emphasis>Dial plan ID</emphasis></para> + </listitem> + <listitem> + <para><emphasis>Input String</emphasis></para> + </listitem> + </itemizedlist> + <para> + Example: + </para> + <programlisting format="linespecific"> + # sercmd dp_translate dpid "input" + sercmd dp_translate 1 "abcdxyz" + </programlisting> + </section> + </section> + + <section> <title>Installation</title> <para> The modules requires one table in &kamailio; database: dialplan. The SQL @@ -523,6 +571,4 @@ xlog("translated to var $var(y) \n"); </para> </section> - - </chapter>

1 0

git:master: dialplan: cfg functions can be used in ANY_ROUTE
by Daniel-Constantin Mierla 17 Apr '11

17 Apr '11

Module: sip-router Branch: master Commit: 63d4ae1463eb36a13adda76de8ee963588cddbdc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63d4ae1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 17 13:48:14 2011 +0200 dialplan: cfg functions can be used in ANY_ROUTE --- modules/dialplan/dialplan.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 16050cc..8d2b808 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -107,9 +107,9 @@ static mi_export_t mi_cmds[] = { static cmd_export_t cmds[]={ {"dp_translate",(cmd_function)dp_translate_f, 2, dp_trans_fixup, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE|BRANCH_ROUTE}, + ANY_ROUTE}, {"dp_translate",(cmd_function)dp_translate_f, 1, dp_trans_fixup, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE|BRANCH_ROUTE}, + ANY_ROUTE}, {0,0,0,0,0,0} };

1 0

git:master: domain(k): readme updated with rpc commands
by Daniel-Constantin Mierla 16 Apr '11

16 Apr '11

Module: sip-router Branch: master Commit: d59a7f567b6f8f5c18215c15ee969cab42649710 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d59a7f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 16 23:05:07 2011 +0200 domain(k): readme updated with rpc commands --- modules_k/domain/README | 60 +++++++++++++++++++++++++++------ modules_k/domain/doc/domain_admin.xml | 37 ++++++++++++++++++++ 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/modules_k/domain/README b/modules_k/domain/README index 1ba35a6..48b125d 100644 --- a/modules_k/domain/README +++ b/modules_k/domain/README @@ -10,7 +10,7 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright � 2002-2008 Juha Heinanen + Copyright © 2002-2008 Juha Heinanen Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -40,7 +40,12 @@ Juha Heinanen 5.1. domain_reload 5.2. domain_dump - 6. Known Limitations + 6. Exported RPC Commands + + 6.1. domain.reload + 6.2. domain.dump + + 7. Known Limitations 2. Developer Guide @@ -84,12 +89,17 @@ Chapter 1. Admin Guide 5.1. domain_reload 5.2. domain_dump - 6. Known Limitations + 6. Exported RPC Commands + + 6.1. domain.reload + 6.2. domain.dump + + 7. Known Limitations 1. Overview Domain module implements checks that based on domain table determine if - a host part of an URI is "local" or not. A "local" domain is one that + a host part of an URI is “local” or not. A “local” domain is one that the proxy is responsible for. Domain module operates in caching or non-caching mode depending on @@ -97,13 +107,13 @@ Chapter 1. Admin Guide the contents of domain table into cache memory when the module is loaded. After that domain table is re-read only when module is given domain_reload fifo command. Any changes in domain table must thus be - followed by "domain_reload" command in order to reflect them in module + followed by “domain_reload” command in order to reflect them in module behavior. In non-caching mode domain module always queries domain table in the database. Caching is implemented using a hash table. The size of the hash table - is given by HASH_SIZE constant defined in domain_mod.h. Its "factory - default" value is 128. + is given by HASH_SIZE constant defined in domain_mod.h. Its “factory + default” value is 128. 2. Dependencies @@ -123,7 +133,7 @@ Chapter 1. Admin Guide This is URL of the database to be used. - Default value is "mysql://openserro:openserro@localhost/openser" + Default value is “mysql://openserro:openserro@localhost/openser” Example 1.1. Setting db_url parameter modparam("domain", "db_url", "mysql://ser:pass@db_host/ser") @@ -143,7 +153,7 @@ modparam("domain", "db_mode", 1) # Use caching responsible for. Local users must have in their sip uri a host part that is equal to one of these domains. - Default value is "domain". + Default value is “domain”. Example 1.3. Setting domain_table parameter modparam("domain", "domain_table", "new_name") @@ -152,7 +162,7 @@ modparam("domain", "domain_table", "new_name") Name of column containing domains in domain table. - Default value is "domain". + Default value is “domain”. Example 1.4. Setting domain_col parameter modparam("domain", "domain_col", "domain_name") @@ -270,7 +280,35 @@ if (is_domain_local("$avp(s:some_avp)")) { :domain_dump:_reply_fifo_file_ _empty_line_ -6. Known Limitations +6. Exported RPC Commands + + 6.1. domain.reload + 6.2. domain.dump + +6.1. domain.reload + + Causes domain module to re-read the contents of domain table into cache + memory. + + Name: domain.reload + + Parameters: none + + Example: + sercmd domain.reload + +6.2. domain.dump + + Causes domain module to dump domain names in its cache memory. + + Name: domain.dump + + Parameters: none + + Example: + sercmd domain.dump + +7. Known Limitations There is an unlikely race condition on domain list update. If a process uses a table, which is reloaded at the same time twice through FIFO, diff --git a/modules_k/domain/doc/domain_admin.xml b/modules_k/domain/doc/domain_admin.xml index 9961dea..51be940 100644 --- a/modules_k/domain/doc/domain_admin.xml +++ b/modules_k/domain/doc/domain_admin.xml @@ -275,6 +275,43 @@ if (is_domain_local("$avp(s:some_avp)")) { </section> </section> <section> + <title>Exported RPC Commands</title> + <section> + <title><function moreinfo="none">domain.reload</function></title> + <para> + Causes domain module to re-read the contents of domain table + into cache memory. + </para> + <para> + Name: <emphasis>domain.reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> + sercmd domain.reload + </programlisting> + </section> + <section> + <title><function moreinfo="none">domain.dump</function></title> + <para> + Causes domain module to dump domain names in + its cache memory. + </para> + <para> + Name: <emphasis>domain.dump</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> + sercmd domain.dump + </programlisting> + </section> + </section> + <section> <title>Known Limitations</title> <para> There is an unlikely race condition on domain list update. If a

1 0

git:master: domain(k): added rpc commands to reload and dump domains
by Daniel-Constantin Mierla 16 Apr '11

16 Apr '11

Module: sip-router Branch: master Commit: 960406f5f4cc8701f0c4ff1db7a5e2028a839dd5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=960406f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 16 23:00:17 2011 +0200 domain(k): added rpc commands to reload and dump domains --- modules_k/domain/domain_mod.c | 88 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/modules_k/domain/domain_mod.c b/modules_k/domain/domain_mod.c index fb70d06..d8ca4ce 100644 --- a/modules_k/domain/domain_mod.c +++ b/modules_k/domain/domain_mod.c @@ -42,6 +42,8 @@ #include "../../pvar.h" #include "../../forward.h" #include "../../mod_fix.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "domain.h" #include "mi.h" #include "hash.h" @@ -70,6 +72,8 @@ MODULE_VERSION #define DOMAIN_COL "domain" #define DOMAIN_COL_LEN (sizeof(DOMAIN_COL) - 1) +static int domain_init_rpc(void); + /* * Module parameter variables */ @@ -156,6 +160,12 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(domain_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + if(domain_reg_myself!=0) { if(register_check_self_func(domain_check_self)<0) @@ -260,3 +270,81 @@ static void destroy(void) hash_table_2 = 0; } } + + +static const char* domain_rpc_reload_doc[2] = { + "Reload domain table from database", + 0 +}; + + +/* + * RPC command to reload domain table + */ +static void domain_rpc_reload(rpc_t* rpc, void* ctx) +{ + if (!db_mode) { + rpc->fault(ctx, 200, "Server Domain Cache Disabled"); + return; + } + + if (reload_domain_table() < 0) { + rpc->fault(ctx, 400, "Domain Table Reload Failed"); + } +} + + + +static const char* domain_rpc_dump_doc[2] = { + "Return the contents of domain table", + 0 +}; + + +/* + * Fifo function to print domains from current hash table + */ +static void domain_rpc_dump(rpc_t* rpc, void* ctx) +{ + int i; + struct domain_list *np; + struct domain_list **ht; + + if (!db_mode) { + rpc->fault(ctx, 400, "Server Domain Cache Disabled"); + return; + } + + if(hash_table==0 || *hash_table==0) { + rpc->fault(ctx, 404, "Server Domain Cache Empty"); + return; + } + ht = *hash_table; + for (i = 0; i < DOM_HASH_SIZE; i++) { + np = ht[i]; + while (np) { + if (rpc->add(ctx, "S", &np->domain) < 0) + return; + + np = np->next; + } + } + return; +} + + +rpc_export_t domain_rpc_list[] = { + {"domain.reload", domain_rpc_reload, domain_rpc_reload_doc, 0}, + {"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, + {0, 0, 0, 0} +}; + +static int domain_init_rpc(void) +{ + if (rpc_register_array(domain_rpc_list)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

1 0

git:master: htable: safety check for null db values
by Daniel-Constantin Mierla 16 Apr '11

16 Apr '11

Module: sip-router Branch: master Commit: 5cd534834b7ee529adbcef3f758a19ed93d29210 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5cd5348… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 16 15:21:32 2011 +0200 htable: safety check for null db values - with some db engines the non-null condition might not be enforced, resulting in working with null values - reported by Eric Hiller --- modules_k/htable/ht_db.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 7addf81..3808b51 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -199,6 +199,10 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) cnt++; /* not NULL values enforced in table definition ?!?! */ kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } kname.len = strlen(kname.s); ktype = RES_ROWS(db_res)[i].values[1].val.int_val; if(ktype==0 && last_ktype==1) @@ -257,6 +261,10 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) last_ktype = ktype; vtype = RES_ROWS(db_res)[i].values[2].val.int_val; kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); + if(kvalue.s==NULL) { + LM_ERR("null value in row %d\n", i); + goto error; + } kvalue.len = strlen(kvalue.s); /* add to hash */

1 0

[tracker] Comment added: spiraled dialogs not detected when calling dlg_manage() on in-dialog requests
by sip-router 15 Apr '11

15 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#125 - spiraled dialogs not detected when calling dlg_manage() on in-dialog requests User who did this - Timo Reimann (tr) ---------- I already created a patch for this issue which seems to work nicely. After some more testing, I will integrate the patch into master. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=125#comment203 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
28
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 2011