sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

[tracker] Comment added: Crash in msrp module
by sip-router 16 Apr '14

16 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#419 - Crash in msrp module User who did this - Luis Martin (lmartin) ---------- Patch: http://lists.sip-router.org/pipermail/sr-dev/2014-April/023695.html ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=419#comment1387 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] User took ownership: Crash in msrp module
by sip-router 16 Apr '14

16 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Luis Martin has taken ownership of the following task: FS#419 - Crash in msrp module More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=419 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 in msrp module
by sip-router 16 Apr '14

16 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Luis Martin (lmartin) Attached to Project - sip-router Summary - Crash in msrp module Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - When a non-rfc compliant MSRP message is received Kamailio crashes. MSRP message used to trigger (notice From-Path before To-Path): MSRP 253291932 SEND From-Path: msrp://64.58.53.27:5823/9000001399;tcp To-Path: msrp://66.170.58.133:9000/0;tcp msrp://dz3prq5k.invalid:9000/a520utdsm7;ws Message-ID: T00000577C253291932 Byte-Range: 1-14/14 Content-Type: text/plain Test -------253291932$ This makes the Kamailio msrp parser to properly allow this even though it's not fully rfc4975 compliant: (check MSRP RFC grammar) headers = To-Path CRLF From-Path CRLF 1*( header CRLF ) To-Path = "To-Path:" SP MSRP-URI *( SP MSRP-URI ) From-Path = "From-Path:" SP MSRP-URI *( SP MSRP-URI ) (...) And makes the 'msrp_netio' to crash. (https://github.com/kamailio/kamailio/blob/master/modules/msrp/msrp_netio.c#…) memcpy(p, mf->buf.s, tpath->body.s - mf->buf.s); p += tpath->body.s - mf->buf.s; memcpy(p, l + 1, fpath->body.s - l - 1); p += fpath->body.s - l - 1; memcpy(p, tpath->body.s, l + 1 - tpath->body.s); p += l + 1 - tpath->body.s; memcpy(p, fpath->name.s + 11, mf->buf.s + mf->buf.len - fpath->name.s - 11); p += mf->buf.s + mf->buf.len - fpath->name.s - 11; Solution adopted is to make more the parser more robust, check luismartingil/msrp_crash branch in git Kamailio repo. Thanks, Luis Martin Gil More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=419 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

git:luismartingil/msrp_crash: msrp: improved parser
by Luis Martin Gil 16 Apr '14

16 Apr '14

Module: sip-router Branch: luismartingil/msrp_crash Commit: 23ad1fb98941507338edba7136327896033ed18f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23ad1fb… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Wed Apr 16 14:55:35 2014 +0000 msrp: improved parser - msrp parser patched so Kamailio doesn't crash when receiving non-rfc4975 compliant msrp messages --- modules/msrp/msrp_parser.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index d7a2ced..8df1a92 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -81,7 +81,7 @@ int msrp_parse_frame(msrp_frame_t *mf) } if(msrp_parse_headers(mf)<0) { - LM_ERR("unable to parse first line\n"); + LM_ERR("unable to parse headers\n"); return -1; } return 0; @@ -221,6 +221,10 @@ int msrp_parse_headers(msrp_frame_t *mf) msrp_hdr_t *hdr; msrp_hdr_t *last; + int fpath = 0; /* From path set */ + int tpath = 0; /* To path set */ + int any = 0; /* Any header set */ + /* already parsed?!? */ if(mf->headers != NULL) return 0; @@ -291,12 +295,37 @@ int msrp_parse_headers(msrp_frame_t *mf) } msrp_hdr_set_type(hdr); + if (hdr->htype == MSRP_HDR_TO_PATH) { + tpath = 1; + if (fpath || any) { + LM_ERR("broken msrp frame message, To-Path must be the first header.\n"); + return -1; + } + } else if (hdr->htype == MSRP_HDR_FROM_PATH) { + fpath = 1; + if (!tpath || any) { + LM_ERR("broken msrp frame message, From-Path must be the second header.\n"); + return -1; + } + } else { + any = 1; + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n"); + return -1; + } + } + LM_DBG("MSRP Header: (%p) [%.*s] [%d] [%.*s]\n", hdr, hdr->name.len, hdr->name.s, hdr->htype, hdr->body.len, hdr->body.s); s = l + 1; } + if (!tpath || !fpath) { + LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n"); + return -1; + } + ateoh: if(mf->mbody.s!=NULL) {

