sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: lib/kmi: use system malloc for MI operations
by Daniel-Constantin Mierla 09 Oct '11

09 Oct '11

Module: sip-router Branch: master Commit: 11bdc4ad80f653c208f60c200725eb81f28757b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11bdc4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 9 23:49:25 2011 +0200 lib/kmi: use system malloc for MI operations --- lib/kmi/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/kmi/Makefile b/lib/kmi/Makefile index a20f006..f9bfb1a 100644 --- a/lib/kmi/Makefile +++ b/lib/kmi/Makefile @@ -4,8 +4,9 @@ NAME:=kmi MAJOR_VER=1 MINOR_VER=0 BUGFIX_VER=0 -## uncomment next line for using system malloc with MI -#DEFS+= -DMI_SYSTEM_MALLOC +## comment next line for using internal pkg malloc with MI +## - when MI_SYSTEM_MALLOC is defined, OS malloc is used +DEFS+= -DMI_SYSTEM_MALLOC LIBS= include ../../Makefile.libs

1 0

[tracker] Task closed: crash/segfault on shutdown since commit 7b3a6ec
by sip-router 09 Oct '11

09 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#165 - crash/segfault on shutdown since commit 7b3a6ec User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Reopen if does not work with GIT commit 724a642d99becfe674a8af62b4d80a67a9097608 . More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=165 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:master: core: move exit salutation before killing children
by Daniel-Constantin Mierla 09 Oct '11

09 Oct '11

Module: sip-router Branch: master Commit: 724a642d99becfe674a8af62b4d80a67a9097608 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=724a642… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 9 12:16:13 2011 +0200 core: move exit salutation before killing children - syslog() is not re-entrant (see linux man page) and can cause troubles - some that could be related is reported by Alex Hermann, FS#165 --- main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index e2ad1f3..f80f88c 100644 --- a/main.c +++ b/main.c @@ -699,9 +699,9 @@ void handle_sigs() DBG("INT received, program terminates\n"); else DBG("SIGTERM received, program terminates\n"); + LOG(L_NOTICE, "Thank you for flying " NAME "!!!\n"); /* shutdown/kill all the children */ shutdown_children(SIGTERM, 1); - LOG(L_NOTICE, "Thank you for flying " NAME "\n"); exit(0); break;

1 0

[tracker] Comment added: Add additional tm callbacks
by sip-router 07 Oct '11

07 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#124 - Add additional tm callbacks User who did this - Timo Reimann (tr) ---------- Work on this issue is in progress. Stay tuned! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=124#comment301 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

acc module usage of ftime for acc_cdr
by Daniel-Constantin Mierla 07 Oct '11

07 Oct '11

Hello, I see that acc_cdr extension is using ftime() function. According to the manual, this function is obsolete and should not be used, quote: CONFORMING TO 4.2BSD, POSIX.1-2001. POSIX.1-2008 removes the specification of ftime(). This function is obsolete. Don't use it. If the time in seconds suf- fices, time(2) can be used; gettimeofday(2) gives microseconds; clock_gettime(2) gives nanoseconds but is not as widely available. On freebsd looks like it needs libcompat for linking, otherwise throws error: Undefined symbol "ftime" I think it should be replaced with supported alternatives. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

2 2

