sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

by aawaise

Hello, I have downloaded and unzipped kamailio package available online. I want to know about TLS module, My question is that where is the encryption module located in TLS module ?? Is it in some .c file of TLS module or does TLS module use AES encryption available in LINUX or UNIX systems?? This question arises because I want to customize AES algorithm ?? Can it be done in TLS module or not ?? Regards, Aawaise -- View this message in context: http://sip-router.1086192.n5.nabble.com/Customize-Encryption-Algorithm-in-T… Sent from the Development mailing list archive at Nabble.com.

10 years, 2 months

Kamailio memdbg gdb output

by аЛинукс

Hi guys, we are using kamailio-4.1.6 built from source (with added custom module) and having memory leaks in mysql-related subsystem. Some (4) four kamailio proceses are growing to 900Mb in size. We have to restart kamailio nightly to have stable processing. Here is gdb output of running process: https://173.201.18.44/kamailio-4.1.6_memdbg_gdb.output Please help to determine where/how the chunks were not freed. Thanks ------ Nikolay

10 years, 2 months

git:master: tm: handle r-uri alias parameter for local generated requests within a dialog

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3e01905143ace159b18e11a31edf39018d754bba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e01905… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 10 21:16:51 2014 +0200 tm: handle r-uri alias parameter for local generated requests within a dialog --- modules/tm/uac.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 798fe9a..9a9cf48 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -67,6 +67,7 @@ #include "../../md5.h" #include "../../crc.h" #include "../../ip_addr.h" +#include "../../dset.h" #include "../../socket_info.h" #include "../../compiler_opt.h" #include "config.h" @@ -738,6 +739,14 @@ fin: */ int req_within(uac_req_t *uac_r) { + int ret; + char nbuf[MAX_URI_SIZE]; +#define REQ_DST_URI_SIZE 80 + char dbuf[REQ_DST_URI_SIZE]; + str ouri = {0, 0}; + str nuri = {0, 0}; + str duri = {0, 0}; + if (!uac_r || !uac_r->method || !uac_r->dialog) { LOG(L_ERR, "req_within: Invalid parameter value\n"); goto err; @@ -749,15 +758,49 @@ int req_within(uac_req_t *uac_r) uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); } + /* handle alias parameter in uri + * - only if no dst uri and no route set - */ + if(uac_r->dialog && uac_r->dialog->rem_target.len>0 + && uac_r->dialog->dst_uri.len==0 + && uac_r->dialog->route_set==NULL) { + ouri = uac_r->dialog->rem_target; + /*restore alias parameter*/ + nuri.s = nbuf; + nuri.len = MAX_URI_SIZE; + duri.s = dbuf; + duri.len = REQ_DST_URI_SIZE; + if(uri_restore_rcv_alias(&ouri, &nuri, &duri)<0) { + nuri.len = 0; + duri.len = 0; + } + if(nuri.len>0 && duri.len>0) { + uac_r->dialog->rem_target = nuri; + uac_r->dialog->dst_uri = duri; + } else { + ouri.len = 0; + } + } + if ((uac_r->method->len == 3) && (!memcmp("ACK", uac_r->method->s, 3))) goto send; if ((uac_r->method->len == 6) && (!memcmp("CANCEL", uac_r->method->s, 6))) goto send; uac_r->dialog->loc_seq.value++; /* Increment CSeq */ send: - return t_uac(uac_r); + ret = t_uac(uac_r); + if(ouri.len>0) { + uac_r->dialog->rem_target = ouri; + uac_r->dialog->dst_uri.s = 0; + uac_r->dialog->dst_uri.len = 0; + } + return ret; err: /* callback parameter must be freed outside of tm module if (cbp) shm_free(cbp); */ + if(ouri.len>0) { + uac_r->dialog->rem_target = ouri; + uac_r->dialog->dst_uri.s = 0; + uac_r->dialog->dst_uri.len = 0; + } return -1; }