1 0

git:master: modules/acc: insert_mode readme enhancements
by Juha Heinanen 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: a11a1f4ebce11368eef01824913e9ff115042a28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a11a1f4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 16 15:32:05 2014 +0300 modules/acc: insert_mode readme enhancements --- modules/acc/README | 77 +++++++++++++++++++++-------------------- modules/acc/doc/acc_admin.xml | 4 +- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/modules/acc/README b/modules/acc/README index bf53f25..ea72fd6 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -29,11 +29,11 @@ Sven Knoblich 1&1 Internet AG <sven.knoblich(a)1und1.de> - Copyright � 2002, 2003 FhG FOKUS + Copyright (c) 2002, 2003 FhG FOKUS - Copyright � 2004, 2006 Voice Sistem SRL + Copyright (c) 2004, 2006 Voice Sistem SRL - Copyright � 2011 1&1 Internet AG + Copyright (c) 2011 1&1 Internet AG Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -1114,9 +1114,10 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") tables are defined with different type (e.g., MyISAM). If set to 2, async insert is used if the db driver module has support - for it. If not, then standard INSERT is used. + for it and if async_workers core parameter value is greater than 0. If + not, then standard INSERT is used. - Default value is 0 (no INSERT DELAYED). + Default value is 0 (no INSERT DELAYED nor async insert). Example 1.32. db_insert_mode example ... @@ -1356,7 +1357,7 @@ modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S") 7.3. acc_rad_request(comment) 7.4. acc_diam_request(comment) -7.1. acc_log_request(comment) +7.1. acc_log_request(comment) acc_request reports on a request, for example, it can be used to report on missed calls to off-line users who are replied 404 - Not Found. To @@ -1377,7 +1378,7 @@ $avp(reason) = "Not found"; acc_log_request("$var(code) Error: $avp(reason)"); ... -7.2. acc_db_request(comment, table) +7.2. acc_db_request(comment, table) Like acc_log_request, acc_db_request reports on a request. The report is sent to database at "db_url", in the table referred to in the second @@ -1398,7 +1399,7 @@ acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); ... -7.3. acc_rad_request(comment) +7.3. acc_rad_request(comment) Like acc_log_request, acc_rad_request reports on a request. It reports to radius server as configured in "radius_config". @@ -1415,7 +1416,7 @@ acc_rad_request("Some comment"); acc_rad_request("$var(code) Error: $avp(reason)"); ... -7.4. acc_diam_request(comment) +7.4. acc_diam_request(comment) Like acc_log_request, acc_diam_request reports on a request. It reports to the configured Diameter server. @@ -1443,55 +1444,55 @@ Chapter 2. Frequently Asked Questions 2.1. - What happend with old log_fmt parameter + What happend with old log_fmt parameter - The parameter became obsolete with the restructure of the data logged - by ACC module (refer to the Overview chapter). For similar behaviour - you can use the extra accouting (see the coresponding chapter). + The parameter became obsolete with the restructure of the data logged + by ACC module (refer to the Overview chapter). For similar behaviour + you can use the extra accouting (see the coresponding chapter). 2.2. - What happend with old multi_leg_enabled parameter + What happend with old multi_leg_enabled parameter - The parameter becaome obsolete by the addition of the new - multi_leg_info parameter. The multi-leg accouting is automatically - enabled when multi_leg_info is defined. + The parameter becaome obsolete by the addition of the new + multi_leg_info parameter. The multi-leg accouting is automatically + enabled when multi_leg_info is defined. 2.3. - What happend with old src_leg_avp_id and dst_leg_avp_id parameters + What happend with old src_leg_avp_id and dst_leg_avp_id parameters - The parameter was replaced by the more generic new parameter - multi_leg_info. This allows logging (per-leg) of more information than - just dst and src. + The parameter was replaced by the more generic new parameter + multi_leg_info. This allows logging (per-leg) of more information than + just dst and src. 2.4. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at http://www.kamailio.org/. + Take a look at http://www.kamailio.org/. 2.5. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.sip-router.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.sip-router.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.sip-router.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.sip-router.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.sip-router.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.sip-router.org>. 2.6. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - http://sip-router.org/tracker. + Please follow the guidelines provided at: + http://sip-router.org/tracker. diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 8b5ee60..54b9517 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1099,10 +1099,10 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") </para> <para> If set to 2, async insert is used if the db driver module has - support for it. If not, then standard INSERT is used. + support for it and if async_workers core parameter value is greater than 0. If not, then standard INSERT is used. </para> <para> - Default value is 0 (no INSERT DELAYED). + Default value is 0 (no INSERT DELAYED nor async insert). </para> <example> <title>db_insert_mode example</title>

