sr-dev November 2012

sr-dev@lists.kamailio.org

28 participants
123 discussions

git:master: core: handle '\r' as end of included file name
by Daniel-Constantin Mierla 19 Nov '12

19 Nov '12

Module: sip-router Branch: master Commit: dc0bc9de9528e80cd8bc61201ce82db1a785baf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc0bc9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 19 10:45:41 2012 +0100 core: handle '\r' as end of included file name - reported by Pirjo Ahvenainen --- cfg.lex | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg.lex b/cfg.lex index b0f4733..d864d42 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1341,7 +1341,7 @@ IMPORTFILE "import_file" <SELECT>. { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */ <INCLF>[ \t]* /* eat the whitespace */ -<INCLF>[^ \t\n]+ { /* get the include file name */ +<INCLF>[^ \t\r\n]+ { /* get the include file name */ memset(&s_buf, 0, sizeof(s_buf)); addstr(&s_buf, yytext, yyleng); r = pp_subst_run(&s_buf.s); @@ -1355,7 +1355,7 @@ IMPORTFILE "import_file" } <IMPTF>[ \t]* /* eat the whitespace */ -<IMPTF>[^ \t\n]+ { /* get the import file name */ +<IMPTF>[^ \t\r\n]+ { /* get the import file name */ memset(&s_buf, 0, sizeof(s_buf)); addstr(&s_buf, yytext, yyleng); r = pp_subst_run(&s_buf.s);

1 0

git:3.2: modules_k/db_sqlite: fix crash with computed fields in custom queries
by Timo Teras 19 Nov '12

19 Nov '12

Module: sip-router Branch: 3.2 Commit: 4d674b9715873d06f3856215a6da3f5594b30f73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d674b9… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu Nov 15 16:11:41 2012 +0200 modules_k/db_sqlite: fix crash with computed fields in custom queries Computed fields do not have decltype available, so guess the proper field type based on the result type of the first row. This does not work if the first row has null type as result, but is the best we can do easily and fixes gives right result in most cases. Reported-by: Pedro Antonio Vico Solano <pvsolano(a)amper.es> (cherry picked from commit 09205865f98136e0354539f09f4961ca016a915b) --- modules_k/db_sqlite/dbase.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index d5dc058..f88ce7a 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -265,6 +265,24 @@ static int decltype_to_dbtype(const char *decltype) return DB1_INT; } +static int type_to_dbtype(int type) +{ + switch (type) { + case SQLITE_INTEGER: + return DB1_INT; + case SQLITE_FLOAT: + return DB1_DOUBLE; + case SQLITE_TEXT: + return DB1_STR; + case SQLITE_BLOB: + return DB1_BLOB; + default: + /* Unknown, or NULL column value. Assume this is a + * string. */ + return DB1_STR; + } +} + static str* str_dup(const char *_s) { str *s; @@ -325,10 +343,18 @@ int db_sqlite_store_result(const db1_con_t* _h, db1_res_t** _r) RES_COL_N(res) = rc; for (i = 0; i < RES_COL_N(res); i++) { + const char *decltype; + int dbtype; + RES_NAMES(res)[i] = str_dup(sqlite3_column_name(conn->stmt, i)); if (RES_NAMES(res)[i] == NULL) goto no_mem; - RES_TYPES(res)[i] = decltype_to_dbtype(sqlite3_column_decltype(conn->stmt, i)); + decltype = sqlite3_column_decltype(conn->stmt, i); + if (decltype != NULL) + dbtype = decltype_to_dbtype(decltype); + else + dbtype = type_to_dbtype(sqlite3_column_type(conn->stmt, i)); + RES_TYPES(res)[i] = dbtype; } } if (num_rows >= num_alloc) {

1 0

git:3.2: modules_k/db_sqlite: fix memory leak in sqlops query
by Timo Teras 19 Nov '12

19 Nov '12

Module: sip-router Branch: 3.2 Commit: 98197e56b283e24570eb71d7418b5ec6491cef62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98197e5… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Wed Oct 17 09:00:14 2012 +0300 modules_k/db_sqlite: fix memory leak in sqlops query Seems that most other database drivers release the database resource only at free_result time, which I some how missed. Since we are doing a deep copy in store_result(), we can just release the sqlite resources immediately raw_query(). Reported-by: Pedro Antonio Vico Solano <pvsolano(a)amper.es> (cherry picked from commit ecf95eb0ada8bfacb93af7b82f39347c841229e4) --- modules_k/db_sqlite/dbase.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index 67db13b..d5dc058 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -520,7 +520,12 @@ int db_sqlite_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, int db_sqlite_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) { - return db_do_raw_query(_h, _s, _r, + int rc; + + rc = db_do_raw_query(_h, _s, _r, db_sqlite_submit_query, db_sqlite_store_result); + db_sqlite_cleanup_query(_h); + + return rc; }

1 0

git:3.3: modules_k/db_sqlite: fix crash with computed fields in custom queries
by Timo Teras 19 Nov '12

19 Nov '12

Module: sip-router Branch: 3.3 Commit: bab07e07858464d50d310bbb52431a0b171ee771 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bab07e0… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu Nov 15 16:11:41 2012 +0200 modules_k/db_sqlite: fix crash with computed fields in custom queries Computed fields do not have decltype available, so guess the proper field type based on the result type of the first row. This does not work if the first row has null type as result, but is the best we can do easily and fixes gives right result in most cases. Reported-by: Pedro Antonio Vico Solano <pvsolano(a)amper.es> (cherry picked from commit 09205865f98136e0354539f09f4961ca016a915b) --- modules_k/db_sqlite/dbase.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index c1d3b71..c4df4ce 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -288,6 +288,24 @@ static int decltype_to_dbtype(const char *decltype) return DB1_INT; } +static int type_to_dbtype(int type) +{ + switch (type) { + case SQLITE_INTEGER: + return DB1_INT; + case SQLITE_FLOAT: + return DB1_DOUBLE; + case SQLITE_TEXT: + return DB1_STR; + case SQLITE_BLOB: + return DB1_BLOB; + default: + /* Unknown, or NULL column value. Assume this is a + * string. */ + return DB1_STR; + } +} + static str* str_dup(const char *_s) { str *s; @@ -348,10 +366,18 @@ int db_sqlite_store_result(const db1_con_t* _h, db1_res_t** _r) RES_COL_N(res) = rc; for (i = 0; i < RES_COL_N(res); i++) { + const char *decltype; + int dbtype; + RES_NAMES(res)[i] = str_dup(sqlite3_column_name(conn->stmt, i)); if (RES_NAMES(res)[i] == NULL) goto no_mem; - RES_TYPES(res)[i] = decltype_to_dbtype(sqlite3_column_decltype(conn->stmt, i)); + decltype = sqlite3_column_decltype(conn->stmt, i); + if (decltype != NULL) + dbtype = decltype_to_dbtype(decltype); + else + dbtype = type_to_dbtype(sqlite3_column_type(conn->stmt, i)); + RES_TYPES(res)[i] = dbtype; } } if (num_rows >= num_alloc) {

1 0

git:3.3: modules_k/db_sqlite: fix memory leak in sqlops query
by Timo Teras 19 Nov '12

19 Nov '12

Module: sip-router Branch: 3.3 Commit: 8198f2dcc92127bc15ac13f71372f016b8c982d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8198f2d… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Wed Oct 17 09:00:14 2012 +0300 modules_k/db_sqlite: fix memory leak in sqlops query Seems that most other database drivers release the database resource only at free_result time, which I some how missed. Since we are doing a deep copy in store_result(), we can just release the sqlite resources immediately raw_query(). Reported-by: Pedro Antonio Vico Solano <pvsolano(a)amper.es> (cherry picked from commit ecf95eb0ada8bfacb93af7b82f39347c841229e4) --- modules_k/db_sqlite/dbase.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index 0b32e07..c1d3b71 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -543,7 +543,12 @@ int db_sqlite_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, int db_sqlite_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) { - return db_do_raw_query(_h, _s, _r, + int rc; + + rc = db_do_raw_query(_h, _s, _r, db_sqlite_submit_query, db_sqlite_store_result); + db_sqlite_cleanup_query(_h); + + return rc; }

1 0

[tracker] Comment added: uacreg functionality: kamailio sending zeroes in header
by sip-router 19 Nov '12

19 Nov '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#254 - uacreg functionality: kamailio sending zeroes in header User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you paste here the parameters for uac module and the sample database record to try to reproduce? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=254#comment749 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: uacreg functionality: kamailio sending zeroes in header
by sip-router 19 Nov '12

19 Nov '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Rus (Sfinx) Attached to Project - sip-router Summary - uacreg functionality: kamailio sending zeroes in header Task Type - Bug Report Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Current kamailio.git, module uac, uacreg functionality not working, seeing in tcpdump : ........ 00:50:38.312534 IP (tos 0x0, ttl 57, id 3428, offset 0, flags [none], proto UDP (17), length 441) 8X.XXX.XXX.XX.5060 > 7X.XX.XXX.XXX.5060: SIP, length: 413 REGISTER sip:demo.host.com SIP/2.0 Via: SIP/\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0 x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x 00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x0 0\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00 \0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00 .... Here we can see that register header starts as normal, but suddenly filled with zeroes by kamailio till the packet end. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=254 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: uacreg sending zeroes in header
by rus＠sfinxsoft.com 18 Nov '12

18 Nov '12

Hello, Inserted record to uacreg table, started kamailio and seeing this with tcpdump : 00:50:38.312534 IP (tos 0x0, ttl 57, id 3428, offset 0, flags [none], proto UDP (17), length 441) 8X.XXX.XXX.XX.5060 > 7X.XX.XXX.XXX.5060: SIP, length: 413 REGISTER sip:demo.host.com SIP/2.0 Via: SIP/\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00 .... As you can see - register header starts as normal, but suddenly filled with zeroes by kamailio till the packet end. What can be the problem ? Tried to define UAC_OLD_AUTH in uac_reg.c with no effect. Seems like uacreg logic is broken in git. Rus

1 0

git:master: pkg/kamailio/(centos|fedora): turned on MEMDBG for development builds
by Peter Dunkley 17 Nov '12

17 Nov '12

Module: sip-router Branch: master Commit: ddfeee6a0c0145d52f42e79cffe71b7cee1750e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddfeee6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Nov 17 00:12:04 2012 +0000 pkg/kamailio/(centos|fedora): turned on MEMDBG for development builds --- pkg/kamailio/fedora/16/kamailio.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index c365c06..3f342b0 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 3.4.0 -%define rel dev5%{dist} +%define rel dev5.1%{dist} @@ -358,7 +358,7 @@ Max Mind GeoIP real-time query support for Kamailio. %build make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$RPM_BUILD_ROOT\ basedir=$RPM_BUILD_ROOT cfg_target=/%{_sysconfdir}/kamailio/\ - modules_dirs="modules modules_k" SCTP=1 STUN=1 + modules_dirs="modules modules_k" SCTP=1 STUN=1 MEMDBG=1 make %if 0%{?fedora} make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\

1 0

git:master: Fixing typo
by Olle E. Johansson 16 Nov '12

16 Nov '12

Module: sip-router Branch: master Commit: 5dfde0036ec5d954b451a811654617a82e10e82d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5dfde00… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri Nov 16 16:21:02 2012 +0100 Fixing typo --- modules/xmlrpc/README | 6 +++--- modules/xmlrpc/doc/params.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/xmlrpc/README b/modules/xmlrpc/README index 81dcf13..7c049a2 100644 --- a/modules/xmlrpc/README +++ b/modules/xmlrpc/README @@ -2,7 +2,7 @@ Jan Janak iptelorg GmbH - Copyright © 2005 iptelorg GmbH + Copyright � 2005 iptelorg GmbH __________________________________________________________________ 1.1. Design Goals @@ -408,7 +408,7 @@ Content-Length: 276 1.3.3. Type Conversion The data types of the RPC API are converted to the data types of - XML-RPC and vice versa. Table 1, “Data Type Conversion” shows for each + XML-RPC and vice versa. Table 1, "Data Type Conversion" shows for each RPC API data type corresponding XML-RPC data type. Table 1. Data Type Conversion @@ -589,7 +589,7 @@ modparam("xmlrpc", "url_skip", "^/sip") 1.5.7. url_match (str) - Regular expression to match the HTPP URL. If there is no match, then + Regular expression to match the HTTP URL. If there is no match, then xmlrpc route is not executed. This check is done after url_skip, so if both url_skip and url_match would match then the xmlrpc route is not executed (url_skip has higher priority). diff --git a/modules/xmlrpc/doc/params.xml b/modules/xmlrpc/doc/params.xml index 6433d13..ac07751 100644 --- a/modules/xmlrpc/doc/params.xml +++ b/modules/xmlrpc/doc/params.xml @@ -151,7 +151,7 @@ modparam("xmlrpc", "url_skip", "^/sip") <section> <title><varname>url_match</varname> (str)</title> <para> - Regular expression to match the HTPP URL. If there is no match, + Regular expression to match the HTTP URL. If there is no match, then xmlrpc route is not executed. This check is done after url_skip, so if both url_skip and url_match would match then the xmlrpc route is not executed (url_skip has higher priority).

1 0

← Newer
1
...
5
6
7
8
9
10
11
12
13
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2012