sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:7d041c41: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7d041c41d06773a5198f4e1a6461bdb1bd5b5351 URL: https://github.com/kamailio/kamailio/commit/7d041c41d06773a5198f4e1a6461bdb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-13T11:46:55+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/7d041c41d06773a5198f4e1a6461bdb… Patch: https://github.com/kamailio/kamailio/commit/7d041c41d06773a5198f4e1a6461bdb… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index f344c99b53..f56c64cad8 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1979,15 +1979,17 @@ kamcmd dlg.list _from_ _to_ _op_ 11.1. event_route[dialog:start] - Executed when 200OK for INVITE is processed. + Executed when 200OK reply for INVITE is processed. 11.2. event_route[dialog:end] - Executed when BYE is processed or dialog timed out. + Executed when the BYE for the call is processed or the dialog timed + out. 11.3. event_route[dialog:failed] - Executed when dialog is not completed (+300 reply to INVITE). + Executed when dialog is not completed (300 or greater reply code to + INVITE). Chapter 2. Developer Guide

6 years, 8 months

git:master:e23c50ae: dialog: small updates to docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e23c50aed89be717c0bc76e6fbfc902cf3deacb6 URL: https://github.com/kamailio/kamailio/commit/e23c50aed89be717c0bc76e6fbfc902… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-13T11:43:04+02:00 dialog: small updates to docs --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e23c50aed89be717c0bc76e6fbfc902… Patch: https://github.com/kamailio/kamailio/commit/e23c50aed89be717c0bc76e6fbfc902… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index e451ce4b9d..4823de489d 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2344,7 +2344,7 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { </programlisting> </section> <section> - <title><varname>dlg.end_dlg</varname></title> + <title>dlg.end_dlg</title> <para> Terminates an ongoing dialog by sending BYE in both directions. </para> @@ -2544,21 +2544,23 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <section> <title>Event Routes</title> <section> - <title><varname>event_route[dialog:start]</varname></title> + <title>event_route[dialog:start]</title> <para> - Executed when 200OK for INVITE is processed. + Executed when 200OK reply for INVITE is processed. </para> </section> <section> - <title><varname>event_route[dialog:end]</varname></title> + <title>event_route[dialog:end]</title> <para> - Executed when BYE is processed or dialog timed out. + Executed when the BYE for the call is processed + or the dialog timed out. </para> </section> <section> - <title><varname>event_route[dialog:failed]</varname></title> + <title>event_route[dialog:failed]</title> <para> - Executed when dialog is not completed (+300 reply to INVITE). + Executed when dialog is not completed (300 or greater reply code + to INVITE). </para> </section> </section>

6 years, 8 months

