sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: acc: for time_mode=1, save timestamp in time_attr and microsecs in time_exten

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6dc04484e39ceab4887b375d2510f35892d695eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dc0448… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 5 11:54:03 2013 +0200 acc: for time_mode=1, save timestamp in time_attr and microsecs in time_exten - database records stores time as datetime value - new parameter time_exten to allow customization of attribute name --- modules/acc/README | 39 ++++++++++++++++++++++++++++----------- modules/acc/acc.c | 26 +++++++++++++++++--------- modules/acc/acc_mod.c | 2 ++ modules/acc/acc_mod.h | 1 + modules/acc/doc/acc_admin.xml | 28 ++++++++++++++++++++++++---- 5 files changed, 72 insertions(+), 24 deletions(-) diff --git a/modules/acc/README b/modules/acc/README index e837964..d54cd54 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -129,6 +129,7 @@ Sven Knoblich 6.46. cdrs_table (str) 6.47. time_mode (int) 6.48. time_attr (str) + 6.49. time_exten (str) 7. Functions @@ -189,10 +190,11 @@ Sven Knoblich 1.46. cdrs_table example 1.47. time_mode example 1.48. time_attr example - 1.49. acc_log_request usage - 1.50. acc_db_request usage - 1.51. acc_rad_request usage - 1.52. acc_diam_request usage + 1.49. time_exten example + 1.50. acc_log_request usage + 1.51. acc_db_request usage + 1.52. acc_rad_request usage + 1.53. acc_diam_request usage Chapter 1. Admin Guide @@ -285,6 +287,7 @@ Chapter 1. Admin Guide 6.46. cdrs_table (str) 6.47. time_mode (int) 6.48. time_attr (str) + 6.49. time_exten (str) 7. Functions @@ -695,6 +698,7 @@ $dlg_var(callee) = $avp(callee); #callee='C' 6.46. cdrs_table (str) 6.47. time_mode (int) 6.48. time_attr (str) + 6.49. time_exten (str) 6.1. early_media (integer) @@ -1186,8 +1190,7 @@ modparam("acc", "cdrs_table", "acc_cdrs") Values can be: * 0 - (default), save only unix timestamp for syslog and datetime for database. - * 1 - save microseconds part (does not include the seconds in the - value) in time_attr. + * 1 - save seconds in time_attr and microseconds in time_exten. * 3 - save seconds.miliseconds in time_attr. Example 1.47. time_mode example @@ -1203,8 +1206,22 @@ modparam("acc", "time_mode", 1) * 1 - time_attr column has to be int. * 2 - time_attr column has to be double. + For time_mode=1, this attribute is not written in syslog, because time + value is already unix timestamp, but in db accounting time value is + datetime and requires a function to get the timestamp. + Example 1.48. time_attr example -modparam("acc", "time_attr", "micorsecs") +modparam("acc", "time_attr", "seconds") + +6.49. time_exten (str) + + Name of the syslog attribute or database column where to store extended + value related to the time of event. + + It is used now only for time_mode=1 and database column has to be int: + + Example 1.49. time_exten example +modparam("acc", "time_exten", "micorsecs") 7. Functions @@ -1225,7 +1242,7 @@ modparam("acc", "time_attr", "micorsecs") This function can be used from ANY_ROUTE. - Example 1.49. acc_log_request usage + Example 1.50. acc_log_request usage ... acc_log_request("Some comment"); ... @@ -1243,7 +1260,7 @@ acc_log_request("Some comment"); This function can be used from ANY_ROUTE. - Example 1.50. acc_db_request usage + Example 1.51. acc_db_request usage ... acc_db_request("Some comment", "SomeTable"); acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); @@ -1259,7 +1276,7 @@ acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); This function can be used from ANY_ROUTE. - Example 1.51. acc_rad_request usage + Example 1.52. acc_rad_request usage ... acc_rad_request("Some comment"); ... @@ -1274,7 +1291,7 @@ acc_rad_request("Some comment"); This function can be used from ANY_ROUTE. - Example 1.52. acc_diam_request usage + Example 1.53. acc_diam_request usage ... acc_diam_request("Some comment"); ... diff --git a/modules/acc/acc.c b/modules/acc/acc.c index 2849809..8a6f3cc 100644 --- a/modules/acc/acc.c +++ b/modules/acc/acc.c @@ -93,10 +93,11 @@ extern struct acc_extra *db_extra; #endif /* arrays used to collect the values before being - * pushed to the storage backend (whatever used) */ -static str val_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+2]; -static int int_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+2]; -static char type_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+2]; + * pushed to the storage backend (whatever used) + * (3 = datetime + max 2 from time_mode) */ +static str val_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+3]; +static int int_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+3]; +static char type_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+3]; /******************************************** * acc CORE function @@ -279,7 +280,7 @@ int acc_log_request( struct sip_msg *rq) if(acc_time_mode==1) { LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%u%s", acc_env.text.len, acc_env.text.s,(unsigned long) acc_env.ts, - acc_time_attr.s, (unsigned int)acc_env.tv.tv_usec, + acc_time_exten.s, (unsigned int)acc_env.tv.tv_usec, log_msg); } else if(acc_time_mode==2) { LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%.3f%s", @@ -304,9 +305,10 @@ int acc_log_request( struct sip_msg *rq) #ifdef SQL_ACC -/* caution: keys need to be aligned to core format */ -static db_key_t db_keys[ACC_CORE_LEN+2+MAX_ACC_EXTRA+MAX_ACC_LEG]; -static db_val_t db_vals[ACC_CORE_LEN+2+MAX_ACC_EXTRA+MAX_ACC_LEG]; +/* caution: keys need to be aligned to core format + * (3 = datetime + max 2 from time_mode) */ +static db_key_t db_keys[ACC_CORE_LEN+3+MAX_ACC_EXTRA+MAX_ACC_LEG]; +static db_val_t db_vals[ACC_CORE_LEN+3+MAX_ACC_EXTRA+MAX_ACC_LEG]; int acc_get_db_handlers(void **vf, void **vh) { @@ -336,7 +338,10 @@ static void acc_db_init_keys(void) db_keys[n++] = &acc_time_col; time_idx = n-1; if(acc_time_mode==1 || acc_time_mode==2) { - db_keys[n++] = &acc_time_attr;; + db_keys[n++] = &acc_time_attr; + if(acc_time_mode==1) { + db_keys[n++] = &acc_time_exten; + } } /* init the extra db keys */ @@ -355,6 +360,7 @@ static void acc_db_init_keys(void) VAL_TYPE(db_vals+time_idx)=DB1_DATETIME; if(acc_time_mode==1) { VAL_TYPE(db_vals+time_idx+1)=DB1_INT; + VAL_TYPE(db_vals+time_idx+2)=DB1_INT; } else if(acc_time_mode==2) { VAL_TYPE(db_vals+time_idx+1)=DB1_DOUBLE; } @@ -418,6 +424,8 @@ int acc_db_request( struct sip_msg *rq) VAL_TIME(db_vals+(m++)) = acc_env.ts; /* extra time value */ if(acc_time_mode==1) { + VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_sec; + i++; VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_usec; i++; } else if(acc_time_mode==2) { diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index 1f7540b..a36ecbe 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -116,6 +116,7 @@ int acc_prepare_flag = -1; /*!< should the request be prepared for later acc */ int acc_time_mode = 0; str acc_time_attr = str_init("time_attr"); +str acc_time_exten = str_init("time_exten"); /*@}*/ @@ -306,6 +307,7 @@ static param_export_t params[] = { /* time-mode-specific */ {"time_mode", INT_PARAM, &acc_time_mode }, {"time_attr", PARAM_STR, &acc_time_attr }, + {"time_exten", PARAM_STR, &acc_time_exten }, {"cdrs_table", PARAM_STR, &acc_cdrs_table }, {0,0,0} }; diff --git a/modules/acc/acc_mod.h b/modules/acc/acc_mod.h index b291abd..98cef33 100644 --- a/modules/acc/acc_mod.h +++ b/modules/acc/acc_mod.h @@ -99,6 +99,7 @@ extern int acc_db_insert_mode; /* time mode */ extern int acc_time_mode; extern str acc_time_attr; +extern str acc_time_exten; #endif diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 78f025a..6ebb9a9 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1278,8 +1278,8 @@ modparam("acc", "cdrs_table", "acc_cdrs") timestamp for syslog and datetime for database.</para> </listitem> <listitem> - <para><emphasis>1</emphasis> - save microseconds part (does not - include the seconds in the value) in time_attr.</para> + <para><emphasis>1</emphasis> - save seconds in time_attr and + microseconds in time_exten.</para> </listitem> <listitem> <para><emphasis>3</emphasis> - save seconds.miliseconds @@ -1312,11 +1312,31 @@ modparam("acc", "time_mode", 1) <para><emphasis>2</emphasis> - time_attr column has to be double.</para> </listitem> </itemizedlist> - + <para> + For time_mode=1, this attribute is not written in syslog, because time + value is already unix timestamp, but in db accounting time value is + datetime and requires a function to get the timestamp. + </para> <example> <title>time_attr example</title> <programlisting format="linespecific"> -modparam("acc", "time_attr", "micorsecs") +modparam("acc", "time_attr", "seconds") +</programlisting> + </example> + </section> + <section id="acc.p.time_exten"> + <title><varname>time_exten</varname> (str)</title> + <para> + Name of the syslog attribute or database column where to store extended + value related to the time of event. + </para> + <para> + It is used now only for time_mode=1 and database column has to be int: + </para> + <example> + <title>time_exten example</title> + <programlisting format="linespecific"> +modparam("acc", "time_exten", "micorsecs") </programlisting> </example> </section>