git:master: acc(k): Add time2string() function and clean up code.
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 05e61912a21226f08725953f9e3b31b2c70caca2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05e6191… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 3 20:10:34 2011 +0200 acc(k): Add time2string() function and clean up code. - Implement time2string(): * Replace redundant time-to-string conversion logic in various functions with implementation and call to new, single function. * Reduce microseconds precision from timeval structure to milliseconds as it used to be prior to refactoring. * Store conversion result in static buffer. - Add variables and macro definitions now needed. - Remove variables no longer needed. --- modules_k/acc/acc_cdr.c | 88 ++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 47 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index 9e91be1..bc74fd8 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -47,6 +47,7 @@ #include <sys/time.h> #define TIME_STR_BUFFER_SIZE 20 +#define TIME_BUFFER_LENGTH 256 struct dlg_binds dlgb; struct acc_extra* cdr_extra = NULL; @@ -57,8 +58,8 @@ static const str end_id = { "et", 2}; static const str duration_id = { "d", 1}; static const str zero_duration = { "0", 1}; static const char time_separator = {'.'}; -static const int milliseconds_max = 1000000; -static const unsigned int time_buffer_length = 256; +static const int milliseconds_max = 1000; +static char time_buffer[ TIME_BUFFER_LENGTH]; static const str empty_string = { "", 0}; // buffers which are used to collect the crd data for writing @@ -228,6 +229,35 @@ static int string2time( str* time_str, struct timeval* time_value) return 0; } +/* convert a timeval struct into a string */ +static int time2string( struct timeval* time_value, str* time_str) +{ + int buffer_length; + + if( !time_value) + { + LM_ERR( "time_value or any of its fields is empty!\n"); + return -1; + } + + buffer_length = snprintf( time_buffer, + TIME_BUFFER_LENGTH, + "%ld%c%03d", + time_value->tv_sec, + time_separator, + (int)time_value->tv_usec/1000); + + if( buffer_length < 0) + { + LM_ERR( "failed to write to buffer.\n"); + return -1; + } + + time_str->s = time_buffer; + time_str->len = buffer_length; + return 0; +} + /* set the duration in the dialog struct */ static int set_duration( struct dlg_cell* dialog) { @@ -235,9 +265,7 @@ static int set_duration( struct dlg_cell* dialog) struct timeval end_time; int milliseconds = -1; int seconds = -1; - char buffer[ time_buffer_length]; - int buffer_length = -1; - str duration_time = empty_string; + str duration_time; if( !dialog) { @@ -288,21 +316,11 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - buffer_length = snprintf( buffer, - time_buffer_length, - "%d%c%03d", - seconds, - time_separator, - milliseconds); - - if( buffer_length < 0) - { - LM_ERR( "failed to write to buffer.\n"); + if( time2string(&(struct timeval){seconds, milliseconds}, &duration_time) < 0) { + LM_ERR( "failed to convert current time to string\n"); return -1; } - duration_time = ( str){ buffer, buffer_length}; - if( dlgb.set_dlg_var( dialog, (str*)&duration_id, (str*)&duration_time) != 0) @@ -317,10 +335,8 @@ static int set_duration( struct dlg_cell* dialog) /* set the current time as start-time in the dialog struct */ static int set_start_time( struct dlg_cell* dialog) { - char buffer[ time_buffer_length]; struct timeval current_time; - int buffer_length = -1; - str start_time = empty_string; + str start_time; if( !dialog) { @@ -334,21 +350,11 @@ static int set_start_time( struct dlg_cell* dialog) return -1; } - buffer_length = snprintf( buffer, - time_buffer_length, - "%d%c%03d", - (int)current_time.tv_sec, - time_separator, - (int)current_time.tv_usec); - - if( buffer_length < 0) - { - LM_ERR( "reach buffer size\n"); + if( time2string(&current_time, &start_time) < 0) { + LM_ERR( "failed to convert current time to string\n"); return -1; } - start_time = (str){ buffer, buffer_length}; - if( dlgb.set_dlg_var( dialog, (str*)&start_id, (str*)&start_time) != 0) @@ -379,10 +385,8 @@ static int set_start_time( struct dlg_cell* dialog) /* set the current time as end-time in the dialog struct */ static int set_end_time( struct dlg_cell* dialog) { - char buffer[ time_buffer_length]; struct timeval current_time; - int buffer_length = -1; - str end_time = empty_string; + str end_time; if( !dialog) { @@ -396,21 +400,11 @@ static int set_end_time( struct dlg_cell* dialog) return -1; } - buffer_length = snprintf( buffer, - time_buffer_length, - "%d%c%03d", - (int)current_time.tv_sec, - time_separator, - (int)current_time.tv_usec); - - if( buffer_length < 0) - { - LM_ERR( "failed to write buffer\n"); + if( time2string(&current_time, &end_time) < 0) { + LM_ERR( "failed to convert current time to string\n"); return -1; } - end_time = ( str){ buffer, buffer_length}; - if( dlgb.set_dlg_var( dialog, (str*)&end_id, (str*)&end_time) != 0)

1 0

