sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

Start a nNew thread

[tracker] Comment added: Dialog bugs

by sip-router

11 years, 8 months

[tracker] Comment added: Dialog bugs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#282 - Dialog bugs User who did this - Eduardo Lejarreta (lejarreta.e) ---------- --- dlg_db_handler.c 2013-04-08 14:52:04.547468090 +0200 +++ dlg_db_handlerOriginal.c.bck 2013-04-04 16:12:07.218042510 +0200 @@ -380,12 +380,6 @@ else dlg->tl.timeout -= (unsigned int)time(0); - //LM_INFO("timeout: %u time(0): %u, get_ticks() %u, \n", (unsigned int)(VAL_INT(values+9)), (unsigned int)time(0), get_ticks() ); - //LM_INFO("current dialog timeout before is %u\n", dlg->tl.timeout); - - dlg->lifetime = dlg->tl.timeout - get_ticks(); - //LM_INFO("LIFETIME IS %u\n", dlg->lifetime); - GET_STR_VALUE(cseq1, values, 10 , 1, 1); GET_STR_VALUE(cseq2, values, 11 , 1, 1); GET_STR_VALUE(rroute1, values, 12, 0, 0); @@ -409,8 +403,7 @@ dlg_set_toroute(dlg, &toroute_name); /*restore the timer values */ - //if (0 != insert_dlg_timer( &(dlg->tl), (int)dlg->tl.timeout )) { - if (0 != insert_dlg_timer( &(dlg->tl), dlg->lifetime )) { + if (0 != insert_dlg_timer( &(dlg->tl), (int)dlg->tl.timeout )) { LM_CRIT("Unable to insert dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, @@ -421,11 +414,10 @@ continue; } dlg_ref(dlg,1); + LM_DBG("current dialog timeout is %u\n", dlg->tl.timeout); - //LM_INFO("LIFETIME IS %i\n", VAL_INT(values+9)-VAL_INT(values+7)); - //dlg->lifetime = VAL_INT(values+9) - VAL_INT(values+7); + dlg->lifetime = 0; dlg->dflags = 0; - dlg->dflags |= DLG_FLAG_TOBYE; next_dialog: ; } @@ -731,9 +723,6 @@ VAL_INT(values+11) = (unsigned int)( (unsigned int)time(0) + cell->tl.timeout - get_ticks() ); - /*LM_INFO("timeout: %u celltimeout: %u time(0): %u, get_ticks() %u, \n", (unsigned int)( (unsigned int)time(0) + - cell->tl.timeout - get_ticks() ), cell->tl.timeout, (unsigned int)time(0), get_ticks() );*/ - SET_STR_VALUE(values+2, cell->callid); SET_STR_VALUE(values+3, cell->from_uri); SET_STR_VALUE(values+4, cell->tag[DLG_CALLER_LEG]); @@ -788,9 +777,6 @@ VAL_INT(values+11) = (unsigned int)( (unsigned int)time(0) + cell->tl.timeout - get_ticks() ); - /*LM_INFO("timeout: %u celltimeout: %u time(0): %u, get_ticks() %u, \n", (unsigned int)( (unsigned int)time(0) + - cell->tl.timeout - get_ticks() ), cell->tl.timeout, (unsigned int)time(0), get_ticks() );*/ - SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]); ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=282#comment854 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.

11 years, 8 months

