sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: acc(k): Replace ftime() call with gettimeofday().
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 49ac4e51e382588f9212eef3500b1b65deb3e9c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49ac4e5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Sep 27 23:46:14 2011 +0200 acc(k): Replace ftime() call with gettimeofday(). * ftime() is deprecated, switch to gettimeofday(). * Employ timeval structure (created from gettimeofday()) instead of timeb … [View More]structure. --- modules_k/acc/acc_cdr.c | 74 ++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 39 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index fda436a..5db65eb 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -44,7 +44,7 @@ #include "acc_extra.h" #include "acc.h" -#include <sys/timeb.h> +#include <sys/time.h> #define TIME_STR_BUFFER_SIZE 20 @@ -56,9 +56,9 @@ static const str start_id = { "sz", 2}; static const str end_id = { "ez", 2}; static const str duration_id = { "d", 1}; static const str zero_duration = { "0", 1}; -static const struct timeb time_error = {0,0,0,0}; +static const struct timeval time_error = {0,0}; static const char time_separator = {'.'}; -static const int milliseconds_max = 1000; +static const int milliseconds_max = 1000000; static const unsigned int time_buffer_length = 256; static const str empty_string = { "", 0}; @@ -71,13 +71,11 @@ 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 timeb first_time, - struct timeb second_time) +static int is_time_equal( struct timeval first_time, + struct timeval second_time) { - if( first_time.time == second_time.time && - first_time.millitm == second_time.millitm && - first_time.timezone == second_time.timezone && - first_time.dstflag == second_time.dstflag ) + if( first_time.tv_sec == second_time.tv_sec && + first_time.tv_usec == second_time.tv_usec ) { return 1; } @@ -197,7 +195,7 @@ static int write_cdr( struct dlg_cell* dialog, } /* convert a string into a timeb struct */ -static struct timeb time_from_string( str* time_value) +static struct timeval time_from_string( str* time_value) { char* dot_address = NULL; int dot_position = -1; @@ -239,17 +237,15 @@ static struct timeb time_from_string( str* time_value) return time_error; } - return (struct timeb) { atoi( zero_terminated_value), - atoi( dot_address + 1), - 0, - 0}; + return (struct timeval) { atoi( zero_terminated_value), + atoi( dot_address + 1)}; } /* set the duration in the dialog struct */ static int set_duration( struct dlg_cell* dialog) { - struct timeb start_timeb = time_error; - struct timeb end_timeb = time_error; + struct timeval start_timeval = time_error; + struct timeval end_timeval = time_error; int milliseconds = -1; int seconds = -1; char buffer[ time_buffer_length]; @@ -262,35 +258,35 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - start_timeb = time_from_string( dlgb.get_dlg_var( dialog, (str*)&start_id)); - end_timeb = time_from_string( dlgb.get_dlg_var( dialog, (str*)&end_id)); + start_timeval = time_from_string( dlgb.get_dlg_var( dialog, (str*)&start_id)); + end_timeval = time_from_string( dlgb.get_dlg_var( dialog, (str*)&end_id)); - if( is_time_equal( start_timeb, time_error) || - is_time_equal( end_timeb, time_error)) + if( is_time_equal( start_timeval, time_error) || + is_time_equal( end_timeval, time_error)) { LM_ERR( "failed to extract time from start or/and end-time\n"); return -1; } - if( start_timeb.millitm >= milliseconds_max || - end_timeb.millitm >= milliseconds_max) + if( start_timeval.tv_usec >= milliseconds_max || + end_timeval.tv_usec >= milliseconds_max) { LM_ERR( "start-(%d) or/and end-time(%d) is out of the maximum of %d\n", - start_timeb.millitm, - end_timeb.millitm, + start_timeval.tv_usec, + end_timeval.tv_usec, milliseconds_max); return -1; } - milliseconds = end_timeb.millitm < start_timeb.millitm ? + milliseconds = end_timeval.tv_usec < start_timeval.tv_usec ? ( milliseconds_max + - end_timeb.millitm - - start_timeb.millitm) : - ( end_timeb.millitm - start_timeb.millitm); + end_timeval.tv_usec - + start_timeval.tv_usec) : + ( end_timeval.tv_usec - start_timeval.tv_usec); - seconds = end_timeb.time - - start_timeb.time - - ( end_timeb.millitm < start_timeb.millitm ? 1 : 0); + seconds = end_timeval.tv_sec - + start_timeval.tv_sec - + ( end_timeval.tv_usec < start_timeval.tv_usec ? 1 : 0); if( seconds < 0) { @@ -336,7 +332,7 @@ static int set_duration( struct dlg_cell* dialog) static int set_start_time( struct dlg_cell* dialog) { char buffer[ time_buffer_length]; - struct timeb current_time = time_error; + struct timeval current_time; int buffer_length = -1; str start_time = empty_string; @@ -346,7 +342,7 @@ static int set_start_time( struct dlg_cell* dialog) return -1; } - if( ftime( &current_time) < 0) + if( gettimeofday( &current_time, NULL) < 0) { LM_ERR( "failed to get current time!\n"); return -1; @@ -355,9 +351,9 @@ static int set_start_time( struct dlg_cell* dialog) buffer_length = snprintf( buffer, time_buffer_length, "%d%c%03d", - (int)current_time.time, + (int)current_time.tv_sec, time_separator, - (int)current_time.millitm); + (int)current_time.tv_usec); if( buffer_length < 0) { @@ -398,7 +394,7 @@ static int set_start_time( struct dlg_cell* dialog) static int set_end_time( struct dlg_cell* dialog) { char buffer[ time_buffer_length]; - struct timeb current_time = time_error; + struct timeval current_time; int buffer_length = -1; str end_time = empty_string; @@ -408,7 +404,7 @@ static int set_end_time( struct dlg_cell* dialog) return -1; } - if( ftime( &current_time) < 0) + if( gettimeofday( &current_time, NULL) < 0) { LM_ERR( "failed to set time!\n"); return -1; @@ -417,9 +413,9 @@ static int set_end_time( struct dlg_cell* dialog) buffer_length = snprintf( buffer, time_buffer_length, "%d%c%03d", - (int)current_time.time, + (int)current_time.tv_sec, time_separator, - (int)current_time.millitm); + (int)current_time.tv_usec); if( buffer_length < 0) { [View Less]

