sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:5.1:edbfa1ea: usrloc: partion column name can be set via modparam
by Ãyvind Kolbu 03 Jan '18

03 Jan '18

Module: kamailio Branch: 5.1 Commit: edbfa1eae2df1b932dff0bf5b7182ef09592a37d URL: https://github.com/kamailio/kamailio/commit/edbfa1eae2df1b932dff0bf5b7182ef… Author: Oyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2018-01-02T13:30:54+01:00 usrloc: partion column name can be set via modparam (cherry picked from commit b933b2a7bf631b157bf81b86afffe6b8a43a0308) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/edbfa1eae2df1b932dff0bf5b7182ef… Patch: https://github.com/kamailio/kamailio/commit/edbfa1eae2df1b932dff0bf5b7182ef… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index f7ac066c29..96ff750f97 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -516,6 +516,26 @@ modparam("usrloc", "keepalive_column", "kalive") </example> </section> + <section id="usrloc.p.partition_column"> + <title><varname>partition_column</varname> (string)</title> + <para> + Name of database table column containing the value for partition id. + </para> + <para> + <emphasis> + Default value is <quote>partition</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>partitioncolumn</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "partition_column", "part") +... +</programlisting> + </example> + </section> + <section id="usrloc.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 3191e1bb1e..2eb9037f24 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -218,6 +218,7 @@ static param_export_t params[] = { {"server_id_column", PARAM_STR, &srv_id_col }, {"connection_id_column",PARAM_STR, &con_id_col }, {"keepalive_column", PARAM_STR, &keepalive_col }, + {"partition_column", PARAM_STR, &partition_col }, {"matching_mode", INT_PARAM, &matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows },

3 2

P-Server Exiting whenever Registered one user
by Prasannakumar Merugu 03 Jan '18

03 Jan '18

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.0.5 version P-Server is exiting, Jitsi client getting registered I'm attached the below P-server logs file. -- *Thanks,* *Prasannakumar Merugu9010028290*

1 0

Re: [sr-dev] [SR-Users] Happy New Year 2018!
by Angel Elena 02 Jan '18

02 Jan '18

happy new year and happy sip ;) ----------------------------------------------- Ángel Elena Medina _o) craem(a)craem.net / \ http://blog.craem.net _(___V @craem_ ----------------------------------------------- Zarafa / Zpush Mobile. -------- Mensaje original -------- De: voipspace voipspace <voipspace(a)yandex.com> Fecha: 2/1/18 20:35 (GMT+01:00) Para: miconda(a)gmail.com, "Kamailio (SER) - Users Mailing List" <sr-users(a)lists.kamailio.org>, "Kamailio (SER) - Devel Mailing List" <sr-dev(a)lists.kamailio.org>, business(a)lists.kamailio.org Asunto: Re: [SR-Users] Happy New Year 2018! Happy New Year, Every One. Hope you had great time off with family and friends. May 2018 be prosperous and happy for you all. On to bigger and greater thing in the new year. bw Kamailio is awesome! 01.01.2018, 11:09, "Daniel-Constantin Mierla" <miconda(a)gmail.com>: > A Happy And Prosperous Year 2018 to everyone using Kamailio and helping > to improve the project! > > Looking forward to meeting many of you around this world during 2018 and > collaborate online in a friendly environment! > > Daniel > > -- > Daniel-Constantin Mierla > www.twitter.com/miconda -- www.linkedin.com/in/miconda > Kamailio Advanced Training - www.asipto.com > Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com > > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users

1 0

Happy New Year 2018!
by Daniel-Constantin Mierla 02 Jan '18

02 Jan '18

A Happy And Prosperous Year 2018 to everyone using Kamailio and helping to improve the project! Looking forward to meeting many of you around this world during 2018 and collaborate online in a friendly environment! Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

2 1

git:master:42b29a59: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 02 Jan '18

02 Jan '18

