sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

[tracker] Task closed: Crash when reloading addresses from mysql database (permissions module)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#420 - Crash when reloading addresses from mysql database (permissions module) User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Fixes now in master and 4.1 branches. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=420 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.

10 years, 7 months

[tracker] Comment added: json-c is dropping json compatibility

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#421 - json-c is dropping json compatibility User who did this - Daniel-Constantin Mierla (miconda) ---------- Is this ready to close? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=421#comment1405 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.

10 years, 7 months

git:master: mtree: shift values for reload count and time from temporary structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5712eb5fdfa498a1678a7a2c01ddbaeff0458d35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5712eb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 17:19:43 2014 +0200 mtree: shift values for reload count and time from temporary structure --- modules/mtree/mtree_mod.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 276bb21..f65f926 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -639,6 +639,8 @@ static int mt_load_db(m_tree_t *pt) old_tree->nrnodes = new_tree.nrnodes; old_tree->nritems = new_tree.nritems; old_tree->memsize = new_tree.memsize; + old_tree->reload_count = new_tree.reload_count; + old_tree->reload_time = new_tree.reload_time; mt_reload_flag = 0;

10 years, 7 months

git:master: mtree: store reload count and timestamp for trees

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 731685fc58ac2a650ed79cdc27a0b0f6d8599994 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=731685f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 17:11:52 2014 +0200 mtree: store reload count and timestamp for trees - print these details via mi/rpc summary command - count is not stored when reload many tables from one table (cannot easily get reference to the previous loaded tree structure) --- modules/mtree/mtree.c | 2 ++ modules/mtree/mtree.h | 2 ++ modules/mtree/mtree_mod.c | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index c8c00ef..890263f 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -26,6 +26,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include "../../dprint.h" #include "../../mem/shm_mem.h" @@ -112,6 +113,7 @@ m_tree_t* mt_init_tree(str* tname, str *dbtable, int type, int multi) pt->type = type; pt->multi = multi; + pt->reload_time = (unsigned int)time(NULL); pt->tname.s = (char*)shm_malloc((1+tname->len)*sizeof(char)); if(pt->tname.s==NULL) { diff --git a/modules/mtree/mtree.h b/modules/mtree/mtree.h index 71d7ef3..20a4a00 100644 --- a/modules/mtree/mtree.h +++ b/modules/mtree/mtree.h @@ -72,6 +72,8 @@ typedef struct _m_tree unsigned int nrnodes; unsigned int nritems; unsigned int memsize; + unsigned int reload_count; + unsigned int reload_time; mt_node_t *head; struct _m_tree *next; } m_tree_t; diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index fa7deed..276bb21 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <unistd.h> #include <stdlib.h> +#include <time.h> #include "../../lib/srdb1/db_op.h" #include "../../lib/kmi/mi.h" @@ -530,6 +531,8 @@ static int mt_load_db(m_tree_t *pt) new_tree.nrnodes = 0; new_tree.nritems = 0; new_tree.memsize = 0; + new_tree.reload_count++; + new_tree.reload_time = (unsigned int)time(NULL); if (mt_dbf.use_table(db_con, &old_tree->dbtable) < 0) @@ -1012,6 +1015,16 @@ struct mi_root* mt_mi_summary(struct mi_root* cmd_tree, void* param) val.s, val.len); if(attr == NULL) goto error; + val.s = int2str((int)pt->reload_count, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "RELOADCOUNT", 11, + val.s, val.len); + if(attr == NULL) + goto error; + val.s = int2str((int)pt->reload_time, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "RELOADTIME", 10, + val.s, val.len); + if(attr == NULL) + goto error; pt = pt->next; } @@ -1086,6 +1099,16 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) rpc->fault(c, 500, "Internal error adding items"); return; } + if(rpc->struct_add(ih, "d", "reload_count", + (int)pt->reload_count) < 0 ) { + rpc->fault(c, 500, "Internal error adding items"); + return; + } + if(rpc->struct_add(ih, "d", "reload_time", + (int)pt->reload_time) < 0 ) { + rpc->fault(c, 500, "Internal error adding items"); + return; + } } pt = pt->next; }

10 years, 7 months