1 0

git:master: acc(k): Change start/end IDs from sz/ez to st/et.
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 88b730e923b4baccfdd9966702d1de5b1a1f1a16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88b730e… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 3 19:21:28 2011 +0200 acc(k): Change start/end IDs from sz/ez to st/et. --- modules_k/acc/acc_cdr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/acc/acc_cdr.c … [View More]

1 0

git:master: acc(k): Rename '*_timeval' variables to '*_time' to decouple name
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 3e7994287183bf6cc352c11f2bb15f934822142d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e79942… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Sep 28 00:02:53 2011 +0200 acc(k): Rename '*_timeval' variables to '*_time' to decouple name from type. --- modules_k/acc/acc_cdr.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(… [View More]+), 17 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index 5db65eb..7859ea9 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -244,8 +244,8 @@ static struct timeval time_from_string( str* time_value) /* set the duration in the dialog struct */ static int set_duration( struct dlg_cell* dialog) { - struct timeval start_timeval = time_error; - struct timeval end_timeval = time_error; + struct timeval start_time = time_error; + struct timeval end_time = time_error; int milliseconds = -1; int seconds = -1; char buffer[ time_buffer_length]; @@ -258,35 +258,35 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - start_timeval = time_from_string( dlgb.get_dlg_var( dialog, (str*)&start_id)); - end_timeval = time_from_string( dlgb.get_dlg_var( dialog, (str*)&end_id)); + 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_timeval, time_error) || - is_time_equal( end_timeval, time_error)) + 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"); return -1; } - if( start_timeval.tv_usec >= milliseconds_max || - end_timeval.tv_usec >= milliseconds_max) + 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_timeval.tv_usec, - end_timeval.tv_usec, + start_time.tv_usec, + end_time.tv_usec, milliseconds_max); return -1; } - milliseconds = end_timeval.tv_usec < start_timeval.tv_usec ? + milliseconds = end_time.tv_usec < start_time.tv_usec ? ( milliseconds_max + - end_timeval.tv_usec - - start_timeval.tv_usec) : - ( end_timeval.tv_usec - start_timeval.tv_usec); + end_time.tv_usec - + start_time.tv_usec) : + ( end_time.tv_usec - start_time.tv_usec); - seconds = end_timeval.tv_sec - - start_timeval.tv_sec - - ( end_timeval.tv_usec < start_timeval.tv_usec ? 1 : 0); + seconds = end_time.tv_sec - + start_time.tv_sec - + ( end_time.tv_usec < start_time.tv_usec ? 1 : 0); if( seconds < 0) { [View Less]