[kamailio/kamailio] carrierroute: warning for the same carrier/domain having routes with only 0 probability (#1233)

by hdikme

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1233 -- Commit Summary -- * carrierroute: warning for the same carrier/domain having routes with only 0 probability -- File Changes -- M src/modules/carrierroute/cr_db.c (34) M src/modules/carrierroute/cr_db.h (5) M src/modules/carrierroute/cr_func.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1233.patch https://github.com/kamailio/kamailio/pull/1233.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/1233

6 years, 8 months

git:master:e04716f4: seas: added guards to several include files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e04716f4f9325fa5290555823132455ea599daac URL: https://github.com/kamailio/kamailio/commit/e04716f4f9325fa5290555823132455… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-12T16:19:36+02:00 seas: added guards to several include files - bits of formating and removal of inline history --- Modified: src/modules/seas/cluster.h Modified: src/modules/seas/encode_allow.h Modified: src/modules/seas/encode_content_disposition.h Modified: src/modules/seas/encode_content_length.h Modified: src/modules/seas/encode_content_type.h Modified: src/modules/seas/encode_cseq.h Modified: src/modules/seas/encode_digest.h Modified: src/modules/seas/seas.c Modified: src/modules/seas/seas.h Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/e04716f4f9325fa5290555823132455… Patch: https://github.com/kamailio/kamailio/commit/e04716f4f9325fa5290555823132455…

6 years, 8 months

git:master:81ad6adb: Merge pull request #1233 from hdikme/master

by GitHub

Module: kamailio Branch: master Commit: 81ad6adb6456490bce9dfe019c22857713669a52 URL: https://github.com/kamailio/kamailio/commit/81ad6adb6456490bce9dfe019c22857… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2017-09-12T17:00:38+03:00 Merge pull request #1233 from hdikme/master carrierroute: warning for the same carrier/domain having routes with only 0 probability --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_func.c --- Diff: https://github.com/kamailio/kamailio/commit/81ad6adb6456490bce9dfe019c22857… Patch: https://github.com/kamailio/kamailio/commit/81ad6adb6456490bce9dfe019c22857… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index d651db1b49..010f99d715 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -265,6 +265,7 @@ int load_user_carrier(str * user, str * domain) { */ int load_route_data_db(struct route_data_t * rd) { db1_res_t * res = NULL; + db1_res_t * prob_res = NULL; db_row_t * row = NULL; int i, ret; struct carrier_data_t * tmp_carrier_data; @@ -352,6 +353,7 @@ int load_route_data_db(struct route_data_t * rd) { } } int n = 0; + boolean query_done = false; do { LM_DBG("loading, cycle %d", n++); for (i = 0; i < RES_ROW_N(res); ++i) { @@ -396,6 +398,35 @@ int load_route_data_db(struct route_data_t * rd) { p_tmp_comment) == -1) { goto errout; } + if (row->values[COL_PROB].val.double_val == 0 && !query_done) { + int ret_tmp; + char query_tmp[QUERY_LEN]; + str query_tmp_str; + + memset(query_tmp, 0, QUERY_LEN); + ret_tmp = snprintf(query_tmp, QUERY_LEN, "SELECT * FROM %.*s WHERE %.*s=%d and %.*s=%d and %.*s>%d", + carrierroute_table.len, carrierroute_table.s, columns[COL_CARRIER]->len, columns[COL_CARRIER]->s, row->values[COL_CARRIER].val.int_val, + columns[COL_DOMAIN]->len, columns[COL_DOMAIN]->s, row->values[COL_DOMAIN].val.int_val, columns[COL_PROB]->len, columns[COL_PROB]->s, 0); + + if (ret_tmp < 0) { + LM_ERR("error in snprintf while querying prob column"); + goto errout; + } + query_tmp_str.s = query_tmp; + query_tmp_str.len = ret_tmp; + + if (carrierroute_dbf.raw_query(carrierroute_dbh, &query_tmp_str, &prob_res) < 0) { + LM_ERR("Failed to query carrierroute db table based on prob column.\n"); + goto errout; + } + if(RES_ROW_N(prob_res) == 0) { + LM_ERR("Carrierroute db table contains route(s) with only 0 probability.\n"); + query_done = true; + } + carrierroute_dbf.free_result(carrierroute_dbh, prob_res); + prob_res = NULL; + } + } if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if(carrierroute_dbf.fetch_result(carrierroute_dbh, &res, cfg_get(carrierroute, carrierroute_cfg, fetch_rows)) < 0) { @@ -462,5 +493,8 @@ int load_route_data_db(struct route_data_t * rd) { if (res) { carrierroute_dbf.free_result(carrierroute_dbh, res); } + if (prob_res) { + carrierroute_dbf.free_result(carrierroute_dbh, prob_res); + } return -1; } diff --git a/src/modules/carrierroute/cr_db.h b/src/modules/carrierroute/cr_db.h index 1f53c9307b..ffea731192 100644 --- a/src/modules/carrierroute/cr_db.h +++ b/src/modules/carrierroute/cr_db.h @@ -88,4 +88,9 @@ int load_route_data_db (struct route_data_t * rd); int load_user_carrier(str * user, str * domain); +typedef enum { + false = 0, + true = 1 +} boolean; + #endif diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index 6b6db1387b..c4ce4d52a0 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -471,7 +471,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest avp_value_t cr_new_uri; if(rf->dice_max == 0) { - LM_ERR("invalid dice_max value\n"); + LM_ERR("invalid dice_max value (route has probability 0)\n"); return -1; } if ((prob = hash_func(msg, hash_source, rf->dice_max)) < 0) {

6 years, 8 months

git:master:9741bee7: carrierroute: warning for the same carrier/domain having routes with only 0 probability

by Huseyin Dikme

Module: kamailio Branch: master Commit: 9741bee7af8136b35af8e6279e530aa0ad54f574 URL: https://github.com/kamailio/kamailio/commit/9741bee7af8136b35af8e6279e530aa… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-09-12T15:37:17+02:00 carrierroute: warning for the same carrier/domain having routes with only 0 probability - While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_func.c --- Diff: https://github.com/kamailio/kamailio/commit/9741bee7af8136b35af8e6279e530aa… Patch: https://github.com/kamailio/kamailio/commit/9741bee7af8136b35af8e6279e530aa… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index d651db1b49..010f99d715 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -265,6 +265,7 @@ int load_user_carrier(str * user, str * domain) { */ int load_route_data_db(struct route_data_t * rd) { db1_res_t * res = NULL; + db1_res_t * prob_res = NULL; db_row_t * row = NULL; int i, ret; struct carrier_data_t * tmp_carrier_data; @@ -352,6 +353,7 @@ int load_route_data_db(struct route_data_t * rd) { } } int n = 0; + boolean query_done = false; do { LM_DBG("loading, cycle %d", n++); for (i = 0; i < RES_ROW_N(res); ++i) { @@ -396,6 +398,35 @@ int load_route_data_db(struct route_data_t * rd) { p_tmp_comment) == -1) { goto errout; } + if (row->values[COL_PROB].val.double_val == 0 && !query_done) { + int ret_tmp; + char query_tmp[QUERY_LEN]; + str query_tmp_str; + + memset(query_tmp, 0, QUERY_LEN); + ret_tmp = snprintf(query_tmp, QUERY_LEN, "SELECT * FROM %.*s WHERE %.*s=%d and %.*s=%d and %.*s>%d", + carrierroute_table.len, carrierroute_table.s, columns[COL_CARRIER]->len, columns[COL_CARRIER]->s, row->values[COL_CARRIER].val.int_val, + columns[COL_DOMAIN]->len, columns[COL_DOMAIN]->s, row->values[COL_DOMAIN].val.int_val, columns[COL_PROB]->len, columns[COL_PROB]->s, 0); + + if (ret_tmp < 0) { + LM_ERR("error in snprintf while querying prob column"); + goto errout; + } + query_tmp_str.s = query_tmp; + query_tmp_str.len = ret_tmp; + + if (carrierroute_dbf.raw_query(carrierroute_dbh, &query_tmp_str, &prob_res) < 0) { + LM_ERR("Failed to query carrierroute db table based on prob column.\n"); + goto errout; + } + if(RES_ROW_N(prob_res) == 0) { + LM_ERR("Carrierroute db table contains route(s) with only 0 probability.\n"); + query_done = true; + } + carrierroute_dbf.free_result(carrierroute_dbh, prob_res); + prob_res = NULL; + } + } if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if(carrierroute_dbf.fetch_result(carrierroute_dbh, &res, cfg_get(carrierroute, carrierroute_cfg, fetch_rows)) < 0) { @@ -462,5 +493,8 @@ int load_route_data_db(struct route_data_t * rd) { if (res) { carrierroute_dbf.free_result(carrierroute_dbh, res); } + if (prob_res) { + carrierroute_dbf.free_result(carrierroute_dbh, prob_res); + } return -1; } diff --git a/src/modules/carrierroute/cr_db.h b/src/modules/carrierroute/cr_db.h index 1f53c9307b..ffea731192 100644 --- a/src/modules/carrierroute/cr_db.h +++ b/src/modules/carrierroute/cr_db.h @@ -88,4 +88,9 @@ int load_route_data_db (struct route_data_t * rd); int load_user_carrier(str * user, str * domain); +typedef enum { + false = 0, + true = 1 +} boolean; + #endif diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index 6b6db1387b..c4ce4d52a0 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -471,7 +471,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest avp_value_t cr_new_uri; if(rf->dice_max == 0) { - LM_ERR("invalid dice_max value\n"); + LM_ERR("invalid dice_max value (route has probability 0)\n"); return -1; } if ((prob = hash_func(msg, hash_source, rf->dice_max)) < 0) {

6 years, 8 months

[kamailio/kamailio] carrierroute: warning for the same carrier/domain having routes with only 0 probability (#1232)

by hdikme

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1232 -- Commit Summary -- * carrierroute: warning for the same carrier/domain having routes with only 0 probability -- File Changes -- M src/modules/carrierroute/cr_db.c (34) M src/modules/carrierroute/cr_db.h (5) M src/modules/carrierroute/cr_func.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1232.patch https://github.com/kamailio/kamailio/pull/1232.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/1232

6 years, 8 months

git:master:6eb9f46b: uid_auth_db: removed history, updated log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6eb9f46bc413b72f41423673f1ad1083775760c4 URL: https://github.com/kamailio/kamailio/commit/6eb9f46bc413b72f41423673f1ad108… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-11T23:16:39+02:00 uid_auth_db: removed history, updated log macros --- Modified: src/modules/uid_auth_db/aaa_avps.h Modified: src/modules/uid_auth_db/authorize.c Modified: src/modules/uid_auth_db/authorize.h Modified: src/modules/uid_auth_db/uid_auth_db_mod.c Modified: src/modules/uid_auth_db/uid_auth_db_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/6eb9f46bc413b72f41423673f1ad108… Patch: https://github.com/kamailio/kamailio/commit/6eb9f46bc413b72f41423673f1ad108…

6 years, 8 months

git:master:6fa1e72a: uid_uri_db: fixed log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6fa1e72a8e8b74876432afe47830d2ee22b1caf6 URL: https://github.com/kamailio/kamailio/commit/6fa1e72a8e8b74876432afe47830d2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-11T23:15:29+02:00 uid_uri_db: fixed log message --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6fa1e72a8e8b74876432afe47830d2e… Patch: https://github.com/kamailio/kamailio/commit/6fa1e72a8e8b74876432afe47830d2e… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.c b/src/modules/uid_uri_db/uid_uri_db_mod.c index b7bff72e72..e3887fb75d 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.c +++ b/src/modules/uid_uri_db/uid_uri_db_mod.c @@ -395,7 +395,7 @@ static int lookup_user_2(struct sip_msg* msg, char* attr, char* select) while(rec) { if (rec->fld[0].flags & DB_NULL || rec->fld[1].flags & DB_NULL) { - LOG(L_ERR, "lookup_user: Bogus line in %s table\n", uri_table.s); + LM_ERR("bogus line in %s table\n", uri_table.s); goto skip; }

6 years, 8 months

git:master:06a5bb4c: modules/lcr: remove extra prefix_column param

by Juha Heinanen

Module: kamailio Branch: master Commit: 06a5bb4cff0319a19660b711e7d987b30a939345 URL: https://github.com/kamailio/kamailio/commit/06a5bb4cff0319a19660b711e7d987b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-09-11T22:21:26+03:00 modules/lcr: remove extra prefix_column param --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/06a5bb4cff0319a19660b711e7d987b… Patch: https://github.com/kamailio/kamailio/commit/06a5bb4cff0319a19660b711e7d987b… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 5b4c99d865..330a73105d 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -319,7 +319,6 @@ static param_export_t params[] = { {"params_column", PARAM_STR, &params_col}, {"hostname_column", PARAM_STR, &hostname_col}, {"strip_column", PARAM_STR, &strip_col}, - {"prefix_column", PARAM_STR, &prefix_col}, {"tag_column", PARAM_STR, &tag_col}, {"flags_column", PARAM_STR, &flags_col}, {"defunct_column", PARAM_STR, &defunct_col},

6 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017