git:master: mtree: return 404 if mtree is not found for rpc mtree.summary

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 148d67a8de1524b88b6b3f957baf51e34342e7c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=148d67a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 16:58:58 2014 +0200 mtree: return 404 if mtree is not found for rpc mtree.summary --- modules/mtree/mtree_mod.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index ea05005..fa7deed 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -1028,6 +1028,7 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) m_tree_t *pt; void* th; void* ih; + int found; if(!mt_defined_trees()) { @@ -1036,7 +1037,11 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) } /* read optional tree name */ - rpc->scan(c, "*S", &tname); + if(rpc->scan(c, "*S", &tname)==0) + { + tname.s = NULL; + tname.len = 0; + } pt = mt_get_first_tree(); if(pt==NULL) @@ -1045,12 +1050,14 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) return; } + found = 0; while(pt!=NULL) { if(tname.s==NULL || (tname.s!=NULL && pt->tname.len>=tname.len && strncmp(pt->tname.s, tname.s, tname.len)==0)) { + found = 1; if (rpc->add(c, "{", &th) < 0) { rpc->fault(c, 500, "Internal error creating rpc"); @@ -1082,6 +1089,13 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) } pt = pt->next; } + + if(found==0) + { + rpc->fault(c, 404, "Tree not found"); + return; + } + return; }

10 years, 7 months

git:master: xmlrpc: don' t generate internal xmlrpc reply for optional parameter read

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1b234185fd8ac87a7431d189eb83b702c5618404 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b23418… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 16:41:14 2014 +0200 xmlrpc: don't generate internal xmlrpc reply for optional parameter read --- modules/xmlrpc/xmlrpc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 34b23ee..44c398a 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1517,6 +1517,7 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) read++; fmt++; nofault=1; + f|=GET_X_NOREPLY; continue; /* do not advance ctx->act-param */ case '.': /* autoconvert */ modifiers++;

10 years, 7 months

git:master: xmlrpc: fixed optional parameter read handling

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 31feee65720cbf0bf8a87a5989360f336ac9fdd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31feee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 16:29:51 2014 +0200 xmlrpc: fixed optional parameter read handling --- modules/xmlrpc/xmlrpc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index d36c02c..34b23ee 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1495,6 +1495,7 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) int modifiers; int f; va_list ap; + int nofault; reply = &ctx->reply; /* clear the previously saved error code */ @@ -1503,6 +1504,7 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) va_start(ap, fmt); modifiers=0; read = 0; + nofault = 0; f=(autoconvert?GET_X_AUTOCONV:0) | (lflf2crlf?GET_X_LFLF2CRLF:0); while(*fmt) { @@ -1514,6 +1516,7 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) modifiers++; read++; fmt++; + nofault=1; continue; /* do not advance ctx->act-param */ case '.': /* autoconvert */ modifiers++; @@ -1574,7 +1577,10 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) error: va_end(ap); - return -(read-modifiers); + if(nofault==0) + return -(read-modifiers); + else + return read-modifiers; } #define RPC_BUF_SIZE 1024

10 years, 7 months

git:master: mtree: docs updated for mtree.summary

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 910224d3d55ee225628e57e8da8fbff648cd7977 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=910224d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 16:07:28 2014 +0200 mtree: docs updated for mtree.summary --- modules/mtree/README | 6 ++++-- modules/mtree/doc/mtree_admin.xml | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index e49d699..b0a6543 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -412,9 +412,11 @@ mt_match("mytree", "$rU", "0"); 6.1. mtree.summary - List usage summary for all trees. + List usage summary for all trees or for the tree whose name is given as + parameter. - Parameters: none. + Parameters: + * _mtree_ - (optional) the name of the tree. 6.2. mtree.reload diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index b008a35..cf91bbc 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -468,9 +468,13 @@ mt_match("mytree", "$rU", "0"); <function moreinfo="none">mtree.summary</function> </title> <para> - List usage summary for all trees. + List usage summary for all trees or for the tree whose name is + given as parameter. </para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_mtree_ - (optional) the name of the tree.</para></listitem> + </itemizedlist> </section> <section> <title> @@ -481,7 +485,7 @@ mt_match("mytree", "$rU", "0"); </para> <para>Parameters:</para> <itemizedlist> - <listitem><para>_mtree_</para> - name of mtree or empty string meaning all mtrees</listitem> + <listitem><para>_mtree_</para> - name of mtree or empty string meaning all mtrees</listitem> </itemizedlist> </section> <section>