1 0

acc db_insert_mode=2 asks for DELAYED option
by Juha Heinanen 16 Apr '14

16 Apr '14

i tried new acc db_insert_mode=2 by defining in config: modparam("acc", "db_insert_mode", 2) and here is what i got to syslog: Apr 16 14:14:41 siika /usr/sbin/sip-proxy[30122]: ERROR: db_mysql [km_dbase.c:123]: db_mysql_submit_query(): driver error on query: DELAYED option not supported for table 'accounting' Apr 16 14:14:41 siika /usr/sbin/sip-proxy[30122]: ERROR: db_mysql [km_dbase.c:145]: db_mysql_async_exec_task(): failed to execute query on async worker as per my question and daniel's reply, this mode has nothing to do with DELAYED option. -- juha

2 2

git:master: db_mysql: fixed c&p error for insert_async operation
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: 3f84ebbb5504831483248e5b58b3ecd60368b3aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f84ebb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 16 13:31:20 2014 +0200 db_mysql: fixed c&p error for insert_async operation - reported by Juha Heinanen --- modules/db_mysql/km_dbase.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 46efdd4..7beaf91 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -848,7 +848,7 @@ int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_va */ int db_mysql_insert_async(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) { - return db_do_insert_delayed(_h, _k, _v, _n, db_mysql_val2str, + return db_do_insert(_h, _k, _v, _n, db_mysql_val2str, db_mysql_submit_query_async); }

1 0

git:master: acc: extended documentation for db_insert_mode parameter
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: c92ec42ac07a4a000a95dcd1f3c1a349ce35ea82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c92ec42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 22:37:02 2014 +0200 acc: extended documentation for db_insert_mode parameter - if set to 2, async insert operation is used to store the acc record in database table --- modules/acc/README | 3 +++ modules/acc/doc/acc_admin.xml | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/acc/README b/modules/acc/README index da2df70..bf53f25 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -1113,6 +1113,9 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") InnoDB engine doesn't support INSERT DELAYED, thus be sure the acc tables are defined with different type (e.g., MyISAM). + If set to 2, async insert is used if the db driver module has support + for it. If not, then standard INSERT is used. + Default value is 0 (no INSERT DELAYED). Example 1.32. db_insert_mode example diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index c59aa0e..8b5ee60 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1098,6 +1098,10 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") the acc tables are defined with different type (e.g., MyISAM). </para> <para> + If set to 2, async insert is used if the db driver module has + support for it. If not, then standard INSERT is used. + </para> + <para> Default value is 0 (no INSERT DELAYED). </para> <example>

2 4

sqlops compiler warnings
by Juha Heinanen 16 Apr '14

16 Apr '14

on debian wheezy: CC (cc) [M sqlops.so] sql_api.o sql_api.c: In function 'sql_do_query_async': sql_api.c:422:6: warning: unused variable 'sv' [-Wunused-variable] sql_api.c:421:9: warning: unused variable 'j' [-Wunused-variable] sql_api.c:421:6: warning: unused variable 'i' [-Wunused-variable] sql_api.c:420:13: warning: unused variable 'db_res' [-Wunused-variable] -- juha

2 1

git:master: sqlops: removed unused variables in sql_do_query_async()
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: bbcc447c6bd5e01cae5932fa11cbaceccef5a389 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbcc447… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 16 12:38:13 2014 +0200 sqlops: removed unused variables in sql_do_query_async() - reported by Juha Heinanen --- modules/sqlops/sql_api.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index 0202bc5..6ad803f 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -417,10 +417,6 @@ error: int sql_do_query_async(sql_con_t *con, str *query) { - db1_res_t* db_res = NULL; - int i, j; - str sv; - if(query==NULL) { LM_ERR("bad parameters\n");

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014