sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

troubles configuring acc.so without db_url
by Francesco Castellano 12 Apr '11

12 Apr '11

Hi all, I was trying to use Kamailio 3.1.3 with acc module, but without DB backend (syslog only). Unfortunately kamailio segfaulted after receiving a NATed REGISTER (flagged in my script with the first pos "0"). If I understood correctly, the trouble lies with some misbehaviour with the acc parameters initializations, namely, even if I remove the modparam with db_url, and set db_flag and db_missed_flag to -1, the mod_init() function in modules_k/acc/acc_mod.c, reset the flags to "0", because in its opinion db_url.s was not NULL. Unfortunately I'm not confident with the config file parsing through yacc, so I'm not sure where the problem actually is. So, I tried a workaround specifying a "null" db_url (as I supposed to be the default, reading the docs; and actually the value I found in modules_k/acc/acc_mod.c): modparam("acc", "db_url", 0) or modparam("acc", "db_url", "") or modparam("acc", "db_url", "NULL") but, understandably, they don't work. Is there a way to specify a null value for a modparam in the config file? In the meanwhile I set the db_url to a valid value, created a valid table `acc`, and used a flag that I never use in my script, but I know it could be done better. For example, maybe mod_init can reset db_flag and db_missed_flag to an invalid value (-1?) when it find NULL the db_url variable (using a valid flag, as 0, may lead to unexpected behaviour; or I've not got what a valid flag is? In this case, I'm sorry). Secondarily mod_init could check for the zero-length too, supposing that no valid db_url can be zero-length. Finally, and more importantly, do you have any idea about the reason for which the config parser can see a default value for db_url (for acc), different from the one in modules_k/acc/acc_mod.c (specifically, it takes a valid db_url used by other modules)? Thank you, Best regards, Francesco Castellano

2 3

git:3.1: acc_radius(k): usage flags for acc_rad_request() set to ANY_ROUTE
by Daniel-Constantin Mierla 12 Apr '11

12 Apr '11