1 0

[tracker] Comment added: enable milliseconds precision for accounting
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#163 - enable milliseconds precision for accounting User who did this - Andrew Pogrebennyk (marduk) ---------- :) ok, no problem ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=163#comment300 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message … [View More]

1 0

[tracker] Comment added: enable milliseconds precision for accounting
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#163 - enable milliseconds precision for accounting User who did this - Timo Reimann (tr) ---------- Please disregard my very last comment completely; I was in an alternate universe when I wrote that. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=163#comment299 You are receiving this message because you have requested it … [View More]

1 0

git:master: utils: Add database creation scripts for dialog variable table
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: ec21c13b86139f10d2280fe75a7ba15f3e30a83a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec21c13… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 16 20:33:06 2011 +0200 utils: Add database creation scripts for dialog variable table (dialog_vars). --- utils/kamctl/db_berkeley/kamailio/dialog_vars | 10 ++++++++++ utils/kamctl/db_sqlite/dialog-… [View More]vars-create.sql | 11 +++++++++++ utils/kamctl/dbtext/kamailio/dialog_vars | 1 + utils/kamctl/mysql/dialog-vars-create.sql | 11 +++++++++++ utils/kamctl/oracle/dialog-vars-create.sql | 19 +++++++++++++++++++ utils/kamctl/postgres/dialog-vars-create.sql | 11 +++++++++++ 6 files changed, 63 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/dialog_vars b/utils/kamctl/db_berkeley/kamailio/dialog_vars new file mode 100644 index 0000000..1b66d4e --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/dialog_vars @@ -0,0 +1,10 @@ +METADATA_COLUMNS +id(int) hash_entry(int) hash_id(int) dialog_key(str) dialog_value(str) +METADATA_KEY +1 2 +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|NIL|NIL|NIL|NIL diff --git a/utils/kamctl/db_sqlite/dialog-vars-create.sql b/utils/kamctl/db_sqlite/dialog-vars-create.sql new file mode 100644 index 0000000..860a87d --- /dev/null +++ b/utils/kamctl/db_sqlite/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id INTEGER PRIMARY KEY NOT NULL, + hash_entry INTEGER NOT NULL, + hash_id INTEGER NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) NOT NULL +) ENGINE=MyISAM; + +CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/dbtext/kamailio/dialog_vars b/utils/kamctl/dbtext/kamailio/dialog_vars new file mode 100644 index 0000000..d39ef42 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/dialog_vars @@ -0,0 +1 @@ +id(int,auto) hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string) diff --git a/utils/kamctl/mysql/dialog-vars-create.sql b/utils/kamctl/mysql/dialog-vars-create.sql new file mode 100644 index 0000000..c8787e6 --- /dev/null +++ b/utils/kamctl/mysql/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + hash_entry INT(10) UNSIGNED NOT NULL, + hash_id INT(10) UNSIGNED NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) NOT NULL +) ENGINE=MyISAM; + +CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/oracle/dialog-vars-create.sql b/utils/kamctl/oracle/dialog-vars-create.sql new file mode 100644 index 0000000..9dbaea7 --- /dev/null +++ b/utils/kamctl/oracle/dialog-vars-create.sql @@ -0,0 +1,19 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id NUMBER(10) PRIMARY KEY, + hash_entry NUMBER(10), + hash_id NUMBER(10), + dialog_key VARCHAR2(128), + dialog_value VARCHAR2(512) +); + +CREATE OR REPLACE TRIGGER dialog_vars_tr +before insert on dialog_vars FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dialog_vars_tr; +/ +BEGIN map2users('dialog_vars'); END; +/ +CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/postgres/dialog-vars-create.sql b/utils/kamctl/postgres/dialog-vars-create.sql new file mode 100644 index 0000000..ccc7d68 --- /dev/null +++ b/utils/kamctl/postgres/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id SERIAL PRIMARY KEY NOT NULL, + hash_entry INTEGER NOT NULL, + hash_id INTEGER NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) +); + +CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id); + [View Less]