11 years, 2 months

testing - dialog-based cdrs to database

by Daniel-Constantin Mierla

Hello, being requested several times and as I did get to do some acc work, I added the code for storing dialog-based cdrs to database. But I had no time to setup a testbed for it, hopefully those interested in the feature will help testing a bit. It follows closely the same logic as writing cdrs to syslog. You have to create table acc_cdrs (see utils/kamctl/mysql/acc-create.sql), then add extra columns as you need. The attribute name in cdr_extra has to match the column name (the type for extra columns have to be string/varchar). In kamailio.cfg you have to set the cdrs_table parameter to acc_cdrs. One odd by now is that duration column is also string, because is how existing code (for syslog writing) stored in internally -- plan to change it in the near future, for now sql gives the tools for converting. More details can be found in acc module readme: - http://kamailio.org/docs/modules/devel/modules/acc.html Let me know the results, to tune it properly. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Oct 21-24; Miami, Nov 11-13, 2013 - more details about Kamailio trainings at http://www.asipto.com -

11 years, 2 months

git:master: acc: fixed c&p typo of parameter name in docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 367a0e72be1d5e5de0fa84ca2a8d11f7d5b54abe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=367a0e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 5 11:08:17 2013 +0200 acc: fixed c&p typo of parameter name in docs --- modules/acc/README | 8 ++++---- modules/acc/doc/acc_admin.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/acc/README b/modules/acc/README index 3f5bf16..e837964 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -125,7 +125,7 @@ Sven Knoblich 6.42. cdr_start_id (string) 6.43. cdr_end_id (string) 6.44. cdr_duration_id (string) - 6.45. cdr_enable (int) + 6.45. cdr_log_enable (int) 6.46. cdrs_table (str) 6.47. time_mode (int) 6.48. time_attr (str) @@ -281,7 +281,7 @@ Chapter 1. Admin Guide 6.42. cdr_start_id (string) 6.43. cdr_end_id (string) 6.44. cdr_duration_id (string) - 6.45. cdr_enable (int) + 6.45. cdr_log_enable (int) 6.46. cdrs_table (str) 6.47. time_mode (int) 6.48. time_attr (str) @@ -691,7 +691,7 @@ $dlg_var(callee) = $avp(callee); #callee='C' 6.42. cdr_start_id (string) 6.43. cdr_end_id (string) 6.44. cdr_duration_id (string) - 6.45. cdr_enable (int) + 6.45. cdr_log_enable (int) 6.46. cdrs_table (str) 6.47. time_mode (int) 6.48. time_attr (str) @@ -1161,7 +1161,7 @@ modparam("acc", "cdr_end_id", "end") Example 1.44. cdr_duration_id example modparam("acc", "cdr_duration_id", "d") -6.45. cdr_enable (int) +6.45. cdr_log_enable (int) Control if CDR-based accounting should be written to syslog. diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 3ff5761..78f025a 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1234,7 +1234,7 @@ modparam("acc", "cdr_duration_id", "d") </example> </section> <section id="acc.p.cdr_log_enable"> - <title><varname>cdr_enable</varname> (int)</title> + <title><varname>cdr_log_enable</varname> (int)</title> <para> Control if CDR-based accounting should be written to syslog. </para>