Module: kamailio Branch: master Commit: 42b29a5989671aa1e9383fbf395fa09184a3ae02 URL: https://github.com/kamailio/kamailio/commit/42b29a5989671aa1e9383fbf395fa09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-02T18:31:32+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/42b29a5989671aa1e9383fbf395fa09… Patch: https://github.com/kamailio/kamailio/commit/42b29a5989671aa1e9383fbf395fa09…

1 0

git:master:b7e178b1: acc: docs - removed wrong closing tag for para
by Daniel-Constantin Mierla 02 Jan '18

02 Jan '18

Module: kamailio Branch: master Commit: b7e178b163cdc68487b14a70e36a21c57bbaaa7b URL: https://github.com/kamailio/kamailio/commit/b7e178b163cdc68487b14a70e36a21c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-02T18:22:57+01:00 acc: docs - removed wrong closing tag for para --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b7e178b163cdc68487b14a70e36a21c… Patch: https://github.com/kamailio/kamailio/commit/b7e178b163cdc68487b14a70e36a21c… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 36022585bb..6e1509b08b 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1209,7 +1209,6 @@ modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" <para> Default value is 0. </para> - </para> <example> <title>cdr_extra_nullable example</title> <programlisting format="linespecific">

1 0

git:master:4b6bb1a5: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 02 Jan '18

02 Jan '18

Module: kamailio Branch: master Commit: 4b6bb1a59312441714ee765c3aa2f39292f5b612 URL: https://github.com/kamailio/kamailio/commit/4b6bb1a59312441714ee765c3aa2f39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-02T18:16:35+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/4b6bb1a59312441714ee765c3aa2f39… Patch: https://github.com/kamailio/kamailio/commit/4b6bb1a59312441714ee765c3aa2f39…

1 0

git:master:d9913e41: acc: Allow nullable cdr extra fields
by Carlos Cruz 02 Jan '18

02 Jan '18