git:master: core: new global parameter - modinit_delay

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 52d339408f499c867548f2531be1cac119b31e3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52d3394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 13:38:32 2013 +0200 core: new global parameter - modinit_delay - sepecify microseconds to sleep after initializing a module in order to cope with systems having rate limits on new connections to db or other servers --- cfg.lex | 2 ++ cfg.y | 3 +++ sr_module.c | 17 ++++++++++++++++- sr_module.h | 2 ++ 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index a290e0f..3f754ac 100644 --- a/cfg.lex +++ b/cfg.lex @@ -337,6 +337,7 @@ AVP_PREF (([ft][rud]?)|g)\. DEBUG debug FORK fork FORK_DELAY fork_delay +MODINIT_DELAY modinit_delay LOGSTDERROR log_stderror LOGFACILITY log_facility LOGNAME log_name @@ -707,6 +708,7 @@ IMPORTFILE "import_file" <INITIAL>{DEBUG} { count(); yylval.strval=yytext; return DEBUG_V; } <INITIAL>{FORK} { count(); yylval.strval=yytext; return FORK; } <INITIAL>{FORK_DELAY} { count(); yylval.strval=yytext; return FORK_DELAY; } +<INITIAL>{MODINIT_DELAY} { count(); yylval.strval=yytext; return MODINIT_DELAY; } <INITIAL>{LOGSTDERROR} { yylval.strval=yytext; return LOGSTDERROR; } <INITIAL>{LOGFACILITY} { yylval.strval=yytext; return LOGFACILITY; } <INITIAL>{LOGNAME} { yylval.strval=yytext; return LOGNAME; } diff --git a/cfg.y b/cfg.y index c448883..ac4fa58 100644 --- a/cfg.y +++ b/cfg.y @@ -390,6 +390,7 @@ extern char *finame; %token DEBUG_V %token FORK %token FORK_DELAY +%token MODINIT_DELAY %token LOGSTDERROR %token LOGFACILITY %token LOGNAME @@ -842,6 +843,8 @@ assign_stm: | FORK EQUAL error { yyerror("boolean value expected"); } | FORK_DELAY EQUAL NUMBER { set_fork_delay($3); } | FORK_DELAY EQUAL error { yyerror("number expected"); } + | MODINIT_DELAY EQUAL NUMBER { set_modinit_delay($3); } + | MODINIT_DELAY EQUAL error { yyerror("number expected"); } | LOGSTDERROR EQUAL NUMBER { if (!config_check) /* if set from cmd line, don't overwrite from yyparse()*/ if(log_stderr == 0) log_stderr=$3; } diff --git a/sr_module.c b/sr_module.c index 3cce9fe..e169291 100644 --- a/sr_module.c +++ b/sr_module.c @@ -120,6 +120,17 @@ struct sr_module* modules=0; int mod_response_cbk_no=0; response_function* mod_response_cbks=0; +/* number of usec to wait before initializing a module */ +static unsigned int modinit_delay = 0; + +unsigned int set_modinit_delay(unsigned int v) +{ + unsigned int r; + r = modinit_delay; + modinit_delay = v; + return r; +} + /** * if bit 1 set, SIP worker processes handle RPC commands as well * if bit 2 set, RPC worker processes handle SIP commands as well @@ -832,12 +843,16 @@ int init_modules(void) struct sr_module* t; for(t = modules; t; t = t->next) { - if (t->exports.init_f) + if (t->exports.init_f) { if (t->exports.init_f() != 0) { LOG(L_ERR, "init_modules(): Error while" " initializing module %s\n", t->exports.name); return -1; } + /* delay next module init, if configured */ + if(unlikely(modinit_delay>0)) + sleep_us(modinit_delay); + } if (t->exports.response_f) mod_response_cbk_no++; } diff --git a/sr_module.h b/sr_module.h index 810008f..14f9936 100644 --- a/sr_module.h +++ b/sr_module.h @@ -670,4 +670,6 @@ void set_child_rpc_sip_mode(void); int is_sip_worker(int rank); int is_rpc_worker(int rank); +unsigned int set_modinit_delay(unsigned int v); + #endif /* sr_module_h */

11 years, 8 months

