sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:master: htable: new MI command dht_dump

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: ba906b6272446d4622167f8d95e7ad6a13eca034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba906b6… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue May 19 23:33:15 2009 +0300 htable: new MI command dht_dump - list content of a hash table via MI --- modules_k/htable/htable.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 9cc77b4..68c3e2f 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -32,6 +32,7 @@ #include "../../timer.h" #include "../../route.h" #include "../../dprint.h" +#include "../../ut.h" #include "../../lib/kmi/mi.h" #include "../../lib/kcore/faked_msg.h" @@ -58,6 +59,7 @@ static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); 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 pv_export_t mod_pvs[] = { { {"sht", sizeof("sht")-1}, PVT_OTHER, pv_get_ht_cell, pv_set_ht_cell, @@ -74,6 +76,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}, { 0, 0, 0, 0, 0} }; @@ -365,3 +368,72 @@ 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_dump(struct mi_root* cmd_tree, void* param) +{ + struct mi_node* node; + struct mi_node* node2; + struct mi_root *rpl_tree; + struct mi_node *rpl; + str htname; + ht_t *ht; + ht_cell_t *it; + int i; + int len; + char *p; + + node = cmd_tree->node.kids; + if(node == NULL) + return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + htname = node->value; + if(htname.len<=0 || htname.s==NULL) + { + LM_ERR("bad hash table name\n"); + return init_mi_tree( 500, "bad hash table name", 19); + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + LM_ERR("bad hash table name\n"); + return init_mi_tree( 500, "no such hash table", 18); + } + + rpl_tree = init_mi_tree( 200, MI_OK_S, MI_OK_LEN); + if (rpl_tree==NULL) + return 0; + rpl = &rpl_tree->node; + + for(i=0; i<ht->htsize; i++) + { + lock_get(&ht->entries[i].lock); + it = ht->entries[i].first; + if(it) + { + /* add entry node */ + p = int2str((unsigned long)i, &len); + node = add_mi_node_child(rpl, MI_DUP_VALUE, "Entry", 5, p, len); + if (node==0) + goto error; + while(it) + { + if(it->flags&AVP_VAL_STR) { + node2 = add_mi_node_child(node, MI_DUP_VALUE, it->name.s, it->name.len, + it->value.s.s, it->value.s.len); + } else { + p = sint2str((long)it->value.n, &len); + node2 = add_mi_node_child(node, MI_DUP_VALUE, it->name.s, it->name.len, + p, len); + } + if (node2==0) + goto error; + it = it->next; + } + } + lock_release(&ht->entries[i].lock); + } + + return rpl_tree; +error: + free_mi_tree(rpl_tree); + return 0; +} +

15 years, 7 months