Module: sip-router Branch: 3.1 Commit: d2fe333c9429cf1183a7e8ce27c578f445db929b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2fe333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 12 10:22:15 2011 +0200 acc_radius(k): usage flags for acc_rad_request() set to ANY_ROUTE - they were forgotten as the main acc module has this type of flags for acc request functions (cherry picked from commit 5673f5cd5a50714b4a9c770294723caba15a995e) --- modules_k/acc_radius/acc_radius_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/acc_radius/acc_radius_mod.c b/modules_k/acc_radius/acc_radius_mod.c index 31b413b..fdeb869 100644 --- a/modules_k/acc_radius/acc_radius_mod.c +++ b/modules_k/acc_radius/acc_radius_mod.c @@ -88,7 +88,7 @@ acc_extra_t *rad_extra = 0; static cmd_export_t cmds[] = { {"acc_rad_request", (cmd_function)w_acc_radius_request, 1, acc_api_fixup, free_acc_api_fixup, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:3.1: acc(k): safety check for empty db_url
by Daniel-Constantin Mierla 12 Apr '11

12 Apr '11

Module: sip-router Branch: 3.1 Commit: 8464b29cbffb17b810cc7f3f4f459e754bc0e4ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8464b29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 12 10:19:38 2011 +0200 acc(k): safety check for empty db_url - if db_url is provided as empty string, disable db accounting - if db_url is not provided, db acc flags are set to -1 instead of 0 to avoid conflict with usage in config of flag 0 - reported by Francesco Castellano (cherry picked from commit de2015d507cdd40502160070a096aa3fb6754f55) --- modules_k/acc/acc_mod.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index ee9336e..cd7b8f4 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -360,8 +360,13 @@ static int mod_init( void ) return -1; #ifdef SQL_ACC - if (db_url.s) + if (db_url.s) { db_url.len = strlen(db_url.s); + if(db_url.len<=0) { + db_url.s = NULL; + db_url.len = 0; + } + } db_table_acc.len = strlen(db_table_acc.s); db_table_mc.len = strlen(db_table_mc.s); acc_method_col.len = strlen(acc_method_col.s); @@ -471,8 +476,10 @@ static int mod_init( void ) return -1; } } else { - db_flag = 0; - db_missed_flag = 0; + db_url.s = NULL; + db_url.len = 0; + db_flag = -1; + db_missed_flag = -1; } #endif @@ -503,8 +510,8 @@ static int mod_init( void ) } } else { radius_config = 0; - radius_flag = 0; - radius_missed_flag = 0; + radius_flag = -1; + radius_missed_flag = -1; } #endif

1 0

git:master: acc_radius(k): usage flags for acc_rad_request() set to ANY_ROUTE
by Daniel-Constantin Mierla 12 Apr '11

12 Apr '11

Module: sip-router Branch: master Commit: 5673f5cd5a50714b4a9c770294723caba15a995e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5673f5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 12 10:22:15 2011 +0200 acc_radius(k): usage flags for acc_rad_request() set to ANY_ROUTE - they were forgotten as the main acc module has this type of flags for acc request functions --- modules_k/acc_radius/acc_radius_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/acc_radius/acc_radius_mod.c b/modules_k/acc_radius/acc_radius_mod.c index 31b413b..fdeb869 100644 --- a/modules_k/acc_radius/acc_radius_mod.c +++ b/modules_k/acc_radius/acc_radius_mod.c @@ -88,7 +88,7 @@ acc_extra_t *rad_extra = 0; static cmd_export_t cmds[] = { {"acc_rad_request", (cmd_function)w_acc_radius_request, 1, acc_api_fixup, free_acc_api_fixup, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master: acc(k): safety check for empty db_url
by Daniel-Constantin Mierla 12 Apr '11

12 Apr '11

Module: sip-router Branch: master Commit: de2015d507cdd40502160070a096aa3fb6754f55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de2015d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 12 10:19:38 2011 +0200 acc(k): safety check for empty db_url - if db_url is provided as empty string, disable db accounting - if db_url is not provided, db acc flags are set to -1 instead of 0 to avoid conflict with usage in config of flag 0 - reported by Francesco Castellano --- modules_k/acc/acc_mod.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index cf767cd..a652c28 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -403,8 +403,13 @@ static int mod_init( void ) return -1; #ifdef SQL_ACC - if (db_url.s) + if (db_url.s) { db_url.len = strlen(db_url.s); + if(db_url.len<=0) { + db_url.s = NULL; + db_url.len = 0; + } + } db_table_acc.len = strlen(db_table_acc.s); db_table_mc.len = strlen(db_table_mc.s); acc_method_col.len = strlen(acc_method_col.s); @@ -523,8 +528,10 @@ static int mod_init( void ) return -1; } } else { - db_flag = 0; - db_missed_flag = 0; + db_url.s = NULL; + db_url.len = 0; + db_flag = -1; + db_missed_flag = -1; } #endif @@ -555,8 +562,8 @@ static int mod_init( void ) } } else { radius_config = 0; - radius_flag = 0; - radius_missed_flag = 0; + radius_flag = -1; + radius_missed_flag = -1; } #endif

1 0

git:3.1: srdb1: reset prev_token for safer free on error
by Daniel-Constantin Mierla 11 Apr '11

11 Apr '11

Module: sip-router Branch: 3.1 Commit: 9ec10a2249a8319384a143137bc67770445e2467 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ec10a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 11 23:52:38 2011 +0200 srdb1: reset prev_token for safer free on error - if parse_db_url() fails internally, prev_token can point to same memory chunk as one of the db id attributes, causing a double-free (cherry picked from commit 765c17f8c2ef79fd49ec2a74781b49a56aa47c3a) --- lib/srdb1/db_id.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index d7fcf02..1c9c4b5 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -162,12 +162,14 @@ static int parse_db_url(struct db_id* id, const str* url) case '@': st = ST_HOST; id->username = prev_token; + prev_token = 0; if (dupl_string(&id->password, begin, url->s + i) < 0) goto err; begin = url->s + i + 1; break; case '/': id->host = prev_token; + prev_token = 0; id->port = str2s(begin, url->s + i - begin, 0); if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; @@ -212,6 +214,7 @@ static int parse_db_url(struct db_id* id, const str* url) if (id->password) pkg_free(id->password); if (id->host) pkg_free(id->host); if (id->database) pkg_free(id->database); + memset(id, 0, sizeof(struct db_id)); if (prev_token) pkg_free(prev_token); return -1; }

1 0

git:master: srdb1: reset prev_token for safer free on error
by Daniel-Constantin Mierla 11 Apr '11

11 Apr '11

Module: sip-router Branch: master Commit: 765c17f8c2ef79fd49ec2a74781b49a56aa47c3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=765c17f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 11 23:52:38 2011 +0200 srdb1: reset prev_token for safer free on error - if parse_db_url() fails internally, prev_token can point to same memory chunk as one of the db id attributes, causing a double-free --- lib/srdb1/db_id.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 6b0bb66..8c8b2a3 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -162,12 +162,14 @@ static int parse_db_url(struct db_id* id, const str* url) case '@': st = ST_HOST; id->username = prev_token; + prev_token = 0; if (dupl_string(&id->password, begin, url->s + i) < 0) goto err; begin = url->s + i + 1; break; case '/': id->host = prev_token; + prev_token = 0; id->port = str2s(begin, url->s + i - begin, 0); if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; @@ -213,6 +215,7 @@ static int parse_db_url(struct db_id* id, const str* url) if (id->password) pkg_free(id->password); if (id->host) pkg_free(id->host); if (id->database) pkg_free(id->database); + memset(id, 0, sizeof(struct db_id)); if (prev_token) pkg_free(prev_token); end: return -1;

1 0

Possible bugs in nathelper
by Peter Dunkley 11 Apr '11

11 Apr '11

Hello, I think I have found two bugs in nathelper in Kamailio 3.1.3. Has anyone else encountered these? Bug one ------- nat_uac_test() doesn't seem to work for requests that arrive over UDP. I tried with the latest versions of X-Lite and Jitsi for Windows and observed the same behaviour with both. As far as I could tell the UDP and TCP REGISTER methods were identical except for transport, Call-ID, tags (and so on). At the moment I have worked around this by treating all UDP requests as if they have come from behind a NAT - but this is not ideal. Bug Two ------- nat_uac_test() with flag bit 8 (SDP checks) set fails with an error if the request does not contain SDP. I don't think this is correct behaviour as it seems quite sensible to me to push all requests through the same NAT detection route. In this case it is quite likely that only some of the methods will contain SDP. Surely in this case the correct thing would be for the SDP checks to fail, but not be treated as an error? Thanks for you help, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 5

git:master: handle all cases after auth_api.pre_auth call
by Michal Matyska 11 Apr '11

11 Apr '11

Module: sip-router Branch: master Commit: 87ee74902ef5c4a86fc3130a48ab783b1c605461 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87ee749… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Mon Apr 11 10:20:43 2011 -0500 handle all cases after auth_api.pre_auth call Added cases NO_CREDENTIALS, STALE_NONCE and NONCE_REUSED to the switch. This prevents segfault after uninitialized var is used in gen_ha1 when the code continues to check the credentials if there were none. --- modules_s/auth_db/authorize.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_s/auth_db/authorize.c b/modules_s/auth_db/authorize.c index da1d6b4..1d3add1 100644 --- a/modules_s/auth_db/authorize.c +++ b/modules_s/auth_db/authorize.c @@ -345,10 +345,14 @@ static inline int authenticate(struct sip_msg* msg, str* realm, authdb_table_inf ret = -2; goto end; + case STALE_NONCE: case NOT_AUTHENTICATED: + case NO_CREDENTIALS: ret = -1; goto end; + case NONCE_REUSED: + DBG("auth_db:authenticate: NONCE_REUSED\n"); case DO_AUTHENTICATION: break;

1 0

git:3.1: modules/ratelimit Timer was ran at a 1. 5 s interval instead of timer_interval, thus rendering TAILDROP alg unusable
by Marius Zbihlei 11 Apr '11

11 Apr '11

Module: sip-router Branch: 3.1 Commit: f027ca95a2a1818cd40e4ed6d4358a76d18252ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f027ca9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Apr 11 13:45:10 2011 +0300 modules/ratelimit Timer was ran at a 1.5 s interval instead of timer_interval, thus rendering TAILDROP alg unusable (cherry picked from commit 3a06d7d3561f889c84249eaa5ec7a5b79a2a23bd) --- modules/ratelimit/ratelimit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 628a486..53ff559 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -424,7 +424,7 @@ static int mod_init(void) return -1; } timer_init(rl_timer, rl_timer_handle, 0, F_TIMER_FAST); - timer_add(rl_timer, MS_TO_TICKS(1500)); /* Start it after 1500ms */ + timer_add(rl_timer, MS_TO_TICKS(1000*timer_interval)); network_load_value = shm_malloc(sizeof(int)); if (network_load_value==NULL) {

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
28
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 2011