git:master: sqlops: use one char buf for empty strings in db results

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a74980270b655124c276279e54b8f82965f3f4b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a749802… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 10:26:49 2013 +0200 sqlops: use one char buf for empty strings in db results - safe for the parts of code that want to access it even for write --- modules/sqlops/sql_api.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index b5ce758..6528078 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -42,7 +42,7 @@ sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; -static str _sql_empty_str = {"", 0}; +static char _sql_empty_buf[1]; sql_con_t* sql_get_connection(str *name) { @@ -67,6 +67,8 @@ int sql_init_con(str *name, str *url) sql_con_t *sc; unsigned int conid; + *_sql_empty_buf = '\0'; + conid = core_case_hash(name, 0, 0); sc = _sql_con_root; @@ -373,16 +375,18 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) LM_ERR("no more memory\n"); goto error; } - db_longlong2str(RES_ROWS(db_res)[i].values[j].val.ll_val, res->vals[i][j].value.s.s, &res->vals[i][j].value.s.len); + db_longlong2str(RES_ROWS(db_res)[i].values[j].val.ll_val, + res->vals[i][j].value.s.s, &res->vals[i][j].value.s.len); break; default: res->vals[i][j].flags = PV_VAL_NULL; } if(res->vals[i][j].flags == PV_VAL_STR && sv.s) { - if(sv.len==0) + if(sv.len<=0) { - res->vals[i][j].value.s = _sql_empty_str; + res->vals[i][j].value.s.s = _sql_empty_buf; + res->vals[i][j].value.s.len = 0; continue; } res->vals[i][j].value.s.s

11 years, 8 months

git:master: registrar: added debug message to print generated ruid for contact

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 735f83d6346c97d6f7b1da26a2fee1b6270872b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=735f83d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 13:36:08 2013 +0200 registrar: added debug message to print generated ruid for contact - formatted condition to fit 80 char long line --- modules/registrar/save.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 6c29403..a82be7e 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -382,6 +382,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig if(sruid_next(&_reg_sruid)<0) goto error; ci.ruid = _reg_sruid.uid; + LM_DBG("generated ruid is: %.*s\n", ci.ruid.len, ci.ruid.s); } return &ci; @@ -452,8 +453,9 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, in flags = mem_only; #ifdef USE_TCP - if ( (_m->flags&tcp_persistent_flag) && - (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { + if ( (_m->flags&tcp_persistent_flag) + && (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS + ||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { e_max = 0; tcp_check = 1; } else {

11 years, 8 months

git:master: modules/rr: add double record-routes when outbound is enabled

by Peter Dunkley

