November 2011 - sr-dev - kamailio.org

git:master: pua: documente fetch_rows parameter
by Daniel-Constantin Mierla 30 Nov '11

30 Nov '11

Module: sip-router Branch: master Commit: e15dd7f7c75c0520a718a58dd541cdf1e874c249 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e15dd7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 30 19:00:11 2011 +0100 pua: documente fetch_rows parameter --- modules_k/pua/doc/pua_admin.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/doc/pua_admin.xml b/modules_k/pua/doc/pua_admin.xml index 4c553f8..b8c9752 100644 --- a/modules_k/pua/doc/pua_admin.xml +++ b/modules_k/pua/doc/pua_admin.xml @@ -307,6 +307,26 @@ modparam("pua", "check_remote_contact", 0) </programlisting> </example> </section> + <section> + <title><varname>fetch_rows</varname> (integer)</title> + <para> + Number of rows to be loaded in one step from database. + </para> + <para> + <emphasis> + Default value is 500. + </emphasis> + </para> + <example> + <title>Set <varname>fetch_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua", "fetch_rows", 1000) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master: dialog(k): refactored dlg ref counting
by Daniel-Constantin Mierla 30 Nov '11

30 Nov '11

Module: sip-router Branch: master Commit: 5bdee1ffe820d3e9e75898bb252d1660b4bbad60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bdee1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 21 23:52:43 2011 +0100 dialog(k): refactored dlg ref counting - dlg pointer is no longer stored in tm callbacks parameter and ref counting for these kind of needs was removed - the internal id (hash entry, dlg id) is given now to tm callbacks. The callbacks will do dlg lookup to get the structure - there are longer-time persistent ref counting for: * storing dlg structure in dialog hash table * keeping dlg in timer list * waiting for the reply of BYE to destroy dialog structure - all the other ref countings are for short time, only for the period of doing specific processing - the new ref counting is safer in relation with tm callbacks and avoids tight dependecy which may have been easily broken by future tm changes (cherry picked from commit 9ba4ee25e32368a9c17c3f86784a52a97b748b93) --- modules_k/dialog/dialog.c | 102 +++++++---- modules_k/dialog/dlg_db_handler.c | 8 +- modules_k/dialog/dlg_handlers.c | 387 +++++++++++++++++++------------------ modules_k/dialog/dlg_handlers.h | 23 ++- modules_k/dialog/dlg_hash.c | 60 +++++-- modules_k/dialog/dlg_hash.h | 73 +++++--- modules_k/dialog/dlg_profile.c | 145 ++++++--------- modules_k/dialog/dlg_profile.h | 44 ++--- modules_k/dialog/dlg_req_within.c | 12 +- modules_k/dialog/dlg_timer.h | 8 +- modules_k/dialog/dlg_var.c | 338 ++++++++++++++++++++++---------- modules_k/dialog/dlg_var.h | 34 ++-- 12 files changed, 716 insertions(+), 518 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5bd…

1 0

git:master: pua: load records from database in chunks
by Daniel-Constantin Mierla 30 Nov '11

30 Nov '11

Module: sip-router Branch: master Commit: 1970f091041474bf6633e6b4d90e753021d0cfff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1970f09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 30 15:18:23 2011 +0100 pua: load records from database in chunks - use fetch result capability from database connector - new module parameter fetch_rows (default 500) - reported by Laura Testi --- modules_k/pua/pua.c | 744 +++++++------- modules_k/pua/pua_db.c | 2850 ++++++++++++++++++++++++------------------------ 2 files changed, 1802 insertions(+), 1792 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=197…

1 0

git:master: parser: remove old URI parser and structure
by Daniel-Constantin Mierla 30 Nov '11

30 Nov '11