Module: kamailio Branch: master Commit: d9913e414b7f611c07edb4c45f1ecc6dc880b2fa URL: https://github.com/kamailio/kamailio/commit/d9913e414b7f611c07edb4c45f1ecc6… Author: Carlos Cruz <carlos(a)irontec.com> Committer: Carlos Cruz <carlos(a)irontec.com> Date: 2017-12-22T17:49:30+01:00 acc: Allow nullable cdr extra fields - allow custom cdr fields defined with cdr_extra modparam to be saved as null. Before this change, cdr_extra variables not defined in config operation (or set to $null) were saved as empty string (''). This commit makes possible to save them as NULL value. - new modparam to make this behaviour configurable: cdr_extra_nullable. Set it to 1 to enable this new behaviour (default value: 0) --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/acc_mod.h Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d9913e414b7f611c07edb4c45f1ecc6… Patch: https://github.com/kamailio/kamailio/commit/d9913e414b7f611c07edb4c45f1ecc6… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index f29f139e2d..6a7862dd74 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -238,9 +238,14 @@ static int db_write_cdr( struct dlg_cell* dialog, for( ; i<m; i++) { db_cdr_keys[i] = &cdr_attrs[i]; - VAL_TYPE(db_cdr_vals+i)=DB1_STR; - VAL_NULL(db_cdr_vals+i)=0; - VAL_STR(db_cdr_vals+i) = cdr_value_array[i]; + + if (cdr_extra_nullable == 1 && cdr_type_array[i] == TYPE_NULL) { + VAL_NULL(db_cdr_vals + i) = 1; + } else { + VAL_TYPE(db_cdr_vals+i)=DB1_STR; + VAL_NULL(db_cdr_vals+i)=0; + VAL_STR(db_cdr_vals+i) = cdr_value_array[i]; + } } if (df->use_table(dh, &acc_cdrs_table /*table*/) < 0) { diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 2de42e8e8d..959bd8b0ca 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -115,6 +115,7 @@ struct acc_extra *log_extra = 0; /*!< Log extra attributes */ /*@{*/ int cdr_enable = 0; +int cdr_extra_nullable = 0; int cdr_log_enable = 1; int cdr_start_on_confirmed = 0; int cdr_expired_dlg_enable = 0; @@ -204,6 +205,7 @@ static param_export_t params[] = { {"cdr_start_on_confirmed", INT_PARAM, &cdr_start_on_confirmed }, {"cdr_facility", PARAM_STRING, &cdr_facility_str }, {"cdr_extra", PARAM_STRING, &cdr_log_extra_str }, + {"cdr_extra_nullable", INT_PARAM, &cdr_extra_nullable }, {"cdr_start_id", PARAM_STR, &cdr_start_str }, {"cdr_end_id", PARAM_STR, &cdr_end_str }, {"cdr_duration_id", PARAM_STR, &cdr_duration_str }, @@ -474,6 +476,12 @@ static int mod_init( void ) return -1; } + if( cdr_extra_nullable < 0 || cdr_extra_nullable > 1) + { + LM_ERR("cdr_extra_nullable is out of range\n"); + return -1; + } + if( cdr_expired_dlg_enable < 0 || cdr_expired_dlg_enable > 1) { LM_ERR("cdr_expired_dlg_enable is out of range\n"); diff --git a/src/modules/acc/acc_mod.h b/src/modules/acc/acc_mod.h index 220bce41a5..a28721cdea 100644 --- a/src/modules/acc/acc_mod.h +++ b/src/modules/acc/acc_mod.h @@ -49,6 +49,7 @@ extern int log_flag; extern int log_missed_flag; extern int cdr_enable; +extern int cdr_extra_nullable; extern int cdr_start_on_confirmed; extern int cdr_log_facility; extern int cdr_expired_dlg_enable; diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index e9efa8f5ea..36022585bb 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1194,6 +1194,28 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") ... modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" ... +</programlisting> + </example> + </section> + <section id="acc.p.cdr_extra_nullable"> + <title><varname>cdr_extra_nullable</varname> (integer)</title> + <para> + Should custom CDR fields be saved as NULL? + </para> + <para> + If set to 0, custom CDR fields not defined in config operation (or set to $null) will be saved as empty string. + If set to 1, custom CDR fields not defined in config operation (or set to $null) will be saved as NULL. + </para> + <para> + Default value is 0. + </para> + </para> + <example> + <title>cdr_extra_nullable example</title> + <programlisting format="linespecific"> +... +modparam("acc", "cdr_extra_nullable", 1) +... </programlisting> </example> </section>

1 0

git:master:d425a89e: Merge pull request #1385 from cruzccl/acc-nullable-cdrextra
by GitHub 02 Jan '18

02 Jan '18