11 years, 2 months

git:master: lib/srdb1: added id for definition of column start_time in acc_cdrs table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b91f07fce16f5feb0c31f7af59ab9351e274221f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b91f07f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 5 10:04:14 2013 +0200 lib/srdb1: added id for definition of column start_time in acc_cdrs table --- lib/srdb1/schema/acc_cdrs.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/acc_cdrs.xml b/lib/srdb1/schema/acc_cdrs.xml index ed893e5..22cba14 100644 --- a/lib/srdb1/schema/acc_cdrs.xml +++ b/lib/srdb1/schema/acc_cdrs.xml @@ -26,7 +26,7 @@ <description>unique ID</description> </column> - <column> + <column id="start_time"> <name>start_time</name> <type>string</type> <size>32</size>

11 years, 2 months

git:master: kamctl: added scripts to define table acc_cdrs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a722cee262664162f183e00788c2d53c4c98b217 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a722cee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 5 10:04:57 2013 +0200 kamctl: added scripts to define table acc_cdrs --- utils/kamctl/db_berkeley/kamailio/acc_cdrs | 10 ++++ utils/kamctl/db_berkeley/kamailio/version | 2 + utils/kamctl/db_sqlite/acc-create.sql | 10 ++++ utils/kamctl/dbtext/kamailio/acc_cdrs | 1 + utils/kamctl/dbtext/kamailio/version | 1 + utils/kamctl/mysql/acc-create.sql | 10 ++++ utils/kamctl/oracle/acc-create.sql | 18 +++++++ utils/kamctl/postgres/acc-create.sql | 10 ++++ utils/kamctl/xhttp_pi/acc-mod | 41 ++++++++++++++++ utils/kamctl/xhttp_pi/acc-table | 9 ++++ utils/kamctl/xhttp_pi/pi_framework.xml | 72 +++++++++++++++++++++++---- 11 files changed, 173 insertions(+), 11 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a72…

