sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

git:5.1:c916f470: htable: test if there is a db table associated with htable for rpc reload

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: c916f4701ffae4500b5fcc8fe6e255953ee8780a URL: https://github.com/kamailio/kamailio/commit/c916f4701ffae4500b5fcc8fe6e2559… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:33+02:00 htable: test if there is a db table associated with htable for rpc reload (cherry picked from commit 79c16cd9bdabb3670b2a7618656ca9cf2f9687b1) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c916f4701ffae4500b5fcc8fe6e2559… Patch: https://github.com/kamailio/kamailio/commit/c916f4701ffae4500b5fcc8fe6e2559… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index e667e0bd39..fbe016e0aa 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1156,7 +1156,12 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - + if(ht->dbtable.s==NULL || ht->dbtable.len<=0) + { + ht_db_close_con(); + rpc->fault(c, 500, "No database htable"); + return; + } memcpy(&nht, ht, sizeof(ht_t)); /* it's temporary operation - use system malloc */

5 years, 10 months

git:5.1:3532ffc7: htable: typo in rpc result status text for reload command

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 3532ffc752eaa92c696bb8853cb5b0738a18dcea URL: https://github.com/kamailio/kamailio/commit/3532ffc752eaa92c696bb8853cb5b07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:23+02:00 htable: typo in rpc result status text for reload command (cherry picked from commit ff90e2223825889c2eea108d2fc02190535960fc) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/3532ffc752eaa92c696bb8853cb5b07… Patch: https://github.com/kamailio/kamailio/commit/3532ffc752eaa92c696bb8853cb5b07… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3d7cc3e93f..e667e0bd39 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1164,7 +1164,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if(nht.entries == NULL) { ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "No resources for htable reload"); return; } memset(nht.entries, 0, nht.htsize*sizeof(ht_entry_t)); @@ -1184,7 +1184,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "Htable reload failed"); return; }

5 years, 10 months

git:5.1:b11ff57c: mtree: rpc reload without table name reloads all tables

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: b11ff57c7bc2925003f86f925f6cff41cae4212f URL: https://github.com/kamailio/kamailio/commit/b11ff57c7bc2925003f86f925f6cff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:13+02:00 mtree: rpc reload without table name reloads all tables - lost feature in rpc which was available in mi command (cherry picked from commit c216abc532df9f22b023d26b46bd6322a217cdfe) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b11ff57c7bc2925003f86f925f6cff4… Patch: https://github.com/kamailio/kamailio/commit/b11ff57c7bc2925003f86f925f6cff4… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 4ce2786afb..0710186869 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -930,7 +930,8 @@ static const char* rpc_mtree_summary_doc[2] = { void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; - m_tree_t *pt; + m_tree_t *pt = NULL; + int treloaded = 0; if(db_table.len>0) { @@ -949,8 +950,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) /* read tree name */ if (rpc->scan(c, "S", &tname) != 1) { - rpc->fault(c, 500, "Failed to get table name parameter"); - return; + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { + tname.s = 0; + tname.len = 0; + } } pt = mt_get_first_tree(); @@ -967,9 +973,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) LM_ERR("cannot re-load mtree from database\n"); goto error; } + treloaded = 1; } pt = pt->next; } + if(treloaded == 0) { + rpc->fault(c, 500, "No Mtree Name Matching"); + } } return;

5 years, 10 months

git:5.1:bc47ac83: http_client: Makefile - removed useless var for xml config

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: bc47ac839aed45ecdce414c2a21d36112abace76 URL: https://github.com/kamailio/kamailio/commit/bc47ac839aed45ecdce414c2a21d361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:03+02:00 http_client: Makefile - removed useless var for xml config (cherry picked from commit ebb1377e9f07f00afccdce50b113d05fec1693b5) --- Modified: src/modules/http_client/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/bc47ac839aed45ecdce414c2a21d361… Patch: https://github.com/kamailio/kamailio/commit/bc47ac839aed45ecdce414c2a21d361… --- diff --git a/src/modules/http_client/Makefile b/src/modules/http_client/Makefile index 460e146bae..be06cab978 100644 --- a/src/modules/http_client/Makefile +++ b/src/modules/http_client/Makefile @@ -9,7 +9,6 @@ auto_gen= NAME=http_client.so ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) CURL_BUILDER=$(shell \ if pkg-config --exists libcurl; then \ echo 'pkg-config libcurl'; \

5 years, 10 months