Module: sip-router Branch: master Commit: c38c0ba0ab3244aa387de706a4555fab28c67ad7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c38c0ba… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 11:48:21 2013 +0100 modules/rr: add double record-routes when outbound is enabled - Note: loose.c does not yet handle these properly --- modules/rr/record.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index 41a3245..62de981 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -200,7 +200,7 @@ static inline struct lump *insert_rr_param_lump(struct lump *before, * \return 0 on success, negative on failure */ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, - str *tag, str *params, int _inbound, int _use_ob, int _sips) + str *tag, str *params, int _inbound, int _sips) { char* prefix, *suffix, *term, *r2; int suffix_len, prefix_len; @@ -284,7 +284,7 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, _l = insert_subst_lump_after(_l, _inbound?SUBST_RCV_ALL:SUBST_SND_ALL, 0); if (_l ==0 ) goto lump_err; - if (enable_double_rr && !_use_ob) { + if (enable_double_rr) { if (!(_l = insert_cond_lump_after(_l, COND_IF_DIFF_REALMS, 0))) goto lump_err; if (!(_l = insert_new_lump_after(_l, r2, RR_R2_LEN, 0))) @@ -421,7 +421,7 @@ int record_route(struct sip_msg* _m, str *params) sips = rr_is_sips(_m); - if (enable_double_rr && !use_ob) { + if (enable_double_rr) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -434,7 +434,7 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to insert conditional lump\n"); return -6; } - if (build_rr(l, l2, &user, tag, params, OUTBOUND, 0, sips) < 0) { + if (build_rr(l, l2, &user, tag, params, OUTBOUND, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -448,7 +448,7 @@ int record_route(struct sip_msg* _m, str *params) } if (build_rr(l, l2, &user, tag, params, use_ob ? OUTBOUND : INBOUND, - use_ob, sips) < 0) { + sips) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); return -4; } @@ -601,7 +601,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) #define RR_TRANS_LEN 11 #define RR_TRANS ";transport=" static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_data, - str* user, str *tag, int _inbound, int _use_ob, int _sips) + str* user, str *tag, int _inbound, int _sips) { char *p; char *hdr, *trans, *r2, *suffix, *term; @@ -693,7 +693,7 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d goto lump_err; if (!(_l = insert_subst_lump_after(_l, _inbound?SUBST_RCV_PROTO:SUBST_SND_PROTO, 0))) goto lump_err; - if (enable_double_rr && !_use_ob) { + if (enable_double_rr) { if (!(_l = insert_cond_lump_after(_l, COND_IF_DIFF_REALMS, 0))) goto lump_err; if (!(_l = insert_new_lump_after(_l, r2, RR_R2_LEN, 0))) @@ -760,7 +760,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) sips = rr_is_sips(_m); - if (enable_double_rr && !use_ob) { + if (enable_double_rr) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -774,7 +774,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -4; } if (build_advertised_rr(l, l2, _data, &user, tag, OUTBOUND, - 0, sips) < 0) { + sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -5; } @@ -789,7 +789,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) if (build_advertised_rr(l, l2, _data, &user, tag, use_ob ? OUTBOUND: INBOUND, - use_ob, sips) < 0) { + sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -841,7 +841,7 @@ int add_rr_param(struct sip_msg* msg, str* rr_param) goto error; } /* double routing enabled? */ - if (enable_double_rr && !(rr_obb.use_outbound && rr_obb.use_outbound(msg))) { + if (enable_double_rr) { if (root==0 || (last_param=get_rr_param_lump(&root))==0) { LM_CRIT("failed to locate double RR lump\n"); goto error;

11 years, 8 months

git:master: modules/rr: refactored process_outbound()

by Peter Dunkley

Module: sip-router Branch: master Commit: 0e09fba67dc5d75d5e73bb7d35deecf721b37cfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e09fba… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 11:49:21 2013 +0100 modules/rr: refactored process_outbound() - Still need to update loose.c to properly handle double-RRs with flow-tokens --- modules/rr/loose.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index e1d0571..50c4774 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -550,13 +550,11 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, rcv->src_ip.af == AF_INET6 ? "]" : "", rcv->src_port, get_proto_name(rcv->proto)); - } else { - LM_DBG("outbound \"outgoing\" request found - " - "Not using flow-token for routing\n"); - return 0; - } + return 1; + } - return 1; + LM_DBG("Not using flow-token for routing\n"); + return 0; } /*!

11 years, 8 months

git:4.0: core: fix default read-only DB URL

by Klaus Darilion

Module: sip-router Branch: 4.0 Commit: a8991ef4b63c575a32807c3aacc7a076ae22d40d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8991ef… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Apr 24 09:09:25 2013 +0000 core: fix default read-only DB URL (cherry picked from commit fdb6c8cbafec7849367f16f5dc56ffa20885bef4) --- config.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config.h b/config.h index 2368503..fce4c22 100644 --- a/config.h +++ b/config.h @@ -196,7 +196,7 @@ defined MOD_INTERFACE_V1 #define DEFAULT_DB_URL "mysql://kamailio:kamailiorw@localhost/kamailio" #define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1) - #define DEFAULT_RODB_URL "mysql://kamailio:kamailiorw@localhost/okamailio" + #define DEFAULT_RODB_URL "mysql://kamailioro:kamailioro@localhost/kamailio" #define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1) #else #define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser"

11 years, 8 months

git:master: core: fix default read-only DB URL

by Klaus Darilion

Module: sip-router Branch: master Commit: fdb6c8cbafec7849367f16f5dc56ffa20885bef4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdb6c8c… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Apr 24 09:09:25 2013 +0000 core: fix default read-only DB URL --- config.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config.h b/config.h index 85e6388..1465f1e 100644 --- a/config.h +++ b/config.h @@ -198,7 +198,7 @@ defined MOD_INTERFACE_V1 #define DEFAULT_DB_URL "mysql://kamailio:kamailiorw@localhost/kamailio" #define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1) - #define DEFAULT_RODB_URL "mysql://kamailio:kamailiorw@localhost/okamailio" + #define DEFAULT_RODB_URL "mysql://kamailioro:kamailioro@localhost/kamailio" #define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1) #else #define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser"

11 years, 8 months

[tracker] Comment added: app_lua: added sr.xavp.get_keys function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#288 - app_lua: added sr.xavp.get_keys function User who did this - Víctor Seva (linuxmaniac) ---------- Functions sr.xavp.get_keys and sr.xavp.get documented in the wiki: https://www.kamailio.org/wiki/embeddedapi/devel/lua ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=288#comment853 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.

11 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013