10 years, 2 months

latest rtpengine branch

by Juha Heinanen

i noticed that latest commit on rtpengine master was titled: Release new version 3.3.0.0+0~mr3.6.0.0 however, i didn't find a branch corresponding to it. latest branch seems to be mr3.5. now that kamailio 4.2 is about to be released, it would be nice to have a new stable branch of rtpengine too. is there such a plan? -- juha

10 years, 2 months

git:master: core: safety check for server_header lenght

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 866ddc109bfd7c681e13ce529d271e8a2a33a972 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=866ddc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 10 12:19:29 2014 +0200 core: safety check for server_header lenght - don't add the header in local generated replies if the value is empty --- msg_translator.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index eb7acfc..6f36492 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2398,7 +2398,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, body = lump; } /* server header */ - if (server_signature) + if (server_signature && server_hdr.len) len += server_hdr.len + CRLF_LEN; /* warning hdr */ if (sip_warning) { @@ -2536,7 +2536,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, p += lump->text.len; } /* server header */ - if (server_signature) { + if (server_signature && server_hdr.len>0) { memcpy( p, server_hdr.s, server_hdr.len ); p+=server_hdr.len; memcpy( p, CRLF, CRLF_LEN );

10 years, 2 months

git:master: tm: safety check for user_agent_header value

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cea9b91dacdb23b22fc1a7dd8454994eab9efa6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cea9b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 10 12:11:52 2014 +0200 tm: safety check for user_agent_header value - don't add the header in local generated requests if the value is empty --- modules/tm/t_msgbuilder.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index fae0cdf..bcf96c5 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1578,9 +1578,9 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra *len += CSEQ_LEN + cseq.len + 1 + method->len + CRLF_LEN; /* CSeq */ *len += calculate_routeset_length(dialog); /* Route set */ *len += maxfwd_len; /* Max-forwards */ - *len += CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN; /* Content- - Length */ - *len += (server_signature ? (user_agent_hdr.len + CRLF_LEN) : 0); /* Signature */ + *len += CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN; /* Content-Length */ + *len += ((server_signature && user_agent_hdr.len>0) + ? (user_agent_hdr.len + CRLF_LEN) : 0); /* Signature */ *len += (headers ? headers->len : 0); /* Additional headers */ *len += (body ? body->len : 0); /* Message body */ *len += CRLF_LEN; /* End of Header */ @@ -1610,13 +1610,13 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra memapp(w, CRLF, CRLF_LEN); /* Server signature */ - if (server_signature) { + if (server_signature && user_agent_hdr.len>0) { memapp(w, user_agent_hdr.s, user_agent_hdr.len); memapp(w, CRLF, CRLF_LEN); } if (headers) memapp(w, headers->s, headers->len); memapp(w, CRLF, CRLF_LEN); - if (body) memapp(w, body->s, body->len); + if (body) memapp(w, body->s, body->len); #ifdef EXTRA_DEBUG assert(w-buf == *len);

10 years, 2 months

git:master: modules/tm: new function t_is_retr_async_reply to check if a reply being processed is part of a transaction currently suspended

by Jason Penton