10 years, 7 months

git:master: mtree: rpc mtree. summary can take as parameter the name of the tree

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 40e9b5b3238e65c14ad6c4d1be0cb3e0c779c642 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40e9b5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 16:06:32 2014 +0200 mtree: rpc mtree.summary can take as parameter the name of the tree --- modules/mtree/mtree_mod.c | 62 +++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 27 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index f48e443..ea05005 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -1024,6 +1024,7 @@ error: void rpc_mtree_summary(rpc_t* rpc, void* c) { + str tname = {0, 0}; m_tree_t *pt; void* th; void* ih; @@ -1034,6 +1035,9 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) return; } + /* read optional tree name */ + rpc->scan(c, "*S", &tname); + pt = mt_get_first_tree(); if(pt==NULL) { @@ -1043,34 +1047,38 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) while(pt!=NULL) { - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return; - } - if(rpc->struct_add(th, "s{", - "table", pt->tname.s, - "item", &ih) < 0) + if(tname.s==NULL + || (tname.s!=NULL && pt->tname.len>=tname.len + && strncmp(pt->tname.s, tname.s, tname.len)==0)) { - rpc->fault(c, 500, "Internal error creating rpc ih"); - return; - } - - if(rpc->struct_add(ih, "d", "ttype", pt->type) < 0 ) { - rpc->fault(c, 500, "Internal error adding type"); - return; - } - if(rpc->struct_add(ih, "d", "memsize", pt->memsize) < 0 ) { - rpc->fault(c, 500, "Internal error adding memsize"); - return; - } - if(rpc->struct_add(ih, "d", "nrnodes", pt->nrnodes) < 0 ) { - rpc->fault(c, 500, "Internal error adding nodes"); - return; - } - if(rpc->struct_add(ih, "d", "nritems", pt->nritems) < 0 ) { - rpc->fault(c, 500, "Internal error adding items"); - return; + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "s{", + "table", pt->tname.s, + "item", &ih) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc ih"); + return; + } + if(rpc->struct_add(ih, "d", "ttype", pt->type) < 0 ) { + rpc->fault(c, 500, "Internal error adding type"); + return; + } + if(rpc->struct_add(ih, "d", "memsize", pt->memsize) < 0 ) { + rpc->fault(c, 500, "Internal error adding memsize"); + return; + } + if(rpc->struct_add(ih, "d", "nrnodes", pt->nrnodes) < 0 ) { + rpc->fault(c, 500, "Internal error adding nodes"); + return; + } + if(rpc->struct_add(ih, "d", "nritems", pt->nritems) < 0 ) { + rpc->fault(c, 500, "Internal error adding items"); + return; + } } pt = pt->next; }

10 years, 7 months

git:master: mtree: rpc mtree. summary returns an array to comply with xmlrpc format

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 546dbde191dfb752abde2cd5a4a7cf9955a31768 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=546dbde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 15:56:30 2014 +0200 mtree: rpc mtree.summary returns an array to comply with xmlrpc format --- modules/mtree/mtree_mod.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index b6ed382..f48e443 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -1030,19 +1030,24 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) if(!mt_defined_trees()) { - rpc->fault(c, 500, "Empty tree list."); + rpc->fault(c, 500, "Empty tree list"); return; } - if (rpc->add(c, "{", &th) < 0) + pt = mt_get_first_tree(); + if(pt==NULL) { - rpc->fault(c, 500, "Internal error creating rpc"); + rpc->fault(c, 404, "No tree"); return; } - pt = mt_get_first_tree(); while(pt!=NULL) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } if(rpc->struct_add(th, "s{", "table", pt->tname.s, "item", &ih) < 0) @@ -1201,7 +1206,7 @@ static const char* rpc_mtree_match_doc[6] = { rpc_export_t mtree_rpc[] = { - {"mtree.summary", rpc_mtree_summary, rpc_mtree_summary_doc, 0}, + {"mtree.summary", rpc_mtree_summary, rpc_mtree_summary_doc, RET_ARRAY}, {"mtree.reload", rpc_mtree_reload, rpc_mtree_reload_doc, 0}, {"mtree.match", rpc_mtree_match, rpc_mtree_match_doc, 0}, {0, 0, 0, 0}

10 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014