Module: sip-router Branch: master Commit: f65d060bb471070dca743905092afb60e5119bb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f65d060… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 30 15:19:35 2011 +0100 parser: remove old URI parser and structure --- parser/msg_parser.h | 13 ----- parser/parse_uri.c | 144 --------------------------------------------------- 2 files changed, 0 insertions(+), 157 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 31582f5..eee2948 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -174,19 +174,6 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((m)->new_uri.s && (m)->new_uri.len) ? (&(m)->new_uri) : (&(m)->first_line.u.request.uri)) -#if 0 - /* old version */ -struct sip_uri { - str user; /* Username */ - str passwd; /* Password */ - str host; /* Host name */ - str port; /* Port number */ - str params; /* Parameters */ - str headers; - unsigned short port_no; -}; -#endif - enum _uri_type{ERROR_URI_T=0, SIP_URI_T, SIPS_URI_T, TEL_URI_T, TELS_URI_T}; typedef enum _uri_type uri_type; enum _uri_flags{ diff --git a/parser/parse_uri.c b/parser/parse_uri.c index b337153..affe44f 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -52,9 +52,7 @@ #include "parse_uri.h" #include <string.h> #include "../dprint.h" -/* #ifdef PARSE_URI_OLD */ /* ZSW */ #include "../ut.h" /* q_memchr */ -/* #endif */ #include "../error.h" #include "../core_stats.h" @@ -62,7 +60,6 @@ * len= len of uri * returns: fills uri & returns <0 on error or 0 if ok */ -#ifndef PARSE_URI_OLD int parse_uri(char* buf, int len, struct sip_uri* uri) { enum states { URI_INIT, URI_USER, URI_PASSWORD, URI_PASSWORD_ALPHA, @@ -1234,147 +1231,6 @@ error_exit: return E_BAD_URI; } -#else /* PARSE_URI_OLD */ - -int parse_uri(char *buf, int len, struct sip_uri* uri) -{ - char* next, *end; - char *user, *passwd, *host, *port, *params, *headers, *ipv6; - int host_len, port_len, params_len, headers_len; - int err; - int ret; - - - ret=0; - host_len=0; - end=buf+len; - memset(uri, 0, sizeof(struct sip_uri)); /* zero it all, just to be sure */ - /* look for "sip:"*/; - next=q_memchr(buf, ':', len); - if ((next==0)||(strncasecmp(buf,"sip",next-buf)!=0)){ - LOG(L_DBG, "ERROR: parse_uri: bad sip uri\n"); - ser_error=ret=E_BAD_URI; - return ret; - } - buf=next+1; /* next char after ':' */ - if (buf>end){ - LOG(L_DBG, "ERROR: parse_uri: uri too short\n"); - ser_error=ret=E_BAD_URI; - return ret; - } - /*look for '@' */ - next=q_memchr(buf,'@', end-buf); - if (next==0){ - /* no '@' found, => no userinfo */ - uri->user.s=0; - uri->passwd.s=0; - host=buf; - }else{ - /* found it */ - user=buf; - /* try to find passwd */ - passwd=q_memchr(user,':', next-user); - if (passwd==0){ - /* no ':' found => no password */ - uri->passwd.s=0; - uri->user.s=user; - uri->user.len=next-user; - }else{ - uri->user.s=user; - uri->user.len=passwd-user; - passwd++; /*skip ':' */ - uri->passwd.s=passwd; - uri->passwd.len=next-passwd; - } - host=next+1; /* skip '@' */ - } - /* try to find the rest */ - if(host>=end){ - LOG(L_DBG, "ERROR: parse_uri: missing hostport\n"); - ser_error=ret=E_UNSPEC; - return ret; - } - next=host; - ipv6=q_memchr(host, '[', end-host); - if (ipv6){ - host=ipv6+1; /* skip '[' in "[3ffe::abbcd]" */ - if (host>=end){ - LOG(L_DBG, "ERROR: parse_uri: bad ipv6 uri\n"); - ret=E_UNSPEC; - return ret; - } - ipv6=q_memchr(host, ']', end-host); - if ((ipv6==0)||(ipv6==host)){ - LOG(L_DBG, "ERROR: parse_uri: bad ipv6 uri - null address" - " or missing ']'\n"); - ret=E_UNSPEC; - return ret; - } - host_len=ipv6-host; - next=ipv6; - } - - - headers=q_memchr(next,'?',end-next); - params=q_memchr(next,';',end-next); - port=q_memchr(next,':',end-next); - if (host_len==0){ /* host not ipv6 addr */ - host_len=(port)?port-host:(params)?params-host:(headers)?headers-host: - end-host; - } - /* get host */ - uri->host.s=host; - uri->host.len=host_len; - - /* get port*/ - if ((port)&&(port+1<end)){ - port++; - if ( ((params) &&(params<port))||((headers) &&(headers<port)) ){ - /* error -> invalid uri we found ';' or '?' before ':' */ - LOG(L_DBG, "ERROR: parse_uri: malformed sip uri\n"); - ser_error=ret=E_BAD_URI; - return ret; - } - port_len=(params)?params-port:(headers)?headers-port:end-port; - uri->port.s=port; - uri->port.len=port_len; - }else uri->port.s=0; - /* get params */ - if ((params)&&(params+1<end)){ - params++; - if ((headers) && (headers<params)){ - /* error -> invalid uri we found '?' or '?' before ';' */ - LOG(L_DBG, "ERROR: parse_uri: malformed sip uri\n"); - ser_error=ret=E_BAD_URI; - return ret; - } - params_len=(headers)?headers-params:end-params; - uri->params.s=params; - uri->params.len=params_len; - }else uri->params.s=0; - /*get headers */ - if ((headers)&&(headers+1<end)){ - headers++; - headers_len=end-headers; - uri->headers.s=headers; - uri->headers.len=headers_len; - }else uri->headers.s=0; - - err=0; - if (uri->port.s) uri->port_no=str2s(uri->port.s, uri->port.len, &err); - if (err){ - LOG(L_DBG, "ERROR: parse_uri: bad port number in sip uri: %.*s\n", - uri->port.len, ZSW(uri->port.s)); - ser_error=ret=E_BAD_URI; - return ret; - } - - return ret; -} -#endif - - - static inline int _parse_ruri(str *uri, int *status, struct sip_uri *parsed_uri)