11 years, 2 months

git:master: lib/srdb1: initial db schema for acc_cdrs table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dd3c6f19c18cf0c2844f2b2ce155e3f5d7af447a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd3c6f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 5 10:02:01 2013 +0200 lib/srdb1: initial db schema for acc_cdrs table --- lib/srdb1/schema/acc_cdrs.xml | 57 +++++++++++++++++++++++++++++++++++++ lib/srdb1/schema/kamailio-acc.xml | 1 + 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/acc_cdrs.xml b/lib/srdb1/schema/acc_cdrs.xml new file mode 100644 index 0000000..ed893e5 --- /dev/null +++ b/lib/srdb1/schema/acc_cdrs.xml @@ -0,0 +1,57 @@ +<?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="acc_cdrs" xmlns:db="http://docbook.org/ns/docbook"> + <name>acc_cdrs</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the ACC module to report on CDRs relying on dialog callbacks. More information is available at: &KAMAILIO_MOD_DOC;acc.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> + <name>start_time</name> + <type>string</type> + <size>32</size> + <description>Start time</description> + <default/> + </column> + + <column> + <name>end_time</name> + <type>string</type> + <size>32</size> + <description>End time</description> + <default/> + </column> + + <column> + <name>duration</name> + <type>string</type> + <size>32</size> + <description>Duration</description> + <default/> + </column> + + <index> + <name>start_time_idx</name> + <colref linkend="start_time"/> + </index> +</table> diff --git a/lib/srdb1/schema/kamailio-acc.xml b/lib/srdb1/schema/kamailio-acc.xml index 86ed8f0..eea6a06 100644 --- a/lib/srdb1/schema/kamailio-acc.xml +++ b/lib/srdb1/schema/kamailio-acc.xml @@ -10,5 +10,6 @@ <database xmlns:xi="http://www.w3.org/2001/XInclude"> <name>Accounting</name> <xi:include href="acc.xml"/> + <xi:include href="acc_cdrs.xml"/> <xi:include href="missed_calls.xml"/> </database>