[kamailio/kamailio] Append_to_reply does not work for XHTTP responses (#1548)

by Olle E. Johansson

Tried append_to_reply from textutils in event_route[xhttp:request] - which is not a documented usage. It did not generate an error about a bad route, but did not seem to append the header to the response. This may be a feature request, but wouldn't it be cool if it worked? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1548

5 years, 10 months

git:master:0bd3c9ea: kamctl: added mtree management command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0bd3c9eaf356d65b9620fb7ec8c6ebc1e0a47782 URL: https://github.com/kamailio/kamailio/commit/0bd3c9eaf356d65b9620fb7ec8c6ebc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T12:06:20+02:00 kamctl: added mtree management command --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/0bd3c9eaf356d65b9620fb7ec8c6ebc… Patch: https://github.com/kamailio/kamailio/commit/0bd3c9eaf356d65b9620fb7ec8c6ebc… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 954eee37ae..acc0d1f741 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1362,6 +1362,64 @@ permissions_address() { } +# +##### ------------------------------------------------ ##### +### mtree management +# +mtree_management() { + case $1 in + reload) + require_ctlengine + ctl_cmd_run mtree.reload $2 + ;; + dump) + require_ctlengine + ctl_cmd_run mtree.list $2 + ;; + showdb) + require_dbengine + QUERY="select * FROM $2 ; " + $DBROCMD "$QUERY" + ;; + add) + require_dbengine + if [ $# -lt 4 ] ; then + usage_mtree + exit 1 + fi + + QUERY="INSERT INTO $2 \ + (tprefix, tvalue) \ + VALUES ($3, '$4');" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "mtree - SQL Error" + exit 1 + fi + minfo "execute '$0 mtree reload' to synchronize cache and database" + ;; + rm) + require_dbengine + shift + if [ $# -ne 3 ] ; then + usage_address + exit 1 + fi + QUERY="DELETE FROM $2 where tprefix='$3';" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "mtree - SQL Error" + exit 1 + fi + minfo "execute '$0 mtree reload' to synchronize cache and database" + ;; + *) + usage_mtree + exit 1 + esac +} + + # ##### ------------------------------------------------ ##### ### LCR management @@ -2876,6 +2934,11 @@ case $1 in permissions_address "$@" ;; + mtree) + shift + mtree_management "$@" + ;; + rpc) require_ctlengine shift diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 641449422c..adeceb77fb 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -552,6 +552,22 @@ EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv" +usage_mtree() { + echo + mecho " -- command 'add|dump|reload|rm|show' - manage mtree" + echo +cat <<EOF + mtree show <tname> .................. show db content + mtree dump [<tname>] ................ show cache content + mtree reload [<tname>] .............. reload db table into cache + mtree add <tname> <tprefix> <tvalue> + ......................... add a new entry + mtree rm <tname> <tprefix> .......... remove entries for given tname and tprefix +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_mtree" + + ##### ----------------------------------------------- ##### #### Common functions

5 years, 10 months

git:master:79c16cd9: htable: test if there is a db table associated with htable for rpc reload

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 79c16cd9bdabb3670b2a7618656ca9cf2f9687b1 URL: https://github.com/kamailio/kamailio/commit/79c16cd9bdabb3670b2a7618656ca9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T09:05:34+02:00 htable: test if there is a db table associated with htable for rpc reload --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/79c16cd9bdabb3670b2a7618656ca9c… Patch: https://github.com/kamailio/kamailio/commit/79c16cd9bdabb3670b2a7618656ca9c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index e667e0bd39..fbe016e0aa 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1156,7 +1156,12 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - + if(ht->dbtable.s==NULL || ht->dbtable.len<=0) + { + ht_db_close_con(); + rpc->fault(c, 500, "No database htable"); + return; + } memcpy(&nht, ht, sizeof(ht_t)); /* it's temporary operation - use system malloc */

5 years, 10 months

git:master:ff90e222: htable: typo in rpc result status text for reload command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ff90e2223825889c2eea108d2fc02190535960fc URL: https://github.com/kamailio/kamailio/commit/ff90e2223825889c2eea108d2fc0219… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T08:47:01+02:00 htable: typo in rpc result status text for reload command --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/ff90e2223825889c2eea108d2fc0219… Patch: https://github.com/kamailio/kamailio/commit/ff90e2223825889c2eea108d2fc0219… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3d7cc3e93f..e667e0bd39 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1164,7 +1164,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if(nht.entries == NULL) { ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "No resources for htable reload"); return; } memset(nht.entries, 0, nht.htsize*sizeof(ht_entry_t)); @@ -1184,7 +1184,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "Htable reload failed"); return; }

5 years, 10 months

git:master:8a1c5b01: utils/kamctl: removed the option of executing mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a1c5b01f7c82571e3763ac4caff71b1d318e732 URL: https://github.com/kamailio/kamailio/commit/8a1c5b01f7c82571e3763ac4caff71b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T08:39:54+02:00 utils/kamctl: removed the option of executing mi commands --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/8a1c5b01f7c82571e3763ac4caff71b… Patch: https://github.com/kamailio/kamailio/commit/8a1c5b01f7c82571e3763ac4caff71b…

5 years, 10 months

git:master:c216abc5: mtree: rpc reload without table name reloads all tables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c216abc532df9f22b023d26b46bd6322a217cdfe URL: https://github.com/kamailio/kamailio/commit/c216abc532df9f22b023d26b46bd632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T08:30:00+02:00 mtree: rpc reload without table name reloads all tables - lost feature in rpc which was available in mi command --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c216abc532df9f22b023d26b46bd632… Patch: https://github.com/kamailio/kamailio/commit/c216abc532df9f22b023d26b46bd632… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 4ce2786afb..0710186869 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -930,7 +930,8 @@ static const char* rpc_mtree_summary_doc[2] = { void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; - m_tree_t *pt; + m_tree_t *pt = NULL; + int treloaded = 0; if(db_table.len>0) { @@ -949,8 +950,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) /* read tree name */ if (rpc->scan(c, "S", &tname) != 1) { - rpc->fault(c, 500, "Failed to get table name parameter"); - return; + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { + tname.s = 0; + tname.len = 0; + } } pt = mt_get_first_tree(); @@ -967,9 +973,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) LM_ERR("cannot re-load mtree from database\n"); goto error; } + treloaded = 1; } pt = pt->next; } + if(treloaded == 0) { + rpc->fault(c, 500, "No Mtree Name Matching"); + } } return;

5 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018