Module: kamailio Branch: master Commit: d425a89e963ccd972b6b8826d5785262f949d863 URL: https://github.com/kamailio/kamailio/commit/d425a89e963ccd972b6b8826d578526… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-02T17:54:39+01:00 Merge pull request #1385 from cruzccl/acc-nullable-cdrextra acc: Allow nullable cdr extra fields --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/acc_mod.h Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d425a89e963ccd972b6b8826d578526… Patch: https://github.com/kamailio/kamailio/commit/d425a89e963ccd972b6b8826d578526… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index f29f139e2d..6a7862dd74 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -238,9 +238,14 @@ static int db_write_cdr( struct dlg_cell* dialog, for( ; i<m; i++) { db_cdr_keys[i] = &cdr_attrs[i]; - VAL_TYPE(db_cdr_vals+i)=DB1_STR; - VAL_NULL(db_cdr_vals+i)=0; - VAL_STR(db_cdr_vals+i) = cdr_value_array[i]; + + if (cdr_extra_nullable == 1 && cdr_type_array[i] == TYPE_NULL) { + VAL_NULL(db_cdr_vals + i) = 1; + } else { + VAL_TYPE(db_cdr_vals+i)=DB1_STR; + VAL_NULL(db_cdr_vals+i)=0; + VAL_STR(db_cdr_vals+i) = cdr_value_array[i]; + } } if (df->use_table(dh, &acc_cdrs_table /*table*/) < 0) { diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 2de42e8e8d..959bd8b0ca 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -115,6 +115,7 @@ struct acc_extra *log_extra = 0; /*!< Log extra attributes */ /*@{*/ int cdr_enable = 0; +int cdr_extra_nullable = 0; int cdr_log_enable = 1; int cdr_start_on_confirmed = 0; int cdr_expired_dlg_enable = 0; @@ -204,6 +205,7 @@ static param_export_t params[] = { {"cdr_start_on_confirmed", INT_PARAM, &cdr_start_on_confirmed }, {"cdr_facility", PARAM_STRING, &cdr_facility_str }, {"cdr_extra", PARAM_STRING, &cdr_log_extra_str }, + {"cdr_extra_nullable", INT_PARAM, &cdr_extra_nullable }, {"cdr_start_id", PARAM_STR, &cdr_start_str }, {"cdr_end_id", PARAM_STR, &cdr_end_str }, {"cdr_duration_id", PARAM_STR, &cdr_duration_str }, @@ -474,6 +476,12 @@ static int mod_init( void ) return -1; } + if( cdr_extra_nullable < 0 || cdr_extra_nullable > 1) + { + LM_ERR("cdr_extra_nullable is out of range\n"); + return -1; + } + if( cdr_expired_dlg_enable < 0 || cdr_expired_dlg_enable > 1) { LM_ERR("cdr_expired_dlg_enable is out of range\n"); diff --git a/src/modules/acc/acc_mod.h b/src/modules/acc/acc_mod.h index 220bce41a5..a28721cdea 100644 --- a/src/modules/acc/acc_mod.h +++ b/src/modules/acc/acc_mod.h @@ -49,6 +49,7 @@ extern int log_flag; extern int log_missed_flag; extern int cdr_enable; +extern int cdr_extra_nullable; extern int cdr_start_on_confirmed; extern int cdr_log_facility; extern int cdr_expired_dlg_enable; diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index e9efa8f5ea..36022585bb 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1194,6 +1194,28 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") ... modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" ... +</programlisting> + </example> + </section> + <section id="acc.p.cdr_extra_nullable"> + <title><varname>cdr_extra_nullable</varname> (integer)</title> + <para> + Should custom CDR fields be saved as NULL? + </para> + <para> + If set to 0, custom CDR fields not defined in config operation (or set to $null) will be saved as empty string. + If set to 1, custom CDR fields not defined in config operation (or set to $null) will be saved as NULL. + </para> + <para> + Default value is 0. + </para> + </para> + <example> + <title>cdr_extra_nullable example</title> + <programlisting format="linespecific"> +... +modparam("acc", "cdr_extra_nullable", 1) +... </programlisting> </example> </section>

1 0

[kamailio/kamailio] acc: Allow nullable cdr extra fields (#1385)
by Carlos Cruz Luengo 02 Jan '18

02 Jan '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1378 #### Description - allow custom cdr fields defined with cdr_extra modparam to be saved as null. Before this change, cdr_extra variables not defined in config operation (or set to $null) were saved as empty string (''). This commit makes possible to save them as NULL value. - new modparam to make this behaviour configurable: cdr_extra_nullable. Set it to 1 to enable this new behaviour (default value: 0) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1385 -- Commit Summary -- * acc: Allow nullable cdr extra fields -- File Changes -- M src/modules/acc/acc_cdr.c (11) M src/modules/acc/acc_mod.c (8) M src/modules/acc/acc_mod.h (1) M src/modules/acc/doc/acc_admin.xml (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1385.patch https://github.com/kamailio/kamailio/pull/1385.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1385

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018