11 years, 2 months

git:4.0: registrar: reset r-uri pointer after backup in lookup_branches()

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 9c8fd38683d9f6531b0d6ee966d81d878095bf6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c8fd38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 22:59:13 2013 +0200 registrar: reset r-uri pointer after backup in lookup_branches() - otherwise can be invalidated by next branch lookup (cherry picked from commit 9b44e4b48862947f2ea634c6dd611ce7c07546a2) --- modules/registrar/lookup.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index fcb6c26..f9bbad3 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -400,6 +400,11 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) ruri_b_instance = msg->instance; ruri_b_reg_id = msg->reg_id; reset_ruri_branch(msg); + /* set new uri buf to null, otherwise is freed or overwritten by + * rewrite_uri() during branch lookup */ + msg->new_uri.len=0; + msg->new_uri.s=0; + msg->parsed_uri_ok=0; for(i=0; i<nr_branches_start; i++) { crt = get_sip_branch(i); @@ -469,7 +474,11 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) done: reset_ruri_branch(msg); + /* new uri could be set to allocated buffer by branch lookup */ + if(msg->new_uri.s!=NULL) + pkg_free(msg->new_uri.s); msg->new_uri = ruri_b_uri; + ruri_mark_new(); msg->parsed_uri_ok = 0; msg->dst_uri = ruri_b_dst_uri; msg->path_vec = ruri_b_path;

11 years, 2 months

git:master: registrar: reset r-uri pointer after backup in lookup_branches( )

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9b44e4b48862947f2ea634c6dd611ce7c07546a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b44e4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 22:59:13 2013 +0200 registrar: reset r-uri pointer after backup in lookup_branches() - otherwise can be invalidated by next branch lookup --- modules/registrar/lookup.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index be08056..0e298e7 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -421,6 +421,11 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) ruri_b_ruid = msg->ruid; ruri_b_ua = msg->location_ua; reset_ruri_branch(msg); + /* set new uri buf to null, otherwise is freed or overwritten by + * rewrite_uri() during branch lookup */ + msg->new_uri.len=0; + msg->new_uri.s=0; + msg->parsed_uri_ok=0; for(i=0; i<nr_branches_start; i++) { crt = get_sip_branch(i); @@ -490,7 +495,11 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) done: reset_ruri_branch(msg); + /* new uri could be set to allocated buffer by branch lookup */ + if(msg->new_uri.s!=NULL) + pkg_free(msg->new_uri.s); msg->new_uri = ruri_b_uri; + ruri_mark_new(); msg->parsed_uri_ok = 0; msg->dst_uri = ruri_b_dst_uri; msg->path_vec = ruri_b_path;

11 years, 2 months

OpenSSL PRNG vulnerability in kamailo

by Vadim Lebedev

