sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
260 discussions

git:master:af8b605b: disaptcher: Add RPC success message on set_state

by Olle E. Johansson

Module: kamailio Branch: master Commit: af8b605b71a4b15f8c2f69878e589c8554bebfec URL: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 disaptcher: Add RPC success message on set_state --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… Patch: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4493fed425..655c0ace83 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1775,7 +1775,7 @@ static void dispatcher_rpc_set_state_helper(rpc_t *rpc, void *ctx, int mattr) } } } - + rpc->rpl_printf(ctx, "Ok. Dispatcher state updated."); return; }

2 years, 3 months

git:master:9f8de525: dispatcher: Add RPC success response on reload

by Olle E. Johansson

Module: kamailio Branch: master Commit: 9f8de5255bb90551d6cad5828ccafb6f41083c47 URL: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success response on reload --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… Patch: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4ed98919b7..4493fed425 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1557,6 +1557,7 @@ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) return; } } + rpc->rpl_printf(ctx, "Ok. Dispatcher successfully reloaded."); return; }

2 years, 3 months

git:master:fc0ee0bc: db_cluster: Add RPC error message when clusters not found

by Olle E. Johansson

Module: kamailio Branch: master Commit: fc0ee0bca6d5b42d11e0d7ed5933e23ae1636941 URL: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC error message when clusters not found --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… Patch: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index 2ddbffc2ad..c42d5b2aa9 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -339,6 +339,7 @@ static void dbcl_rpc_list_clusters(rpc_t *rpc, void *c) if(cls==NULL) { LM_ERR("root not set\n"); + rpc->fault(c, 500, "Clusters not found"); return; }

2 years, 3 months

git:master:82845eac: db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection

by Olle E. Johansson

Module: kamailio Branch: master Commit: 82845eac8a8bae73d1033736ff9cf15337661981 URL: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Patch: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index d4aae0e123..2ddbffc2ad 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -309,6 +309,7 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -317,11 +318,14 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } - - dbcl_enable_con(con); - + if(dbcl_enable_con(con) < 0) { + rpc->fault(c, 500, "Failed to enable cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection enabled."); return; }

2 years, 3 months

git:master:86b4189c: db_cluster: Add RPC error messages and responses to dbcl_rpc_ddisable_connection

by Olle E. Johansson

Module: kamailio Branch: master Commit: 86b4189c1335a2d1aa4414ab9d1a5b8a27a29e00 URL: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC error messages and responses to dbcl_rpc_ddisable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… Patch: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index a2c28f88e5..d4aae0e123 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -250,6 +250,7 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -258,16 +259,22 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } if(con->sinfo==NULL) + rpc->fault(c, 500, "Cluster state info missing."); return; /* Overwrite the number of seconds if the connection is already disabled. */ if (con->sinfo->state & DBCL_CON_INACTIVE) { - dbcl_disable_con(con, seconds); + if(dbcl_disable_con(con, seconds) < 0) { + rpc->fault(c, 500, "Failed disabling cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection re-disabled."); return; } @@ -277,8 +284,11 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) return; } - dbcl_disable_con(con, seconds); - + if(dbcl_disable_con(con, seconds) < 0) { + rpc->fault(c, 500, "Failed disabling cluster connection."); + return; + }; + rpc->rpl_printf(c, "Ok. Cluster connection disabled."); return; }

2 years, 3 months

git:master:4d41b85a: dbcluster: Add RPC error message wheb listing connections and no cluster is found

by Olle E. Johansson