2 3

git:master: lib/srdb1/schema: Add XML files related to dialog variables.
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: f54077c7f3c5fbe8863939b5c1aa04b860c08cf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f54077c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Oct 7 15:11:26 2011 +0200 lib/srdb1/schema: Add XML files related to dialog variables. --- lib/srdb1/schema/dialog_vars.xml | 66 +++++++++++++++++++++++++++++ lib/srdb1/schema/kamailio-… [View More]dialog_vars.xml | 12 +++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/dialog_vars.xml b/lib/srdb1/schema/dialog_vars.xml new file mode 100644 index 0000000..429b01c --- /dev/null +++ b/lib/srdb1/schema/dialog_vars.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="dialog_vars" xmlns:db="http://docbook.org/ns/docbook"> + <name>dialog_vars</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>Persistent dialog variable information for the dialog module. + More information can be found at: &KAMAILIO_MOD_DOC;dialog.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>unique ID</description> + </column> + + <column id="hash_entry"> + <name>hash_entry</name> + <type>unsigned int</type> + <size>10</size> + <description>Number of the hash entry in the dialog hash table + </description> + <natural/> + </column> + + <column id="hash_id"> + <name>hash_id</name> + <type>unsigned int</type> + <size>10</size> + <description>The ID on the hash entry</description> + <natural/> + </column> + + <column> + <name>dialog_key</name> + <type>string</type> + <size>128</size> + <description>The key of the dialog variable</description> + </column> + + <column> + <name>dialog_value</name> + <type>string</type> + <size>512</size> + <description>The value of the dialog variable</description> + </column> + + <index> + <name>hash_idx</name> + <colref linkend="hash_entry"/> + <colref linkend="hash_id"/> + </index> +</table> diff --git a/lib/srdb1/schema/kamailio-dialog_vars.xml b/lib/srdb1/schema/kamailio-dialog_vars.xml new file mode 100644 index 0000000..bd62410 --- /dev/null +++ b/lib/srdb1/schema/kamailio-dialog_vars.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>Dialog Variables support</name> + <xi:include href="dialog_vars.xml"/> +</database> [View Less]

1 0

git:master: kamctl: User proper naming schema for SQL creation scripts.
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: 4e6e29c23530bf7a816de3acbd8e771fddf76929 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e6e29c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Oct 7 10:31:23 2011 +0200 kamctl: User proper naming schema for SQL creation scripts. --- ...alog-vars-create.sql => dialog_vars-create.sql} | 0 ...alog-vars-create.sql => dialog_vars-create.sql}… [View More]

1 0

[tracker] Comment added: crash/segfault on shutdown since commit 7b3a6ec
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#165 - crash/segfault on shutdown since commit 7b3a6ec User who did this - Juha Heinanen (jh) ---------- Sorry, I thought that the questions were related to my "crash at startup" bug report. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=165#comment298 You are receiving this message because you have requested it from the … [View More]

1 0

[tracker] Comment added: crash/segfault on shutdown since commit 7b3a6ec
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#165 - crash/segfault on shutdown since commit 7b3a6ec User who did this - Juha Heinanen (jh) ---------- i start this sr with params -P /var/run/sip-proxy/sip-proxy.pid -m 32 -M 4 -u root -g root -w /var/run/sip-proxy -n 4 and stop it with command start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/sip-proxy/sip-proxy.pid \ --exec /usr/sbin/sip-proxy -- juha ---------- More … [View More]

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
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