Hello, I think that kamailio could be prone to the same OpenSSL PRNG initalization problem as Android OS ( http://emboss.github.io/blog/2013/08/21/openssl-prng-is-not-really-fork-saf…) related to the fact that all kmaillio child processes are inheriting PRNG state of the parent process. Thanks Vadim

11 years, 2 months

git:tmp/ims_charging: Initial structure for the docs of the IMS-Charging module (incomplete)

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: 96c85efbc40a6d0571e8122cbad30410d2274b24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96c85ef… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Sep 4 14:27:47 2013 +0200 Initial structure for the docs of the IMS-Charging module (incomplete) --- modules/ims_charging/doc/Makefile | 4 + modules/ims_charging/doc/ims_charging.xml | 50 ++++++++ modules/ims_charging/doc/ims_charging_admin.xml | 140 +++++++++++++++++++++++ 3 files changed, 194 insertions(+), 0 deletions(-) diff --git a/modules/ims_charging/doc/Makefile b/modules/ims_charging/doc/Makefile new file mode 100644 index 0000000..56be612 --- /dev/null +++ b/modules/ims_charging/doc/Makefile @@ -0,0 +1,4 @@ +docs = ims_charging.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/ims_charging/doc/ims_charging.xml b/modules/ims_charging/doc/ims_charging.xml new file mode 100644 index 0000000..ed02d9b --- /dev/null +++ b/modules/ims_charging/doc/ims_charging.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; +]> +<book> + <bookinfo> + <title>The IMS Charging Module</title> + + <authorgroup> + <author> + <firstname>Jason</firstname> + + <surname>Penton</surname> + + <affiliation> + <orgname>Smile Communications</orgname> + </affiliation> + + <email>jason.penton(a)smilecoms.com</email> + </author> + + <editor> + <firstname>Carsten</firstname> + + <surname>Bock</surname> + + <affiliation> + <orgname>ng-voice GmbH</orgname> + </affiliation> + + <email>carsten(a)ng-voice.com</email> + </editor> + + </authorgroup> + + <copyright> + <year>2013</year> + + <holder>Smile Communications</holder> + </copyright> + </bookinfo> + + <toc/> + + <xi:include href="ims_charging_admin.xml" + xmlns:xi="http://www.w3.org/2001/XInclude"/> +</book> diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml new file mode 100644 index 0000000..03ecf10 --- /dev/null +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; +]> + +<chapter> + <title>&adminguide;</title> + + <section> + <title>Overview</title> + + <para>This module contains all methods related to the IMS charging control + functions performed by an network element (e.g. a S-CSCF) over the Ro + interface. This module is dependent on the CDP (C Diameter Peer) + modules for communicating with a Charging-Server as specified in 3GPP + specification TS xx.xxx. + </para> + </section> + + <section> + <title>Dependencies</title> + + <section> + <title>&kamailio; Modules</title> + + <para>The Following mouldes must be loaded before this module:</para> + + <itemizedlist> + <listitem> + <para>Dialog2</para> + </listitem> + + <listitem> + <para>TM - Transaction Manager</para> + </listitem> + + <listitem> + <para>CDP - C Diameter Peer</para> + </listitem> + + <listitem> + <para>CDP_AVP - CDP AVP Applications</para> + </listitem> + </itemizedlist> + </section> + + <section> + <title>External Libraries or Applications</title> + + <para>This modules requires the internal IMS library.</para> + </section> + </section> + + <section> + <title>Parameters</title> + + <section> + <title><varname>origin_host</varname> (string)</title> + + <para>origin_host.</para> + + <para><emphasis> Default value is 'ims.smilecoms.com'. + </emphasis></para> + + <example> + <title><varname>origin_host</varname> origin_host</title> + + <programlisting format="linespecific"> +... +modparam("ims_charging", "origin_host", "ims.smilecoms.com") +... + </programlisting> + </example> + </section> + + </section> + + <section> + <title>Functions</title> + + <section> + <title><function + moreinfo="none">Ro_CCR(domain)</function></title> + + <para>Perform a CCR on Diameter Ro interface for Charging</para> + + <para>Meaning of the parameters is as follows:</para> + + <itemizedlist> + <listitem> + <para><emphasis>domain</emphasis> that usrloc_pcscf uses to store + user information.</para> + </listitem> + </itemizedlist> + + <para>This function can be used from REQUEST_ROUTE.</para> + + <para>p.s. this is executed asynchronously. See example on how to + retrieve return value</para> + + <example> + <title>Ro_CCR</title> + + <programlisting format="linespecific"> +... + xlog("L_DBG","Sending initial CCR Request for call\n"); + $var(cc_ret) = Ro_CCR("orig", "SCUR", "", "30"); + if ($var(cc_ret) != 0) { + xlog("L_DBG","CCR Request failure\n"); + sl_send_reply("402","Payment required"); + exit; + } +... +</programlisting> + </example> + </section> + + </section> + + <section> + <title>Statistics</title> + + <section> + <title>AAR Timeouts (aar_timeouts)</title> + + <para>The number of timeouts on sending a AAR. i.e. no response to + AAR.</para> + </section> + + <section> + <title>Average AAR Response Time (aar_avg_response_time)</title> + + <para>The average response time in milliseconds for AAR-AAA + transaction.</para> + </section> + </section> +</chapter>

11 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013