June 2015 - sr-dev - kamailio.org

git:master:c1863d7d: added homer5 functionality to sipcapture module
by Alexandr Dubovikov 01 Jun '15

01 Jun '15

Module: kamailio Branch: master Commit: c1863d7dc5d7504a8096e9a31dfc200f5e14dd03 URL: https://github.com/kamailio/kamailio/commit/c1863d7dc5d7504a8096e9a31dfc200… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2015-06-01T11:43:21+02:00 added homer5 functionality to sipcapture module --- Modified: modules/sipcapture/examples/kamailio.cfg Modified: modules/sipcapture/hep.c Modified: modules/sipcapture/sipcapture.c Modified: modules/sipcapture/sipcapture.h Removed: modules/sipcapture/examples/partrotate_unixtimestamp.pl --- Diff: https://github.com/kamailio/kamailio/commit/c1863d7dc5d7504a8096e9a31dfc200… Patch: https://github.com/kamailio/kamailio/commit/c1863d7dc5d7504a8096e9a31dfc200…

1 0

git:master:fccfde47: Update sipcapture.c
by Alexandr Dubovikov 01 Jun '15

01 Jun '15

Module: kamailio Branch: master Commit: fccfde474e12e7ef51aaef132f4d4bf1600a35a6 URL: https://github.com/kamailio/kamailio/commit/fccfde474e12e7ef51aaef132f4d4bf… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2015-05-05T14:55:42+02:00 Update sipcapture.c fixed struct tm capt_ts; Thanks Max Muehlbronner for report. --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/fccfde474e12e7ef51aaef132f4d4bf… Patch: https://github.com/kamailio/kamailio/commit/fccfde474e12e7ef51aaef132f4d4bf… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 15fd935..3d43455 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1098,6 +1098,7 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu _capture_mode_data_t *c = NULL; char strftime_buf[128]; time_t tvsec_; + struct tm capt_ts; c = (cm_data)? cm_data:capture_def;

1 0

git:master:261a7b88: Update sipcapture.c
by Alexandr Dubovikov 01 Jun '15

01 Jun '15

Module: kamailio Branch: master Commit: 261a7b88b8c4139e1f6e7252b56f8a783bbacba7 URL: https://github.com/kamailio/kamailio/commit/261a7b88b8c4139e1f6e7252b56f8a7… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2015-04-08T22:41:52+02:00 Update sipcapture.c optimized table value --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/261a7b88b8c4139e1f6e7252b56f8a7… Patch: https://github.com/kamailio/kamailio/commit/261a7b88b8c4139e1f6e7252b56f8a7… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 1f475d2..15fd935 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1096,7 +1096,6 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu str *table = NULL; _capture_mode_data_t *c = NULL; - str newtable; char strftime_buf[128]; time_t tvsec_; @@ -1343,12 +1342,12 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu return -1; } - newtable.len = strftime(strftime_buf, sizeof(strftime_buf), table->s, &capt_ts); - newtable.s = strftime_buf; + table->len = strftime(strftime_buf, sizeof(strftime_buf), table->s, &capt_ts); + table->s = strftime_buf; /* check dynamic table */ - LM_DBG("insert into homer table: [%.*s]\n", newtable->len, newtable->s); - c->db_funcs.use_table(c->db_con, newtable); + LM_DBG("insert into homer table: [%.*s]\n", table->len, table->s); + c->db_funcs.use_table(c->db_con, table); LM_DBG("storing info...\n");

1 0

git:master:ee721099: Update sipcapture.c
by Alexandr Dubovikov 01 Jun '15

01 Jun '15

Module: kamailio Branch: master Commit: ee721099deb6e48a4cd875b3d28ccfd763fb118b URL: https://github.com/kamailio/kamailio/commit/ee721099deb6e48a4cd875b3d28ccfd… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2015-04-08T22:32:17+02:00 Update sipcapture.c added timestamp --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ee721099deb6e48a4cd875b3d28ccfd… Patch: https://github.com/kamailio/kamailio/commit/ee721099deb6e48a4cd875b3d28ccfd… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 42df2c3..1f475d2 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1096,6 +1096,10 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu str *table = NULL; _capture_mode_data_t *c = NULL; + str newtable; + char strftime_buf[128]; + time_t tvsec_; + c = (cm_data)? cm_data:capture_def; if (!c){ @@ -1117,7 +1121,7 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu db_keys[0] = &date_column; db_vals[0].type = DB1_DATETIME; db_vals[0].nul = 0; - db_vals[0].val.time_val = time(NULL); + db_vals[0].val.time_val = (sco->tmstamp/1000000); db_keys[1] = &micro_ts_column; db_vals[1].type = DB1_BIGINT; @@ -1332,10 +1336,19 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu table = &c->table_names[ii]; } + tvsec_ = (time_t) (sco->tmstamp/1000000); + if(gmtime_r( &tvsec_, &capt_ts) == NULL) + { + LM_ERR("unable to set gmtime for sipcapture\n"); + return -1; + } + + newtable.len = strftime(strftime_buf, sizeof(strftime_buf), table->s, &capt_ts); + newtable.s = strftime_buf; /* check dynamic table */ - LM_DBG("insert into homer table: [%.*s]\n", table->len, table->s); - c->db_funcs.use_table(c->db_con, table); + LM_DBG("insert into homer table: [%.*s]\n", newtable->len, newtable->s); + c->db_funcs.use_table(c->db_con, newtable); LM_DBG("storing info...\n");

1 0

[kamailio] added homer5 functionality (#183)
by Alexandr Dubovikov 01 Jun '15

01 Jun '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/183 -- Commit Summary -- * Update sipcapture.c * Update sipcapture.c * Update sipcapture.c * added homer5 functionality to sipcapture module -- File Changes -- M modules/sipcapture/examples/kamailio.cfg (53) D modules/sipcapture/examples/partrotate_unixtimestamp.pl (161) M modules/sipcapture/hep.c (13) M modules/sipcapture/sipcapture.c (323) M modules/sipcapture/sipcapture.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/183.patch https://github.com/kamailio/kamailio/pull/183.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/183

1 1