git:master: htable: check if event route is defined and has a list of actions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 763a138ce92010fadab58972a52bfc02572f7dc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=763a138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 20:09:16 2009 +0300 htable: check if event route is defined and has a list of actions - adding in the to-do list for event_route - check if the event is exported by core or modules --- modules_k/htable/htable.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index bf5cbcf..9cc77b4 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -174,7 +174,7 @@ static int child_init(int rank) return 0; rt = route_get(&event_rt, "htable:mod-init"); - if(rt>=0) { + if(rt>=0 && event_rt.rlist[rt]!=NULL) { LM_DBG("executing event_route[htable:mod-init] (%d)\n", rt); if(faked_msg_init()<0) return -1;

15 years, 7 months

git:master: htable: execute event_route[htable:mod-init] if idefined

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a18160c8f5979464bd808af4c1f565b428d2e9ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a18160c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 19:44:00 2009 +0300 htable: execute event_route[htable:mod-init] if idefined - the module will execute the event route just after modules have been initialized - a typical use case could be the initialization of some values in hash tables - example: modparam("htable", "htable", "a=>size=4;") event_route[htable:mod-init] { $sht(a=>calls-to::10.10.10.10) = 0; $sht(a=>max-calls-to::10.10.10.10) = 100; $sht(a=>calls-to::10.10.10.11) = 0; $sht(a=>max-calls-to::10.10.10.11) = 10; } route { if(is_method("INVITE") && !has_totag()) { switch($rd) { case "10.10.10.10": lock("calls-to::10.10.10.10"); $sht(a=>calls-to::10.10.10.10) = $sht(a=>calls-to::10.10.10.10) + 1; unlock("calls-to::10.10.10.10"); if($sht(a=>calls-to::10.10.10.10)>$sht(a=>max-calls-to::10.10.10.10)) { sl_send_reply("500", "To many calls to .10"); exit; } break; case "10.10.10.11": ... break; } } } --- modules_k/htable/htable.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 4dc7f4e..bf5cbcf 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -30,8 +30,10 @@ #include "../../sr_module.h" #include "../../timer.h" +#include "../../route.h" #include "../../dprint.h" #include "../../lib/kmi/mi.h" +#include "../../lib/kcore/faked_msg.h" #include "../../pvar.h" #include "ht_api.h" @@ -46,6 +48,7 @@ int ht_timer_interval = 20; /** module functions */ static int ht_print(struct sip_msg*, char*, char*); static int mod_init(void); +static int child_init(int rank); void destroy(void); static int fixup_ht_rm(void** param, int param_no); @@ -115,7 +118,7 @@ struct module_exports exports= { mod_init, /* module initialization function */ 0, (destroy_function) destroy, - 0 /* per-child init function */ + child_init /* per-child init function */ }; /** @@ -157,6 +160,30 @@ static int mod_init(void) return -1; } } + return 0; +} + + +static int child_init(int rank) +{ + struct sip_msg *fmsg; + int rtb, rt; + + LM_DBG("rank is (%d)\n", rank); + if (rank!=PROC_INIT) + return 0; + + rt = route_get(&event_rt, "htable:mod-init"); + if(rt>=0) { + LM_DBG("executing event_route[htable:mod-init] (%d)\n", rt); + if(faked_msg_init()<0) + return -1; + fmsg = faked_msg_next(); + rtb = route_type; + set_route_type(REQUEST_ROUTE); + run_top_route(event_rt.rlist[rt], fmsg); + set_route_type(rtb); + } return 0; }

15 years, 7 months

git:master: core: support for event_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 31b5e3d0e7812bc008a05311c213848b55fd9387 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31b5e3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 19:55:12 2009 +0300 core: support for event_route - a new type of route available in config - prototye: event_route[groupid:eventid] - groupid should be the name of the module that triggers the event - eventid some meaningful short text describing the event - the route is not executed from other routes, but internally when some events happen - to be used to get error_route and local_route K functionalities - ex: event_route[core:request-parse-error] - ex: event_route[tm:local-request] - note: those are not implemented yet - the approach has the benefit of not needing to alter the grammer if new routes need to be defined - still to-do: - module that executes the event should export contraints of what route type the functions must obey if used inside (for now REQUEST_ROUTE functions can be used) - first implementation is in htable module - event route after all modules are initialized --- cfg.lex | 9 ++++++++- cfg.y | 18 ++++++++++++++++++ config.h | 1 + route.c | 7 +++++++ route.h | 2 ++ 5 files changed, 36 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index 957e27f..afae712 100644 --- a/cfg.lex +++ b/cfg.lex @@ -161,6 +161,7 @@ ROUTE_FAILURE failure_route ROUTE_ONREPLY onreply_route ROUTE_BRANCH branch_route ROUTE_SEND onsend_route +ROUTE_EVENT event_route EXEC exec FORCE_RPORT "force_rport"|"add_rport" FORCE_TCP_ALIAS "force_tcp_alias"|"add_tcp_alias" @@ -449,7 +450,7 @@ COLON ":" STAR \* DOT \. CR \n - +EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*":"[a-zA-Z][0-9a-zA-Z-]* COM_LINE # @@ -492,6 +493,7 @@ EAT_ABLE [\ \t\b\r] return ROUTE_FAILURE; } <INITIAL>{ROUTE_BRANCH} { count(); yylval.strval=yytext; return ROUTE_BRANCH; } <INITIAL>{ROUTE_SEND} { count(); yylval.strval=yytext; return ROUTE_SEND; } +<INITIAL>{ROUTE_EVENT} { count(); yylval.strval=yytext; return ROUTE_EVENT; } <INITIAL>{EXEC} { count(); yylval.strval=yytext; return EXEC; } <INITIAL>{SET_HOST} { count(); yylval.strval=yytext; return SET_HOST; } <INITIAL>{SET_HOSTPORT} { count(); yylval.strval=yytext; return SET_HOSTPORT; } @@ -940,6 +942,11 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{DOT} { count(); return DOT; } <INITIAL>\\{CR} {count(); } /* eat the escaped CR */ <INITIAL>{CR} { count();/* return CR;*/ } +<INITIAL>{EVENT_RT_NAME} { count(); + addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + return EVENT_RT_NAME; } <INITIAL,SELECT>{QUOTES} { count(); old_initial = YY_START; diff --git a/cfg.y b/cfg.y index 6eec3b1..d8d0e35 100644 --- a/cfg.y +++ b/cfg.y @@ -269,6 +269,7 @@ static int case_check_default(struct case_stms* stms); %token ROUTE_ONREPLY %token ROUTE_BRANCH %token ROUTE_SEND +%token ROUTE_EVENT %token EXEC %token SET_HOST %token SET_HOSTPORT @@ -509,6 +510,7 @@ static int case_check_default(struct case_stms* stms); %token <strval> PVAR /* not clear yet if this is an avp or pvar */ %token <strval> AVP_OR_PVAR +%token <strval> EVENT_RT_NAME /* other */ %token COMMA @@ -589,6 +591,7 @@ statement: | {rt=ONREPLY_ROUTE;} onreply_route_stm | {rt=BRANCH_ROUTE;} branch_route_stm | {rt=ONSEND_ROUTE;} send_route_stm + | {rt=EVENT_ROUTE;} event_route_stm | SEMICOLON /* null statement */ | CR /* null statement*/ ; @@ -1579,6 +1582,21 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { } | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; +event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { + i_tmp=route_get(&event_rt, $3); + if (i_tmp==-1){ + yyerror("internal error"); + YYABORT; + } + if (event_rt.rlist[i_tmp]){ + yyerror("duplicate route"); + YYABORT; + } + push($6, &event_rt.rlist[i_tmp]); + } + + | ROUTE_EVENT error { yyerror("invalid event_route statement"); } + ; /*exp: rval_expr { diff --git a/config.h b/config.h index 317ff1c..e78d727 100644 --- a/config.h +++ b/config.h @@ -62,6 +62,7 @@ #define ONREPLY_RT_NO RT_NO /* on_reply routing tables number */ #define BRANCH_RT_NO RT_NO /* branch_route routing tables number */ #define ONSEND_RT_NO 1 /* onsend_route routing tables number */ +#define EVENT_RT_NO RT_NO /* event_route routing tables number */ #define DEFAULT_RT 0 /* default routing table */ #define MAX_REC_LEV 100 /* maximum number of recursive calls */ diff --git a/route.c b/route.c index 77adbfb..e22820d 100644 --- a/route.c +++ b/route.c @@ -93,6 +93,7 @@ struct route_list onreply_rt; struct route_list failure_rt; struct route_list branch_rt; struct route_list onsend_rt; +struct route_list event_rt; int route_type = REQUEST_ROUTE; @@ -131,6 +132,7 @@ void destroy_routes() destroy_rlist(&onreply_rt); destroy_rlist(&failure_rt); destroy_rlist(&branch_rt); + destroy_rlist(&event_rt); } @@ -201,6 +203,8 @@ int init_routes() goto error; if (init_rlist("on_send", &onsend_rt, ONSEND_RT_NO, RT_HASH_SIZE)<0) goto error; + if (init_rlist("event", &event_rt, EVENT_RT_NO, RT_HASH_SIZE)<0) + goto error; return 0; error: destroy_routes(); @@ -1807,6 +1811,8 @@ int fix_rls() return ret; if ((ret=fix_rl(&onsend_rt))!=0) return ret; + if ((ret=fix_rl(&event_rt))!=0) + return ret; return 0; } @@ -1838,4 +1844,5 @@ void print_rls() print_rl(&failure_rt, "failure"); print_rl(&branch_rt, "branch"); print_rl(&onsend_rt, "onsend"); + print_rl(&event_rt, "event"); } diff --git a/route.h b/route.h index cb86ba4..6232f4b 100644 --- a/route.h +++ b/route.h @@ -52,6 +52,7 @@ #define ONSEND_ROUTE (1 << 4) #define ERROR_ROUTE (1 << 5) #define LOCAL_ROUTE (1 << 6) +#define EVENT_ROUTE REQUEST_ROUTE #define ANY_ROUTE (0xFFFFFFFF) /* The value of this variable is one of the route types defined above and it @@ -82,6 +83,7 @@ extern struct route_list onreply_rt; extern struct route_list failure_rt; extern struct route_list branch_rt; extern struct route_list onsend_rt; +extern struct route_list event_rt; /* script optimization level */ extern int scr_opt_lev;

15 years, 7 months

git:master: core: PV printing, revert 103ffecf7, add the proper fix from kamailio

by Henning Westerholt

Module: sip-router Branch: master Commit: 8f2817965f28c05947484023c324866288d7abb1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f28179… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 19 18:20:59 2009 +0200 core: PV printing, revert 103ffecf7, add the proper fix from kamailio revert not needed commit 103ffecf7, add the proper fix from kamailio for this problem. Now its possible to print and use more then one pseudo-variable at a time. The old implementation used only one static buffer, so in subsequent calls to the function the previous printed variable was overwritten. --- sr_module.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sr_module.c b/sr_module.c index 1ab8868..8dfcfad 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1349,6 +1349,9 @@ int fixup_str_2(void** param, int param_no) } + +#define PV_PRINT_BUF_SIZE 1024 +#define PV_PRINT_BUF_NO 3 /** Get the function parameter value as string. * @return 0 - Success * -1 - Cannot get value @@ -1359,8 +1362,8 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) int ret; avp_t* avp; pv_value_t pv_val; - static char pve_buf[256]; /* ugly hack needed for PVE */ - memset(pve_buf, 0, sizeof(pve_buf)); + static int buf_itr = 0; /* ugly hack needed for PVE */ + static char pve_buf[PV_PRINT_BUF_NO][PV_PRINT_BUF_SIZE]; switch(param->type) { case FPARAM_REGEX: @@ -1405,13 +1408,14 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) } break; case FPARAM_PVE: - dst->len=sizeof(pve_buf); - if (unlikely(pv_printf(msg, param->v.pve, pve_buf, &dst->len)!=0)){ + dst->s=pve_buf[buf_itr]; + dst->len=PV_PRINT_BUF_SIZE; + buf_itr = (buf_itr+1)%PV_PRINT_BUF_NO; + if (unlikely(pv_printf(msg, param->v.pve, dst->s, &dst->len)!=0)){ ERR("Could not convert the PV-formated string to str\n"); dst->len=0; return -1; }; - dst->s=pve_buf; break; } return 0;

15 years, 7 months

git:master: - Fixed a race condition that caused using the same E-tag twice (credits

by Juha Heinanen

Module: sip-router Branch: master Commit: 80d83c2ed559eecad361b9ac59f5697f5dacf286 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80d83c2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 19 17:50:21 2009 +0300 - Fixed a race condition that caused using the same E-tag twice (credits to Anca Vamanu) --- modules_k/pua/send_publish.c | 86 ++++++++++++++++++++++------------------- 1 files changed, 46 insertions(+), 40 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index df8d984..a1d45f9 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -185,49 +185,47 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) presentity= search_htable( hentity, hash_code); if(presentity) { - if(ps->code== 412 && hentity->body && hentity->flag!= MI_PUBLISH && - hentity->flag!= MI_ASYN_PUBLISH) + LM_DBG("Record found in table and deleted\n"); + delete_htable(presentity, hash_code); + } + else + { + LM_DBG("Record not found in table\n"); + } + lock_release(&HashT->p_records[hash_code].lock); + + if(ps->code== 412 && hentity->body && hentity->flag!= MI_PUBLISH + && hentity->flag!= MI_ASYN_PUBLISH) + { + /* sent a PUBLISH within a dialog that no longer exists + * send again an intial PUBLISH */ + LM_DBG("received a 412 reply- try again to send PUBLISH\n"); + publ_info_t publ; + memset(&publ, 0, sizeof(publ_info_t)); + publ.pres_uri= hentity->pres_uri; + publ.body= hentity->body; + + if(hentity->desired_expires== 0) + publ.expires= -1; + else + if(hentity->desired_expires<= (int)time(NULL)) + publ.expires= 0; + else + publ.expires= hentity->desired_expires- (int)time(NULL)+ 3; + + publ.source_flag|= hentity->flag; + publ.event|= hentity->event; + publ.content_type= hentity->content_type; + publ.id= hentity->id; + publ.extra_headers= hentity->extra_headers; + publ.cb_param= hentity->cb_param; + + if(send_publish(&publ)< 0) { - /* sent a PUBLISH within a dialog that no longer exists - * send again an intial PUBLISH */ - LM_DBG("received a 412 reply- send an INSERT_TYPE" - " publish request\n"); - delete_htable(presentity, hash_code); - lock_release(&HashT->p_records[hash_code].lock); - publ_info_t publ; - memset(&publ, 0, sizeof(publ_info_t)); - publ.pres_uri= hentity->pres_uri; - publ.body= hentity->body; - - if(hentity->desired_expires== 0) - publ.expires= -1; - else - if(hentity->desired_expires<= (int)time(NULL)) - publ.expires= 0; - else - publ.expires= hentity->desired_expires- (int)time(NULL)+ 3; - - publ.source_flag|= hentity->flag; - publ.event|= hentity->event; - publ.content_type= hentity->content_type; - publ.id= hentity->id; - publ.extra_headers= hentity->extra_headers; - publ.cb_param= hentity->cb_param; - if(send_publish(&publ)< 0) - { - LM_ERR("when trying to send PUBLISH\n"); - goto error; - } - } - else - { - delete_htable(presentity, hash_code); - LM_DBG("***Delete from table\n"); - lock_release(&HashT->p_records[hash_code].lock); + LM_ERR("when trying to send PUBLISH\n"); + goto error; } } - else - lock_release(&HashT->p_records[hash_code].lock); goto done; } @@ -380,6 +378,8 @@ error: shm_free(*ps->param); *ps->param= NULL; } + if(presentity) + shm_free(presentity); return; } @@ -432,7 +432,10 @@ int send_publish( publ_info_t* publ ) } if(publ->flag & INSERT_TYPE) + { + LM_DBG("Insert flag set\n"); goto insert; + } if(presentity== NULL) { @@ -459,6 +462,7 @@ insert: } else { + LM_DBG("record found in hash_table\n"); publ->flag= UPDATE_TYPE; etag.s= (char*)pkg_malloc(presentity->etag.len* sizeof(char)); if(etag.s== NULL) @@ -521,6 +525,8 @@ insert: send_publish: /* construct the callback parameter */ + if(etag.s && etag.len) + publ->etag = &etag; cb_param= publish_cbparam(publ, body, tuple_id, REQ_OTHER); if(cb_param== NULL)

15 years, 7 months

git:master: htable: added pv to count items by value matching regexp

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: e65f0b69d2ea832d5ff0878c0d78758e88f3fe27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e65f0b6… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue May 19 11:13:00 2009 +0300 htable: added pv to count items by value matching regexp - $shtcv(ht=>regexp) - to count items in ht matching regexp --- modules_k/htable/ht_var.c | 26 ++++++++++++++++++++++++++ modules_k/htable/ht_var.h | 3 +++ modules_k/htable/htable.c | 2 ++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index fae9fc5..3f7ecba 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -262,4 +262,30 @@ int pv_get_ht_cn(struct sip_msg *msg, pv_param_t *param, return pv_get_sintval(msg, param, res, cnt); } +int pv_get_ht_cv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str htname; + ht_pv_t *hpv; + int cnt = 0; + + hpv = (ht_pv_t*)param->pvn.u.dname; + + if(hpv->ht==NULL) + { + hpv->ht = ht_get_table(&hpv->htname); + if(hpv->ht==NULL) + return pv_get_null(msg, param, res); + } + if(pv_printf_s(msg, hpv->pve, &htname)!=0) + { + LM_ERR("cannot get $ht name\n"); + return -1; + } + + cnt = ht_count_cells_re(&htname, hpv->ht, 1); + + /* integer */ + return pv_get_sintval(msg, param, res, cnt); +} diff --git a/modules_k/htable/ht_var.h b/modules_k/htable/ht_var.h index 4f4f021..e6856b2 100644 --- a/modules_k/htable/ht_var.h +++ b/modules_k/htable/ht_var.h @@ -36,5 +36,8 @@ int pv_set_ht_cell_expire(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); int pv_get_ht_cn(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_ht_cv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + #endif diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index cdc77c0..4dc7f4e 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -64,6 +64,8 @@ static pv_export_t mod_pvs[] = { pv_parse_ht_name, 0, 0, 0 }, { {"shtcn", sizeof("shtcn")-1}, PVT_OTHER, pv_get_ht_cn, 0, pv_parse_ht_name, 0, 0, 0 }, + { {"shtcv", sizeof("shtcv")-1}, PVT_OTHER, pv_get_ht_cv, 0, + pv_parse_ht_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

15 years, 7 months

git:master: benchmark: scalars converted to unsigned long long

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 21698992bf3e046e4bd127cb0f02a7be4390ecfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2169899… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 10:42:38 2009 +0300 benchmark: scalars converted to unsigned long long - should fix issue with printing negative values --- modules_k/benchmark/benchmark.c | 2 +- modules_k/benchmark/benchmark.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/benchmark/benchmark.c b/modules_k/benchmark/benchmark.c index 1b4ede3..bca072a 100644 --- a/modules_k/benchmark/benchmark.c +++ b/modules_k/benchmark/benchmark.c @@ -335,7 +335,7 @@ int _bm_log_timer(unsigned int id) { LM_GEN1(bm_mycfg->loglevel, "benchmark (timer %s [%d]): %llu [" " msgs/total/min/max/avg - LR:" - " %i/%lld/%lld/%lld/%f | GB: %lld/%lld/%lld/%lld/%f]\n", + " %i/%llu/%llu/%llu/%f | GB: %llu/%llu/%llu/%llu/%f]\n", bm_mycfg->tindex[id]->name, id, tdiff, diff --git a/modules_k/benchmark/benchmark.h b/modules_k/benchmark/benchmark.h index d58a151..cc4e68e 100644 --- a/modules_k/benchmark/benchmark.h +++ b/modules_k/benchmark/benchmark.h @@ -58,14 +58,14 @@ typedef struct benchmark_timer unsigned int id; int enabled; bm_timeval_t *start; /* Current timer run */ - long long calls; /* Number of runs of this timer */ - long long sum; /* Accumulated runtime of this timer */ - long long last_sum; /* Accumulated runtime since last logging */ - long long last_max; /* Minimum in current period (between + unsigned long long calls; /* Number of runs of this timer */ + unsigned long long sum; /* Accumulated runtime of this timer */ + unsigned long long last_sum; /* Accumulated runtime since last logging */ + unsigned long long last_max; /* Minimum in current period (between granularity) */ - long long last_min; /* Maximum ... */ - long long global_max; /* Global minimum, since start */ - long long global_min; /* ... maximum ... */ + unsigned long long last_min; /* Maximum ... */ + unsigned long long global_max; /* Global minimum, since start */ + unsigned long long global_min; /* ... maximum ... */ struct benchmark_timer *next; } benchmark_timer_t;

15 years, 7 months

git:master: presence: fixes related to f2db mode

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3a0e8503d3abd1bb320e76b694280efd7a8d3db6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a0e850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 09:24:11 2009 +0300 presence: fixes related to f2db mode - reported by Juha Heinanen --- modules_k/presence/hash.c | 5 ++++- modules_k/presence/subscribe.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules_k/presence/hash.c b/modules_k/presence/hash.c index 11e5fc9..874fe03 100644 --- a/modules_k/presence/hash.c +++ b/modules_k/presence/hash.c @@ -261,7 +261,10 @@ int insert_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs) } new_rec->expires+= (int)time(NULL); - new_rec->db_flag= INSERTDB_FLAG; + if(fallback2db==0) + new_rec->db_flag= INSERTDB_FLAG; + else + new_rec->db_flag= NO_UPDATEDB_FLAG; lock_get(&htable[hash_code].lock); diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index cfec2c8..f05300a 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -362,18 +362,18 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, if(update_shtable(subs_htable, hash_code, subs, REMOTE_TYPE)< 0) { - if(fallback2db) + if(fallback2db==0) { - /* update in database table */ - if(update_subs_db(subs, REMOTE_TYPE)< 0) - { - LM_ERR("updating subscription in database table\n"); - goto error; - } + LM_ERR("updating subscription record in hash table\n"); + goto error; } - else + } + if(fallback2db!=0) + { + /* update in database table */ + if(update_subs_db(subs, REMOTE_TYPE)< 0) { - LM_ERR("updating subscription record in hash table\n"); + LM_ERR("updating subscription in database table\n"); goto error; } } @@ -1509,7 +1509,7 @@ void update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, while(s) { printf_subs(s); - if(s->expires < (int)time(NULL)- 50) + if(s->expires < (int)time(NULL)- expires_offset) { LM_DBG("Found expired record\n"); if(!no_lock) @@ -1834,7 +1834,7 @@ int restore_db_subs(void) pa_dbf.free_result(pa_db, result); /* delete all records */ - if(pa_dbf.delete(pa_db, 0,0,0,0)< 0) + if(fallback2db==0 && pa_dbf.delete(pa_db, 0,0,0,0)< 0) { LM_ERR("deleting all records from database table\n"); return -1;

15 years, 7 months

git:master: core: increased verbosity of error log message

by Nils Ohlmeier

Module: sip-router Branch: master Commit: 8416baf77f30258f34d2de0aa169ad5bb8841561 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8416baf… Author: Nils Ohlmeier <nils(a)iptel.org> Committer: Nils Ohlmeier <nils(a)iptel.org> Date: Tue May 19 02:18:59 2009 +0200 core: increased verbosity of error log message - added size information to an error log message of the config framework --- cfg/cfg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/cfg.c b/cfg/cfg.c index c52323c..d6b803b 100644 --- a/cfg/cfg.c +++ b/cfg/cfg.c @@ -130,9 +130,9 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* minor validation */ if (size != def_size) { - LOG(L_ERR, "ERROR: register_cfg_def(): the specified size of the config " - "structure does not equal with the calculated size, check whether " - "the variable types are correctly defined!\n"); + LOG(L_ERR, "ERROR: register_cfg_def(): the specified size (%i) of the config " + "structure does not equal with the calculated size (%i), check whether " + "the variable types are correctly defined!\n", def_size, size); goto error; }

15 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev