sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: registrar: propagate tcp connection id in contact info structure
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: master Commit: 392a59ab1c12efee1072581f9519fc258444d086 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=392a59a… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 09:55:23 2013 +0200 registrar: propagate tcp connection id in contact info structure --- modules/registrar/save.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 020358f..b2aa58a 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -263,6 +263,14 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.sock = _m->rcv.bind_address; } + /* set tcp connection id */ + if (_m->rcv.proto==PROTO_TCP || _m->rcv.proto==PROTO_TLS + || _m->rcv.proto==PROTO_WS || _m->rcv.proto==PROTO_WSS) { + ci.tcpconn_id = _m->rcv.proto_reserved1; + } else { + ci.tcpconn_id = -1; + } + /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent && _m->user_agent->body.len>0 && _m->user_agent->body.len<MAX_UA_SIZE) { @@ -496,7 +504,7 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, in /* hack to work with buggy clients having many contacts with same * address in one REGISTER - increase CSeq to detect if there was - * one alredy added, then update */ + * one already added, then update */ ci->cseq++; if ( r->contacts==0 || ul.get_ucontact_by_instance(r, &_c->uri, ci, &c) != 0) {

1 0

git:master: pua: basic framework for handling xcap-diff event
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: master Commit: ea45a9b0ff6851d01e09aa62dfe9e7e006552609 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea45a9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 23:16:50 2013 +0200 pua: basic framework for handling xcap-diff event --- modules/pua/add_events.c | 8 ++++++++ modules/pua/hash.h | 3 +++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules/pua/add_events.c b/modules/pua/add_events.c index 76a12db..b802232 100644 --- a/modules/pua/add_events.c +++ b/modules/pua/add_events.c @@ -98,6 +98,14 @@ int pua_add_events(void) } } + /* add xcap-diff */ + if(add_pua_event(XCAPDIFF_EVENT, "xcap-diff", + "application/xcap-diff+xml", 0)< 0) + { + LM_ERR("while adding event xcap-diff\n"); + return -1; + } + return 0; } diff --git a/modules/pua/hash.h b/modules/pua/hash.h index 9912eba..65020be 100644 --- a/modules/pua/hash.h +++ b/modules/pua/hash.h @@ -42,6 +42,7 @@ #define CONFERENCE_EVENT 1<<4 #define DIALOG_EVENT 1<<5 #define REGINFO_EVENT 1<<6 +#define XCAPDIFF_EVENT 1<<7 #define UL_PUBLISH 1<<0 #define BLA_PUBLISH 1<<1 @@ -57,6 +58,8 @@ #define PURPLE_PUBLISH 1<<11 #define REGINFO_PUBLISH 1<<12 #define REGINFO_SUBSCRIBE 1<<13 +#define XCAPDIFF_PUBLISH 1<<14 +#define XCAPDIFF_SUBSCRIBE 1<<15 #define NO_UPDATEDB_FLAG 1<<0 #define UPDATEDB_FLAG 1<<1

1 0

git:master: presence_xml: basic framework for handling xcap-diff event
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: master Commit: 0c15125767f8a9001e9c892fee18df3dbad56d2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c15125… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 23:15:55 2013 +0200 presence_xml: basic framework for handling xcap-diff event = can be diabled via modparam disable_xcapdiff --- modules/presence_xml/add_events.c | 20 ++++++++++++++++++++ modules/presence_xml/presence_xml.c | 2 ++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules/presence_xml/add_events.c b/modules/presence_xml/add_events.c index f2c8547..dc3ab61 100644 --- a/modules/presence_xml/add_events.c +++ b/modules/presence_xml/add_events.c @@ -44,6 +44,7 @@ extern int disable_presence; extern int disable_winfo; extern int disable_bla; +extern int disable_xcapdiff; static str pu_415_rpl = str_init("Unsupported media type"); @@ -119,6 +120,25 @@ int xml_add_events(void) LM_DBG("added 'dialog;sla' event to presence module\n"); } + if (!disable_xcapdiff) { + /* constructing xcap-diff event */ + memset(&event, 0, sizeof(pres_ev_t)); + event.name.s= "xcap-diff"; + event.name.len= 9; + + event.content_type.s= "application/xcap-diff+xml"; + event.content_type.len= 25; + + event.type= PUBL_TYPE; + event.default_expires= 3600; + if(pres_add_event(&event)< 0) + { + LM_ERR("while adding event xcap-diff\n"); + return -1; + } + LM_DBG("added 'xcap-diff' event to presence module\n"); + } + return 0; } /* diff --git a/modules/presence_xml/presence_xml.c b/modules/presence_xml/presence_xml.c index 45fcbd5..3ffff5c 100644 --- a/modules/presence_xml/presence_xml.c +++ b/modules/presence_xml/presence_xml.c @@ -94,6 +94,7 @@ int disable_presence = 0; int disable_winfo = 0; int disable_bla = 1; int passive_mode = 0; +int disable_xcapdiff = 0; str xcapauth_userdel_reason = str_init("probation"); /** SL API structure */ @@ -126,6 +127,7 @@ static param_export_t params[]={ { "disable_presence", INT_PARAM, &disable_presence }, { "disable_winfo", INT_PARAM, &disable_winfo }, { "disable_bla", INT_PARAM, &disable_bla }, + { "disable_xcapdiff", INT_PARAM, &disable_xcapdiff }, { "passive_mode", INT_PARAM, &passive_mode }, { "xcapauth_userdel_reason", STR_PARAM, &xcapauth_userdel_reason.s}, { 0, 0, 0}

1 0

[tracker] Comment added: tm doesn't relay changed 'To' header in CANCEL before dialog is established
by sip-router 04 Sep '13

04 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#325 - tm doesn't relay changed 'To' header in CANCEL before dialog is established User who did this - Trip Volpe (tvolpe) ---------- To revisit this issue, I'm wondering why the check in t_cancel.c is necessary at all. If the UAC buffer contains a different to-URI, shouldn't that always be used, especially since the comment above indicates that the CANCEL should be constructed from the INVITE that was *sent out*, not the one that was received? In particular, is there a reason that this patch is not a solution to the problem? https://github.com/mraccident/kamailio/commit/c6d0062aac8c50594abd7b927ad0d… That is, is there a circumstance under which you'd want the received to-URI to override the one in the sent INVITE, in the cases where they differ? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=325#comment1064 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

fixup causing crash in rtpproxy-ng module
by Hugh Waite 03 Sep '13

03 Sep '13

Hello, I have discovered another crash in the mediaproxy-ng module. The config line that causes it is: rtpproxy_manage("fco+SP", $hdr(X-Origin-IP)); where the hdr PV holds a valid IP address. I think this is an issue with the fixup functions, but different functions have different ways of converting. Can someone explain which is the current recommended format? static cmd_export_t cmds[] = { ... {"rtpproxy_offer", (cmd_function)rtpproxy_offer2_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"rtpproxy_manage", (cmd_function)rtpproxy_manage2, 2, fixup_spve_str, fixup_free_spve_str, ANY_ROUTE}, ... static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) { str flags, new_ip; get_str_fparam(&flags, msg, (fparam_t *) param1); get_str_fparam(&new_ip, msg, (fparam_t *) param2); return force_rtp_proxy(msg, flags.s, &new_ip, OP_OFFER); } static int rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip) { str flag_str; str ip_str; fixup_get_svalue(msg, (gparam_p)flags, &flag_str); fixup_get_svalue(msg, (gparam_p)ip, &ip_str); return rtpproxy_manage(msg, flag_str.s, &ip_str); } If the function uses fixup_spve_str, should rtpproxy_manage2() be using get_str_fparam() instead of fixup_get_svalue() for the second parameter (or even both parameters)? I notice that rtpproxy_offer2_f() is using get_str_fparam() for both parameters when the fixup function is fixup_spve_spve, and there is no fixup_free function. Regards, Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

2 1

git:master: acc: option to write dialog-based cdrs to database
by Daniel-Constantin Mierla 03 Sep '13

03 Sep '13

Module: sip-router Branch: master Commit: 70ec02cfc9a203ea100d6550be3aa5f51f4fa473 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70ec02c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 16:16:30 2013 +0200 acc: option to write dialog-based cdrs to database - new module parameter cdrs_table has to be set and classic db accounting enabled at compile time and db_url set - cdr_log_enable - new parameter to turn off writing cdrs to syslog, cdr_enable being now used as top level control flag for both cdrs to syslog or db --- modules/acc/README | 82 +++++++++++++++++++---------- modules/acc/acc.c | 9 +++- modules/acc/acc.h | 1 + modules/acc/acc_cdr.c | 113 +++++++++++++++++++++++++++++++++++++---- modules/acc/acc_mod.c | 11 +++- modules/acc/acc_mod.h | 2 + modules/acc/doc/acc_admin.xml | 49 ++++++++++++++--- 7 files changed, 216 insertions(+), 51 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=70e…

1 0

git:master: acc: increment crt position when adding extra time value
by Daniel-Constantin Mierla 03 Sep '13

03 Sep '13

Module: sip-router Branch: master Commit: 4812b91a3c00e71a3ac9636b88bc75e5368fa657 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4812b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 15:11:47 2013 +0200 acc: increment crt position when adding extra time value --- modules/acc/acc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/acc/acc.c b/modules/acc/acc.c index 272a70f..91affb3 100644 --- a/modules/acc/acc.c +++ b/modules/acc/acc.c @@ -412,9 +412,11 @@ int acc_db_request( struct sip_msg *rq) /* extra time value */ if(acc_time_mode==1) { VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_usec; + i++; } else if(acc_time_mode==2) { VAL_DOUBLE(db_vals+(m++)) = ((double)(acc_env.tv.tv_sec * 1000) + (acc_env.tv.tv_usec / 1000)) / 1000; + i++; } /* extra columns */

1 0

git:master: Makefiles.defs: version set to 4.1.0-dev8
by Daniel-Constantin Mierla 03 Sep '13

03 Sep '13

Module: sip-router Branch: master Commit: 4c917438596852b3870ce0236bad8cbd04961270 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c91743… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 14:31:58 2013 +0200 Makefiles.defs: version set to 4.1.0-dev8 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index ffb06c7..ccd4b3f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev7 +EXTRAVERSION = -dev8 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master: acc: updated readme with the new parameters
by Daniel-Constantin Mierla 03 Sep '13

03 Sep '13

Module: sip-router Branch: master Commit: ea6514c2af00561643af6a2b671fbd4411048ca1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6514c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 13:47:24 2013 +0200 acc: updated readme with the new parameters --- modules/acc/README | 51 +++++++++++++++++++++++++++++++------ modules/acc/doc/acc_admin.xml | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/modules/acc/README b/modules/acc/README index 694f43d..c266803 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -125,6 +125,8 @@ Sven Knoblich 6.42. cdr_start_id (string) 6.43. cdr_end_id (string) 6.44. cdr_duration_id (string) + 6.45. time_mode (int) + 6.46. time_attr (str) 7. Functions @@ -181,10 +183,12 @@ Sven Knoblich 1.42. cdr_start_id example 1.43. cdr_end_id example 1.44. cdr_duration_id example - 1.45. acc_log_request usage - 1.46. acc_db_request usage - 1.47. acc_rad_request usage - 1.48. acc_diam_request usage + 1.45. time_mode example + 1.46. time_attr example + 1.47. acc_log_request usage + 1.48. acc_db_request usage + 1.49. acc_rad_request usage + 1.50. acc_diam_request usage Chapter 1. Admin Guide @@ -273,6 +277,8 @@ Chapter 1. Admin Guide 6.42. cdr_start_id (string) 6.43. cdr_end_id (string) 6.44. cdr_duration_id (string) + 6.45. time_mode (int) + 6.46. time_attr (str) 7. Functions @@ -679,6 +685,8 @@ $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. time_mode (int) + 6.46. time_attr (str) 6.1. early_media (integer) @@ -1145,6 +1153,33 @@ modparam("acc", "cdr_end_id", "end") Example 1.44. cdr_duration_id example modparam("acc", "cdr_duration_id", "start") +6.45. time_mode (int) + + Store additional value related to the time of event. + + 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. + * 3 - save seconds.miliseconds in time_attr. + + Example 1.45. time_mode example +modparam("acc", "time_mode", 1) + +6.46. time_attr (str) + + Name of the syslog attribute or database column where to store + additional value related to the time of event. + + For db accounting, the column has to be of different types, depending + on time_mode value. When time_mode is: + * 1 - time_attr column has to be int. + * 2 - time_attr column has to be double. + + Example 1.46. time_attr example +modparam("acc", "time_attr", "micorsecs") + 7. Functions 7.1. acc_log_request(comment) @@ -1164,7 +1199,7 @@ modparam("acc", "cdr_duration_id", "start") This function can be used from ANY_ROUTE. - Example 1.45. acc_log_request usage + Example 1.47. acc_log_request usage ... acc_log_request("Some comment"); ... @@ -1182,7 +1217,7 @@ acc_log_request("Some comment"); This function can be used from ANY_ROUTE. - Example 1.46. acc_db_request usage + Example 1.48. acc_db_request usage ... acc_db_request("Some comment", "SomeTable"); acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); @@ -1198,7 +1233,7 @@ acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); This function can be used from ANY_ROUTE. - Example 1.47. acc_rad_request usage + Example 1.49. acc_rad_request usage ... acc_rad_request("Some comment"); ... @@ -1213,7 +1248,7 @@ acc_rad_request("Some comment"); This function can be used from ANY_ROUTE. - Example 1.48. acc_diam_request usage + Example 1.50. acc_diam_request usage ... acc_diam_request("Some comment"); ... diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 869ea8c..fb40555 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1233,6 +1233,62 @@ modparam("acc", "cdr_duration_id", "start") </programlisting> </example> </section> + <section id="acc.p.time_mode"> + <title><varname>time_mode</varname> (int)</title> + <para> + Store additional value related to the time of event. + </para> + <para> + Values can be: + </para> + <itemizedlist> + <listitem> + <para><emphasis>0</emphasis> - (default), save only unix + 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> + </listitem> + <listitem> + <para><emphasis>3</emphasis> - save seconds.miliseconds + in time_attr.</para> + </listitem> + </itemizedlist> + + <example> + <title>time_mode example</title> + <programlisting format="linespecific"> +modparam("acc", "time_mode", 1) +</programlisting> + </example> + </section> + <section id="acc.p.time_attr"> + <title><varname>time_attr</varname> (str)</title> + <para> + Name of the syslog attribute or database column where to store additional + value related to the time of event. + </para> + <para> + For db accounting, the column has to be of different types, depending on + time_mode value. When time_mode is: + </para> + <itemizedlist> + <listitem> + <para><emphasis>1</emphasis> - time_attr column has to be int.</para> + </listitem> + <listitem> + <para><emphasis>2</emphasis> - time_attr column has to be double.</para> + </listitem> + </itemizedlist> + + <example> + <title>time_attr example</title> + <programlisting format="linespecific"> +modparam("acc", "time_attr", "micorsecs") +</programlisting> + </example> + </section> </section> <section>