1 0

git:master: lib/srdb1: helper functions to handle easier fetch capability
by Daniel-Constantin Mierla 30 Nov '11

30 Nov '11

Module: sip-router Branch: master Commit: 09c9abb0f7907132d9afee4580f0475a2e46cadc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09c9abb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 30 15:17:46 2011 +0100 lib/srdb1: helper functions to handle easier fetch capability --- lib/srdb1/db.h | 16 ++++++++++ lib/srdb1/db_query.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 64969a8..e27969f 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -452,5 +452,21 @@ int db_load_bulk_data(db_func_t* binding, db1_con_t* handle, str* name, db_key_t */ int db_api_init(void); +/** + * \brief wrapper around db query to handle fetch capability + * \return -1 error; 0 ok with no fetch capability; 1 ok with fetch capability + */ +int db_fetch_query(db_func_t *dbf, int frows, + db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, + const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc, + const db_key_t _o, db1_res_t** _r); + +/** + * \brief wrapper around db fetch to handle fetch capability + * \return -1 error; 0 ok with no fetch capability; 1 ok with fetch capability + */ +int db_fetch_next(db_func_t *dbf, int frows, db1_con_t* _h, + db1_res_t** _r); + #endif /* DB1_H */ diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c index dbde735..3f75421 100644 --- a/lib/srdb1/db_query.c +++ b/lib/srdb1/db_query.c @@ -357,3 +357,78 @@ int db_query_init(void) } return 0; } + +/** + * wrapper around db query to handle fetch capability + * return: -1 error; 0 ok with no fetch capability; 1 ok with fetch capability + */ +int db_fetch_query(db_func_t *dbf, int frows, + db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, + const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc, + const db_key_t _o, db1_res_t** _r) +{ + + int ret; + + ret = 0; + *_r = NULL; + + if (DB_CAPABILITY(*dbf, DB_CAP_FETCH)) { + if(dbf->query(_h, _k, _op, _v, _c, _n, _nc, _o, 0) < 0) + { + LM_ERR("unable to query db for fetch\n"); + goto error; + } + if(dbf->fetch_result(_h, _r, frows)<0) + { + LM_ERR("unable to fetch the db result\n"); + goto error; + } + ret = 1; + } else { + if(dbf->query(_h, _k, _op, _v, _c, _n, _nc, _o, _r) < 0) + { + LM_ERR("unable to do full db querry\n"); + goto error; + } + } + + return ret; + +error: + if(*_r) + { + dbf->free_result(_h, *_r); + *_r = NULL; + } + return -1; +} + +/** + * wrapper around db fetch to handle fetch capability + * return: -1 error; 0 ok with no fetch capability; 1 ok with fetch capability + */ +int db_fetch_next(db_func_t *dbf, int frows, db1_con_t* _h, + db1_res_t** _r) +{ + int ret; + + ret = 0; + + if (DB_CAPABILITY(*dbf, DB_CAP_FETCH)) { + if(dbf->fetch_result(_h, _r, frows)<0) { + LM_ERR("unable to fetch next rows\n"); + goto error; + } + ret = 1; + } + return ret; + +error: + if(*_r) + { + dbf->free_result(_h, *_r); + *_r = NULL; + } + return -1; +}

1 0

[tracker] Comment added: Crash if t_release() is executed after t_relay_to(), when this last returns -1
by sip-router 29 Nov '11

29 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#184 - Crash if t_release() is executed after t_relay_to(), when this last returns -1 User who did this - Daniel-Constantin Mierla (miconda) ---------- I looked yesterday evening and couldn't spot it by eye. Now I could test it and does not crash. Can you get the full log with debug=3? Maybe you can get the core file as well -- run as root, with ulimit -c unlimited. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=184#comment429 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.

1 0

[tracker] Task opened: Crash if t_release() is executed after t_relay_to(), when this last returns -1
by sip-router 29 Nov '11

29 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Iñaki Baz Castillo (ibc) Attached to Project - sip-router Summary - Crash if t_release() is executed after t_relay_to(), when this last returns -1 Task Type - Bug Report Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Kamailio 3.2 is crashing if t_release() is executed after t_relay_to() returns -1: --- if ! t_relay_to() { t_release(); } --- Error -1 is generated in t_relay_to, in this case, when trying to reach a domainname which hasn't got a DNS record. Here the log of the execution of t_relay_to: ERROR: <core> [resolve.c:1540]: ERROR: sip_hostport2su: could not resolve hostname: "proxy1.jssip.net" ERROR: tm [ut.h:318]: failed to resolve "proxy1.jssip.net" ERROR: tm [t_fwd.c:1528]: ERROR: t_forward_nonack: failure to add branches ERROR: tm [tm.c:1369]: ERROR: w_t_relay_to: t_relay_to failed WARNING: script | uovyxruroybhnsy | call | t_relay(): -1 generic internal error This is the log for the execution of t_release(): <core> [mem/q_malloc.c:457]: BUG: qm_free: freeing already freed pointer, first free: tm: h_table.c: free_cell(157) - aborting ALERT: <core> [main.c:745]: child process 24217 exited by a signal 6 ALERT: <core> [main.c:748]: core was not generated INFO: <core> [main.c:760]: INFO: terminating due to SIGCHLD INFO: <core> [main.c:811]: INFO: signal 15 received More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=184 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.

1 0

Kamailio v3.2.0 Development Guide published
by Daniel-Constantin Mierla 29 Nov '11

29 Nov '11

Hello, development guide for Kamailio has been updated for v3.2.0 - it goes through internal components, presenting the APIs for pkg/shm memory, locking/synchronization, config file interpreter, database connectors, a.s.o., as well as guiding how to write a new module. There is a section trying to collect hints about upgrading a module developed for old versions 1.x to newer architecture and APIs in versions 3.x. The tutorial is available online at: * http://asipto.com/u/kdg A mirror is hosted at: * http://www.kamailio.org/docs/kamailio-devel-guide/ This is the first release for v3.2, it may get adjustments in the near future. Among the plans to add new chapters: how to write docbook documentation; TM module API, Presence module API ... Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Dec 5-8, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

4 3

[tracker] Comment added: Double Free -- Crash/Coredump and possible security vulnerability
by sip-router 29 Nov '11

29 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#173 - Double Free -- Crash/Coredump and possible security vulnerability User who did this - Bayan Towfiq (btowfiq) ---------- will the dlgnewref also be merged? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=173#comment428 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.

1 0

[tracker] Task closed: $Ts returns wrong timestamp
by sip-router 29 Nov '11

29 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#105 - $Ts returns wrong timestamp User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105 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.

1 0