Module: kamailio Branch: master Commit: 4d41b85a6b9d7f82306282a19c01d63b90f2a7d9 URL: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dbcluster: Add RPC error message wheb listing connections and no cluster is found --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… Patch: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index bdbbb70ce6..a2c28f88e5 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -189,6 +189,7 @@ static void dbcl_rpc_list_connections(rpc_t *rpc, void *c) if(cls==NULL) { LM_ERR("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; }

2 years, 3 months

git:master:559b52b1: mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload

by Olle E. Johansson

Module: kamailio Branch: master Commit: 559b52b194f813c0c8584b3becbac9b2ab8e0343 URL: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… Patch: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 63180bbfb7..1a2cd9f737 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -929,61 +929,59 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; m_tree_t *pt = NULL; - int treloaded = 0; + int treeloaded = 0; if(db_table.len>0) { /* re-loading all information from database */ if(mt_load_db_trees()!=0) { - LM_ERR("cannot re-load mtrees from database\n"); - goto error; - } - } else { - if(!mt_defined_trees()) - { - LM_ERR("empty mtree list\n"); - goto error; + rpc->fault(c, 500, "Can not reload Mtrees from database."); + return; } + rpc->rpl_printf(c, "Ok. Mtrees reloaded."); + return; + } + if(!mt_defined_trees()) + { + rpc->fault(c, 500, "No Mtrees defined."); + return; + } - /* read tree name */ - if (rpc->scan(c, "S", &tname) != 1) { + /* read tree name */ + if (rpc->scan(c, "S", &tname) != 1) { + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { tname.s = 0; tname.len = 0; - } else { - if(*tname.s=='.') { - tname.s = 0; - tname.len = 0; - } } + } - pt = mt_get_first_tree(); + pt = mt_get_first_tree(); - while(pt!=NULL) + while(pt!=NULL) + { + if(tname.s==NULL + || (tname.s!=NULL && pt->tname.len>=tname.len + && strncmp(pt->tname.s, tname.s, tname.len)==0)) { - if(tname.s==NULL - || (tname.s!=NULL && pt->tname.len>=tname.len - && strncmp(pt->tname.s, tname.s, tname.len)==0)) + /* re-loading table from database */ + if(mt_load_db(pt)!=0) { - /* re-loading table from database */ - if(mt_load_db(pt)!=0) - { - LM_ERR("cannot re-load mtree from database\n"); - goto error; - } - treloaded = 1; + rpc->fault(c, 500, "Mtree Reload Failed"); + return; } - pt = pt->next; - } - if(treloaded == 0) { - rpc->fault(c, 500, "No Mtree Name Matching"); + treeloaded = 1; } + pt = pt->next; } - + if(treeloaded == 0) { + rpc->fault(c, 500, "Can not find specified Mtree"); + } + rpc->rpl_printf(c, "Ok. Mtree reloaded."); return; - -error: - rpc->fault(c, 500, "Mtree Reload Failed"); } static const char* rpc_mtree_reload_doc[2] = {

2 years, 3 months

git:master:326abd17: htable: Add RPC response for storing htable to DB

by Olle E. Johansson

Module: kamailio Branch: master Commit: 326abd1737336ad733cb53f9b4ac506f178da0e2 URL: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 htable: Add RPC response for storing htable to DB --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… Patch: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3e9f52bf13..7e72ad0840 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1963,6 +1963,7 @@ static void htable_rpc_store(rpc_t* rpc, void* c) return; } ht_db_close_con(); + rpc->rpl_printf(c, "Ok. Htable successfully stored to DB."); return; }

2 years, 3 months

git:master:fecda3d1: htable: Add RPC response for successful reload of htable

by Olle E. Johansson

Module: kamailio Branch: master Commit: fecda3d12f0f72ba0f35f239108f5dcd3bec0959 URL: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:09+01:00 htable: Add RPC response for successful reload of htable --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… Patch: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index bd6d474e9d..3e9f52bf13 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1912,6 +1912,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); + rpc->rpl_printf(c, "Ok. Htable reloaded."); return; }

2 years, 3 months

git:master:0b5407ec: htable: Add response for rpc flush failed and success states

by Olle E. Johansson

Module: kamailio Branch: master Commit: 0b5407ec0f13d7631a5273171338628b44814498 URL: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:09+01:00 htable: Add response for rpc flush failed and success states --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… Patch: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 78f151daf3..bd6d474e9d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1809,7 +1809,11 @@ static void htable_rpc_flush(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - ht_reset_content(ht); + if(ht_reset_content(ht) < 0) { + rpc->fault(c, 500, "Htable flush failed."); + return; + } + rpc->rpl_printf(c, "Ok. Htable flushed."); } /*! \brief RPC htable.reload command to reload content of a hash table */

2 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022