git:master: acc(k): Rename time_from_string() to string2time().
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 8fd917d8306ba784242e5fa60e3e5598b2d4b922 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fd917d… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 3 19:26:24 2011 +0200 acc(k): Rename time_from_string() to string2time(). --- modules_k/acc/acc_cdr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index a1a40ea..9e91be1 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -181,7 +181,7 @@ static int write_cdr( struct dlg_cell* dialog, } /* convert a string into a timeval struct */ -static int time_from_string( str* time_str, struct timeval* time_value) +static int string2time( str* time_str, struct timeval* time_value) { char* dot_address = NULL; int dot_position = -1; @@ -245,11 +245,11 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - if ( time_from_string( dlgb.get_dlg_var( dialog, (str*)&start_id), &start_time) < 0) { + if ( string2time( dlgb.get_dlg_var( dialog, (str*)&start_id), &start_time) < 0) { LM_ERR( "failed to extract start time\n"); return -1; } - if ( time_from_string( dlgb.get_dlg_var( dialog, (str*)&end_id), &end_time) < 0) { + if ( string2time( dlgb.get_dlg_var( dialog, (str*)&end_id), &end_time) < 0) { LM_ERR( "failed to extract end time\n"); return -1; }

1 0

git:master: acc(k): Replace custom time arithmetics logic with existing macro
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 95c66ffadf3c12a0840cd4beac49ebe185d9f13d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95c66ff… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 3 20:39:43 2011 +0200 acc(k): Replace custom time arithmetics logic with existing macro definition. - Use timersub() from <sys/time.h> instead of custom code. - In string2time(), restore microseconds precision before returning timeval structure (because timersub() expects it). --- modules_k/acc/acc_cdr.c | 46 ++++++---------------------------------------- 1 files changed, 6 insertions(+), 40 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index bc74fd8..f4b9348 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -58,7 +58,6 @@ static const str end_id = { "et", 2}; static const str duration_id = { "d", 1}; static const str zero_duration = { "0", 1}; static const char time_separator = {'.'}; -static const int milliseconds_max = 1000; static char time_buffer[ TIME_BUFFER_LENGTH]; static const str empty_string = { "", 0}; @@ -225,7 +224,7 @@ static int string2time( str* time_str, struct timeval* time_value) } time_value->tv_sec = strtol( zero_terminated_value, (char **)NULL, 10); - time_value->tv_usec = strtol( dot_address + 1, (char **)NULL, 10); + time_value->tv_usec = strtol( dot_address + 1, (char **)NULL, 10) * 1000; // restore usec precision return 0; } @@ -263,9 +262,8 @@ static int set_duration( struct dlg_cell* dialog) { struct timeval start_time; struct timeval end_time; - int milliseconds = -1; - int seconds = -1; - str duration_time; + struct timeval duration_time; + str duration_str; if( !dialog) { @@ -282,48 +280,16 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - if( start_time.tv_usec >= milliseconds_max || - end_time.tv_usec >= milliseconds_max) - { - LM_ERR( "start-(%d) or/and end-time(%d) is out of the maximum of %d\n", - start_time.tv_usec, - end_time.tv_usec, - milliseconds_max); - return -1; - } - - milliseconds = end_time.tv_usec < start_time.tv_usec ? - ( milliseconds_max + - end_time.tv_usec - - start_time.tv_usec) : - ( end_time.tv_usec - start_time.tv_usec); - - seconds = end_time.tv_sec - - start_time.tv_sec - - ( end_time.tv_usec < start_time.tv_usec ? 1 : 0); - - if( seconds < 0) - { - LM_ERR( "negativ seconds(%d) for duration calculated.\n", seconds); - return -1; - } - - if( milliseconds < 0 || milliseconds >= milliseconds_max) - { - LM_ERR( "milliseconds %d are out of range 0 < x < %d.\n", - milliseconds, - milliseconds_max); - return -1; - } + timersub(&end_time, &start_time, &duration_time); - if( time2string(&(struct timeval){seconds, milliseconds}, &duration_time) < 0) { + if( time2string(&duration_time, &duration_str) < 0) { LM_ERR( "failed to convert current time to string\n"); return -1; } if( dlgb.set_dlg_var( dialog, (str*)&duration_id, - (str*)&duration_time) != 0) + (str*)&duration_str) != 0) { LM_ERR( "failed to set duration time"); return -1;

1 0

git:master: acc(k): Change time_from_string() signature in order to remove
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: c73f7667017ab6f3889995db6d530aad3e36b28b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c73f766… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Sep 28 00:13:55 2011 +0200 acc(k): Change time_from_string() signature in order to remove is_time_equal(). - Let time_from_string() accept pointer to target timeval struct and return success/error state in int-typed return value. - Change variable names in time_from_string(). - Remove is_time_equal() which was used for error checking only. - Remove time_error struct which is now represented by return value from time_from_string(). --- modules_k/acc/acc_cdr.c | 61 +++++++++++++++++----------------------------- 1 files changed, 23 insertions(+), 38 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index b15530f..a1a40ea 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -56,7 +56,6 @@ static const str start_id = { "st", 2}; static const str end_id = { "et", 2}; static const str duration_id = { "d", 1}; static const str zero_duration = { "0", 1}; -static const struct timeval time_error = {0,0}; static const char time_separator = {'.'}; static const int milliseconds_max = 1000000; static const unsigned int time_buffer_length = 256; @@ -70,19 +69,6 @@ static char cdr_type_array[ MAX_CDR_CORE + MAX_CDR_EXTRA]; extern struct tm_binds tmb; -/* compare two times */ -static int is_time_equal( struct timeval first_time, - struct timeval second_time) -{ - if( first_time.tv_sec == second_time.tv_sec && - first_time.tv_usec == second_time.tv_usec ) - { - return 1; - } - - return 0; -} - /* write all basic information to buffers(e.g. start-time ...) */ static int cdr_core2strar( struct dlg_cell* dlg, str* values, @@ -194,29 +180,29 @@ static int write_cdr( struct dlg_cell* dialog, return 0; } -/* convert a string into a timeb struct */ -static struct timeval time_from_string( str* time_value) +/* convert a string into a timeval struct */ +static int time_from_string( str* time_str, struct timeval* time_value) { char* dot_address = NULL; int dot_position = -1; char zero_terminated_value[TIME_STR_BUFFER_SIZE]; - if( !time_value) + if( !time_str) { - LM_ERR( "time_value is empty!"); - return time_error; + LM_ERR( "time_str is empty!"); + return -1; } - if( time_value->len >= TIME_STR_BUFFER_SIZE) + if( time_str->len >= TIME_STR_BUFFER_SIZE) { - LM_ERR( "time_value is to long %d >= %d!", - time_value->len, + LM_ERR( "time_str is too long %d >= %d!", + time_str->len, TIME_STR_BUFFER_SIZE); - return time_error; + return -1; } - memcpy( zero_terminated_value, time_value->s, time_value->len); - zero_terminated_value[time_value->len] = '\0'; + memcpy( zero_terminated_value, time_str->s, time_str->len); + zero_terminated_value[time_str->len] = '\0'; dot_address = strchr( zero_terminated_value, time_separator); @@ -225,7 +211,7 @@ static struct timeval time_from_string( str* time_value) LM_ERR( "failed to find separator('%c') in '%s'!\n", time_separator, zero_terminated_value); - return time_error; + return -1; } dot_position = dot_address-zero_terminated_value + 1; @@ -234,19 +220,19 @@ static struct timeval time_from_string( str* time_value) strchr(dot_address + 1, time_separator)) { LM_ERR( "invalid time-string '%s'\n", zero_terminated_value); - return time_error; + return -1; } - time_res->tv_sec = strtol( zero_terminated_value, (char **)NULL, 10); - time_res->tv_usec = strtol( dot_address + 1, (char **)NULL, 10); + time_value->tv_sec = strtol( zero_terminated_value, (char **)NULL, 10); + time_value->tv_usec = strtol( dot_address + 1, (char **)NULL, 10); return 0; } /* set the duration in the dialog struct */ static int set_duration( struct dlg_cell* dialog) { - struct timeval start_time = time_error; - struct timeval end_time = time_error; + struct timeval start_time; + struct timeval end_time; int milliseconds = -1; int seconds = -1; char buffer[ time_buffer_length]; @@ -259,13 +245,12 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - start_time = time_from_string( dlgb.get_dlg_var( dialog, (str*)&start_id)); - end_time = time_from_string( dlgb.get_dlg_var( dialog, (str*)&end_id)); - - if( is_time_equal( start_time, time_error) || - is_time_equal( end_time, time_error)) - { - LM_ERR( "failed to extract time from start or/and end-time\n"); + if ( time_from_string( dlgb.get_dlg_var( dialog, (str*)&start_id), &start_time) < 0) { + LM_ERR( "failed to extract start time\n"); + return -1; + } + if ( time_from_string( dlgb.get_dlg_var( dialog, (str*)&end_id), &end_time) < 0) { + LM_ERR( "failed to extract end time\n"); return -1; }

1 0

git:master: acc(k): Replace call to (deprecated) atoi() function with
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 5a6a30cd341f14ba46e8a1b99e9c4327a2fad495 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a6a30c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Sep 28 00:28:05 2011 +0200 acc(k): Replace call to (deprecated) atoi() function with strtol(). --- modules_k/acc/acc_cdr.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index 7859ea9..ddaedd7 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -237,8 +237,9 @@ static struct timeval time_from_string( str* time_value) return time_error; } - return (struct timeval) { atoi( zero_terminated_value), - atoi( dot_address + 1)}; + time_res->tv_sec = strtol( zero_terminated_value, (char **)NULL, 10); + time_res->tv_usec = strtol( dot_address + 1, (char **)NULL, 10); + return 0; } /* set the duration in the dialog struct */

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011