1 0

git:master: acc: new parameter time_mode
by Daniel-Constantin Mierla 03 Sep '13

03 Sep '13

Module: sip-router Branch: master Commit: d7884500e89d32bffd34e915b473458645c6dedf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d788450… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 3 13:28:54 2013 +0200 acc: new parameter time_mode - store additional time value in time_attr attribute/db column - if time_mode==1, then time_attr stores the microseconds - if time_mode==2, then time_attr store the seconds.miliseconds (proposed by FS#163) - if time_mode==0 (default), then it is like now, only timestamp stored - time_attr value can be set via parameter with same name - it represents syslog value or db table column - for db accounting, when time_mode==1, the type of column has to be int, and for time_mode==2, the type of column has to be double - features implemented only for syslog and db accounting --- modules/acc/acc.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- modules/acc/acc_api.h | 4 +++- modules/acc/acc_mod.c | 13 ++++++++++++- modules/acc/acc_mod.h | 4 ++++ 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/modules/acc/acc.c b/modules/acc/acc.c index 0a563d6..7f08f17 100644 --- a/modules/acc/acc.c +++ b/modules/acc/acc.c @@ -95,9 +95,9 @@ extern int acc_db_insert_mode; /* 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]; -static int int_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG]; -static char type_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG]; +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]; /******************************************** * acc CORE function @@ -173,7 +173,9 @@ int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals) c_vals[5] = acc_env.reason; t_vals[5] = TYPE_STR; - acc_env.ts = time(NULL); + gettimeofday(&acc_env.tv, NULL); + acc_env.ts = acc_env.tv.tv_sec; + return ACC_CORE_LEN; } @@ -275,8 +277,23 @@ int acc_log_request( struct sip_msg *rq) *(p++) = '\n'; *(p++) = 0; - LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu%s", - acc_env.text.len, acc_env.text.s,(unsigned long) acc_env.ts, log_msg); + 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, + log_msg); + } else if(acc_time_mode==2) { + LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%.3f%s", + acc_env.text.len, acc_env.text.s,(unsigned long) acc_env.ts, + acc_time_attr.s, + (((double)(acc_env.tv.tv_sec * 1000) + + (acc_env.tv.tv_usec / 1000)) / 1000), + log_msg); + } else { + LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu%s", + acc_env.text.len, acc_env.text.s,(unsigned long) acc_env.ts, + log_msg); + } return 1; } @@ -289,8 +306,8 @@ 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+1+MAX_ACC_EXTRA+MAX_ACC_LEG]; -static db_val_t db_vals[ACC_CORE_LEN+1+MAX_ACC_EXTRA+MAX_ACC_LEG]; +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]; static void acc_db_init_keys(void) @@ -311,6 +328,9 @@ static void acc_db_init_keys(void) db_keys[n++] = &acc_sipreason_col; 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;; + } /* init the extra db keys */ for(extra=db_extra; extra ; extra=extra->next) @@ -326,6 +346,11 @@ static void acc_db_init_keys(void) VAL_NULL(db_vals+i)=0; } VAL_TYPE(db_vals+time_idx)=DB1_DATETIME; + if(acc_time_mode==1) { + VAL_TYPE(db_vals+time_idx+1)=DB1_INT; + } else if(acc_time_mode==2) { + VAL_TYPE(db_vals+time_idx+1)=DB1_DOUBLE; + } } @@ -384,6 +409,13 @@ int acc_db_request( struct sip_msg *rq) VAL_STR(db_vals+i) = val_arr[i]; /* time value */ 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_usec; + } else if(acc_time_mode==2) { + VAL_DOUBLE(db_vals+(m++)) = ((acc_env.tv.tv_sec * 1000) + + (acc_env.tv.tv_usec / 1000)) / 1000; + } /* extra columns */ m += extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m); diff --git a/modules/acc/acc_api.h b/modules/acc/acc_api.h index bc52eee..aa51380 100644 --- a/modules/acc/acc_api.h +++ b/modules/acc/acc_api.h @@ -36,6 +36,7 @@ #include <stdio.h> #include <string.h> +#include <sys/time.h> #include "../../str.h" #include "../../dprint.h" @@ -57,6 +58,7 @@ typedef struct acc_enviroment { struct hdr_field *to; str text; time_t ts; + struct timeval tv; } acc_enviroment_t; /* acc extra parameter */ @@ -104,7 +106,7 @@ typedef struct acc_engine { #define MAX_ACC_EXTRA 64 #define MAX_ACC_LEG 16 -#define ACC_CORE_LEN 6 +#define ACC_CORE_LEN 6 enum {TYPE_NULL = 0, TYPE_INT, TYPE_STR}; diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index 9f40e14..e127603 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -110,6 +110,14 @@ static char* leg_info_str = 0; /*!< multi call-leg support */ struct acc_extra *leg_info = 0; int acc_prepare_flag = -1; /*!< should the request be prepared for later acc */ +/* ----- time mode variables ------- */ +/*! \name AccTimeModeVariables Time Mode Variables */ +/*@{*/ + +int acc_time_mode = 0; +str acc_time_attr = str_init("time_attr"); + +/*@}*/ /* ----- SYSLOG acc variables ----------- */ /*! \name AccSyslogVariables Syslog Variables */ @@ -138,7 +146,7 @@ str cdr_start_str = str_init("st"); str cdr_end_str = str_init("et"); str cdr_duration_str = str_init("d"); -/*@{*/ +/*@}*/ /* ----- RADIUS acc variables ----------- */ /*! \name AccRadiusVariables Radius Variables */ @@ -291,6 +299,9 @@ static param_export_t params[] = { {"acc_time_column", STR_PARAM, &acc_time_col.s }, {"db_insert_mode", INT_PARAM, &acc_db_insert_mode }, #endif + /* time-mode-specific */ + {"time_mode", INT_PARAM, &acc_time_mode }, + {"time_attr", PARAM_STR, &acc_time_attr }, {0,0,0} }; diff --git a/modules/acc/acc_mod.h b/modules/acc/acc_mod.h index 5e7792a..07a7dc1 100644 --- a/modules/acc/acc_mod.h +++ b/modules/acc/acc_mod.h @@ -94,5 +94,9 @@ extern str acc_sipreason_col; extern str acc_time_col; #endif /* SQL_ACC */ +/* time mode */ +extern int acc_time_mode; +extern str acc_time_attr; + #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013