Module: sip-router Branch: master Commit: 7f50e172c26259ebf023d414fb97b295958de370 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f50e17… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 10 10:44:49 2014 +0200 modules/tm: new function t_is_retr_async_reply to check if a reply being processed is part of a transaction currently suspended --- modules/tm/doc/functions.xml | 28 ++++++++++++++++++++++++++-- modules/tm/h_table.h | 1 + modules/tm/t_suspend.c | 1 + modules/tm/tm.c | 26 ++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index af7d11d..9d42cf3 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1723,5 +1723,29 @@ t_use_uac_headers(); </programlisting> </example> </section> - -</section> + <section id="tm.f.t_is_retr_async_reply"> + <title> </section> + <function>t_is_retr_async_reply()</function> + </title> + <para> + Check to see if the reply is a retransmitted reply on a transaction that is + currently suspended asynchronously (suspended during reply processing). Right now the check is only on the + transaction, we don't actually check to see if the reply message is an actual + retransmission of the suspended reply. This is expected as you should not process + another reply until the suspended reply processing has been completed. The trick here + is to make sure you don't suspend for too long or even worse, indefinitely. + </para> + <para>returns true if the transaction is currently reply suspended or false if not.</para> + <example> + <title><function>t_is_retr_async_reply</function> usage</title> + <programlisting> +... +if (t_is_retr_async_reply()) { + xlog("L_DBG", "Dropping retransmitted reply which is still currently suspended\n"); + drop(); +} +... + </programlisting> + </example> + </section> + </section> diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 50a711d..42551bb 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -322,6 +322,7 @@ typedef struct async_state { #define T_DISABLE_INTERNAL_REPLY (1<<13) /* don't send internal negative reply */ #define T_ADMIN_REPLY (1<<14) /* t reply sent by admin (e.g., from cfg script) */ +#define T_ASYNC_SUSPENDED (1<<15) /* unsigned short should be enough for a retr. timer: max. 65535 ms => * max retr. = 65 s which should be enough and saves us 2*2 bytes */ diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 435686a..1d7e3ca 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -108,6 +108,7 @@ int t_suspend(struct sip_msg *msg, } else { LM_DBG("this is a suspend on reply - setting msg flag to SUSPEND\n"); msg->msg_flags |= FL_RPL_SUSPENDED; + t->flags |= T_ASYNC_SUSPENDED; /* this is a reply suspend find which branch */ if (t_check( msg , &branch )==-1){ diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 5b92055..54bcc78 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -298,6 +298,7 @@ static int t_any_timeout(struct sip_msg* msg, char*, char*); static int t_any_replied(struct sip_msg* msg, char*, char*); static int w_t_is_canceled(struct sip_msg* msg, char*, char*); static int t_is_expired(struct sip_msg* msg, char*, char*); +static int w_t_is_retr_async_reply(struct sip_msg* msg, char*, char*); static int t_grep_status(struct sip_msg* msg, char*, char*); static int w_t_drop_replies(struct sip_msg* msg, char* foo, char* bar); static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar); @@ -472,6 +473,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_is_canceled", w_t_is_canceled, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + {"t_is_retr_async_reply", w_t_is_retr_async_reply, 0, 0, + TM_ONREPLY_ROUTE}, {"t_is_expired", t_is_expired, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_grep_status", t_grep_status, 1, fixup_var_int_1, @@ -1950,6 +1953,29 @@ static int w_t_is_canceled(struct sip_msg* msg, char* foo, char* bar) return t_is_canceled(msg); } +/* script function, returns: 1 if the transaction is currently suspended, -1 if not */ +int t_is_retr_async_reply(struct sip_msg* msg) +{ + struct cell *t; + int ret; + + if (t_check( msg , 0 )==-1) return -1; + t=get_t(); + if ((t==0) || (t==T_UNDEFINED)){ + LOG(L_ERR, "ERROR: t_is_retr_async_reply: cannot check a message " + "for which no T-state has been established\n"); + ret=-1; + }else{ + LOG(L_DBG, "TRANSACTION FLAGS IS %d\n", t->flags); + ret=(t->flags & T_ASYNC_SUSPENDED)?1:-1; + } + return ret; +} +static int w_t_is_retr_async_reply(struct sip_msg* msg, char* foo, char* bar) +{ + return t_is_retr_async_reply(msg); +} + /* script function, returns: 1 if the transaction lifetime interval has already elapsed, -1 if not */ int t_is_expired(struct sip_msg* msg, char* foo, char* bar) {

10 years, 2 months

git:master: modules/db_mysql: added parameter to change affected rows value for UPDATE queries

by Jason Penton

Module: sip-router Branch: master Commit: bb30c83e4ed3594852c6251558b4c441bb5b6e19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb30c83… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 9 17:02:57 2014 +0200 modules/db_mysql: added parameter to change affected rows value for UPDATE queries - enabled will return the number of matched/foudn rows as opposed to the number of updated rows --- modules/db_mysql/doc/db_mysql_admin.xml | 19 +++++++++++++++++++ modules/db_mysql/km_db_mysql.c | 1 + modules/db_mysql/km_db_mysql.h | 1 + modules/db_mysql/km_my_con.c | 9 +++++++-- modules/db_mysql/mysql_mod.c | 1 + 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/modules/db_mysql/doc/db_mysql_admin.xml b/modules/db_mysql/doc/db_mysql_admin.xml index 738c464..fdc1a5c 100644 --- a/modules/db_mysql/doc/db_mysql_admin.xml +++ b/modules/db_mysql/doc/db_mysql_admin.xml @@ -141,6 +141,25 @@ modparam("db_mysql", "insert_delayed", 1) </programlisting> </example> </section> + <section id="db_mysql.p.update_affected_found"> + <title><varname>update_affected_found</varname> (integer)</title> + <para> + If set to 1, all UPDATE SQL queries will return the number of matched rows instead of the number of "updated" rows. + </para> + <para> + <emphasis> + Default value is 0 (1 - on / 0 - off). + </emphasis> + </para> + <example> + <title>Set <varname>update_affected_found</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "update_affected_found", 1) +... +</programlisting> + </example> + </section> </section> <section> <title>Functions</title> diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index ab39ff0..d360650 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -51,6 +51,7 @@ unsigned int db_mysql_timeout_interval = 2; /* Default is 6 seconds */ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ unsigned int db_mysql_insert_all_delayed = 0; /* Default is off */ +unsigned int db_mysql_update_affected_found = 0; /* Default is off */ /* MODULE_VERSION */ diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index f817765..cb51b55 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -43,6 +43,7 @@ extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; extern unsigned int db_mysql_insert_all_delayed; +extern unsigned int db_mysql_update_affected_found; int db_mysql_bind_api(db_func_t *dbb); diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index 4d29c6c..d0338a4 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -44,6 +44,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) { struct my_con* ptr; char *host, *grp; + unsigned int connection_flag = 0; if (!id) { LM_ERR("invalid parameter value\n"); @@ -99,12 +100,16 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const char *)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); + if (db_mysql_update_affected_found) { + connection_flag |= CLIENT_FOUND_ROWS; + } + #if (MYSQL_VERSION_ID >= 40100) if (!mysql_real_connect(ptr->con, host, id->username, id->password, - id->database, id->port, 0, CLIENT_MULTI_STATEMENTS)) { + id->database, id->port, 0, connection_flag|CLIENT_MULTI_STATEMENTS)) { #else if (!mysql_real_connect(ptr->con, host, id->username, id->password, - id->database, id->port, 0, 0)) { + id->database, id->port, 0, connection_flag)) { #endif LM_ERR("driver error: %s\n", mysql_error(ptr->con)); /* increase error counter */ diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 8d369c7..664f258 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -109,6 +109,7 @@ static param_export_t params[] = { {"timeout_interval", INT_PARAM, &db_mysql_timeout_interval}, {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, + {"update_affected_found", INT_PARAM, &db_mysql_update_affected_found}, {0, 0, 0} };

10 years, 2 months

[tracker] Task closed: xavp_insert can corrupt linked list pointers

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#477 - xavp_insert can corrupt linked list pointers User who did this - Hugh Waite (hugh.waite) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=477 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, 2 months

[tracker] Comment added: xavp_insert can corrupt linked list pointers

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#477 - xavp_insert can corrupt linked list pointers User who did this - Hugh Waite (hugh.waite) ---------- Patch applied to master, 4.2 and 4.1 http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1828c8a… ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=477#comment1660 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, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014