sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
275 discussions

git:master:1481e44c: kazoo : change log level on correlated message handling
by Luis Azedo 27 Jun '15

27 Jun '15

Module: kamailio Branch: master Commit: 1481e44c41e592cfdfec7ad1ce4194973f272eb7 URL: https://github.com/kamailio/kamailio/commit/1481e44c41e592cfdfec7ad1ce41949… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-27T13:15:10+01:00 kazoo : change log level on correlated message handling --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/1481e44c41e592cfdfec7ad1ce41949… Patch: https://github.com/kamailio/kamailio/commit/1481e44c41e592cfdfec7ad1ce41949… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index f5152ee..47c8527 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -1827,7 +1827,7 @@ void kz_amqp_cmd_timeout_cb(int fd, short event, void *arg) if(retrieved_cmd == NULL) { LM_ERR("timer what!? "); } else { - LM_ERR("amqp message timeout for exchange '%s' with routing key '%s' and message id '%.*s'\n" + LM_DBG("amqp message timeout for exchange '%s' with routing key '%s' and message id '%.*s'\n" , cmd->exchange, cmd->routing_key , cmd->message_id->len, cmd->message_id->s ); @@ -2149,7 +2149,7 @@ void kz_amqp_publisher_proc_cb(int fd, short event, void *arg) case KZ_AMQP_CMD_TARGETED_CONSUMER: retrieved_cmd = kz_cmd_retrieve(cmd->message_id); if(retrieved_cmd == NULL) { - LM_ERR("amqp message id %.*s not found.\n", cmd->message_id->len, cmd->message_id->s); + LM_DBG("amqp message id %.*s not found.\n", cmd->message_id->len, cmd->message_id->s); kz_amqp_free_pipe_cmd(cmd); } else { kz_amqp_stop_cmd_timer(retrieved_cmd);

1 0

git:master:1f124fa5: kazoo : changes in targeted exchanges
by Luis Azedo 26 Jun '15

26 Jun '15

Module: kamailio Branch: master Commit: 1f124fa5db0b3e1e787cd7b1f454d7a694d34a80 URL: https://github.com/kamailio/kamailio/commit/1f124fa5db0b3e1e787cd7b1f454d7a… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-26T19:35:55+01:00 kazoo : changes in targeted exchanges --- Added: modules/kazoo/kz_hash.c Added: modules/kazoo/kz_hash.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/1f124fa5db0b3e1e787cd7b1f454d7a… Patch: https://github.com/kamailio/kamailio/commit/1f124fa5db0b3e1e787cd7b1f454d7a…

1 0

[kamailio] configure IMS with fedora 20 (#223)
by louivans 26 Jun '15

26 Jun '15

Hello, I would like to do an IMS configuration to generate some calls with several smartphones. Currently, i had installed kamaillio 4.2 but i didn't found tutorials about how to configure IMS with Fedora 20, it is always for a debian distribution like this one: http://www.kamailio.org/wiki/tutorials/ims/installation-howto Do have any advice about how to configure it with Fedora 20 ? Thanks Robert --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/223

2 2

git:master:afbcbfb4: Merge pull request #220 from mslehto/htable
by Daniel-Constantin Mierla 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: afbcbfb43b5ddbafa745fc12f7d2365d6e715d89 URL: https://github.com/kamailio/kamailio/commit/afbcbfb43b5ddbafa745fc12f7d2365… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-25T22:20:00+02:00 Merge pull request #220 from mslehto/htable modules/htable: improves error message when loading from database --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/afbcbfb43b5ddbafa745fc12f7d2365… Patch: https://github.com/kamailio/kamailio/commit/afbcbfb43b5ddbafa745fc12f7d2365… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 06f3057..4288554 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -197,11 +197,17 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) do { for(i=0; i<RES_ROW_N(db_res); i++) { - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING - || VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key type must be string and its value not null\n"); + if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { + LM_ERR("key value must not be null\n"); goto error; } + + if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + LM_ERR("key type must be string (type=%d)\n", + RES_ROWS(db_res)[i].values[0].type); + goto error; + } + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { LM_ERR("null key in row %d\n", i);

1 0

git:master:f39736b2: modules/htable: improves error message when loading from database
by Mikko Lehto 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: f39736b276878f0de1e0471311119f12f1878801 URL: https://github.com/kamailio/kamailio/commit/f39736b276878f0de1e0471311119f1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-25T20:00:54+03:00 modules/htable: improves error message when loading from database --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/f39736b276878f0de1e0471311119f1… Patch: https://github.com/kamailio/kamailio/commit/f39736b276878f0de1e0471311119f1… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 06f3057..4288554 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -197,11 +197,17 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) do { for(i=0; i<RES_ROW_N(db_res); i++) { - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING - || VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key type must be string and its value not null\n"); + if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { + LM_ERR("key value must not be null\n"); goto error; } + + if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + LM_ERR("key type must be string (type=%d)\n", + RES_ROWS(db_res)[i].values[0].type); + goto error; + } + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { LM_ERR("null key in row %d\n", i);

1 0

[kamailio] modules/htable: improves error message when loading from database (#220)
by Mikko Lehto 25 Jun '15

25 Jun '15

I had trouble finding correct syntax with db_text backend, this patch helped me You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/220 -- Commit Summary -- * modules/htable: improves error message when loading from database -- File Changes -- M modules/htable/ht_db.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/220.patch https://github.com/kamailio/kamailio/pull/220.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/220

2 5

git:master:37e205c5: Merge pull request #219 from snen/dispatcher_weight_relative
by Daniel-Constantin Mierla 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: 37e205c512ef3788780c9966f0e7f9e7f76d9c7a URL: https://github.com/kamailio/kamailio/commit/37e205c512ef3788780c9966f0e7f9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-25T18:57:32+02:00 Merge pull request #219 from snen/dispatcher_weight_relative dispatcher: relative weight distribution --- Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/dispatcher.c Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37e205c512ef3788780c9966f0e7f9e… Patch: https://github.com/kamailio/kamailio/commit/37e205c512ef3788780c9966f0e7f9e…

1 0

git:master:bd2feeae: dispatcher: doc description for relative weight distribution added
by Savolainen Dmitri 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: bd2feeae898dd9a40bc2209200e3426d85430500 URL: https://github.com/kamailio/kamailio/commit/bd2feeae898dd9a40bc2209200e3426… Author: Savolainen Dmitri <savolainen(a)erinaco.ru> Committer: Savolainen Dmitri <savolainen(a)erinaco.ru> Date: 2015-06-25T19:35:04+03:00 dispatcher: doc description for relative weight distribution added --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bd2feeae898dd9a40bc2209200e3426… Patch: https://github.com/kamailio/kamailio/commit/bd2feeae898dd9a40bc2209200e3426… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index ae700ab..b9a0c01 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -917,6 +917,24 @@ modparam("dispatcher", "force_dst", 1) </listitem> <listitem> <para> + <quote>11</quote> - use relative weight based load distribution. + You have to set the attribute 'rweight' per each address in + destination set. Active host usage probability is + rweight/(SUM of all active host rweights in destination group). + </para> + <para> + The major difference from the weight distribution is the + probability recalculation according to rweight value in case of + host enabling/disabling + </para> + <para> + For example, 100 calls in 3-hosts group with rweight params 1/2/1 + will be distributed as 25/50/25. After third host failing + distribution will be changed to 33/67/0. + </para> + </listitem> + <listitem> + <para> <quote>X</quote> - if the algorithm is not implemented, the first entry in set is chosen. </para> @@ -1450,6 +1468,12 @@ onreply_route { sent to that gateways. </listitem> <listitem> + 'rweight' - used for relative weight based load + distribution. It must be set to a positive integer value + between 1 and 100 (otherwise host will be excluded from + relative weight distribution type). + </listitem> + <listitem> 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives.

1 0

git:master:abd02c40: dispatcher: use last active destination for relative weight distribution array finishing instead of last in destination set
by Savolainen Dmitri 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: abd02c40d7f3379f8b72d73e89ab630167b5e514 URL: https://github.com/kamailio/kamailio/commit/abd02c40d7f3379f8b72d73e89ab630… Author: Savolainen Dmitri <savolainen(a)erinaco.ru> Committer: Savolainen Dmitri <savolainen(a)erinaco.ru> Date: 2015-06-23T15:00:20+03:00 dispatcher: use last active destination for relative weight distribution array finishing instead of last in destination set --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/abd02c40d7f3379f8b72d73e89ab630… Patch: https://github.com/kamailio/kamailio/commit/abd02c40d7f3379f8b72d73e89ab630… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 9078c4e..a12ede8 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -471,10 +471,11 @@ int dp_init_relative_weights(ds_set_t *dset) t++; } } - /* if the array was not completely filled (i.e., the sum of weights is + /* if the array was not completely filled (i.e., the sum of rweights is * less than 100 due to truncated), then use last address to fill the rest */ - for(; t<100; t++) - dset->rwlist[t] = (unsigned int)(dset->nr-1); + unsigned int last_insert = t>0? dset->rwlist[t-1] : (unsigned int)(dset->nr-1); + for(j=t; j<100; j++) + dset->rwlist[j] = last_insert; /* shuffle the content of the array in order to mix the selection * of the addresses (e.g., if first address has weight=20, avoid

1 0

git:master:1d6c1d74: dispatcher: relative weight distribution added
by Savolainen Dmitri 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: 1d6c1d74ab028ca0d75c6cd9f6466a255b93d2d2 URL: https://github.com/kamailio/kamailio/commit/1d6c1d74ab028ca0d75c6cd9f6466a2… Author: Savolainen Dmitri <savolainen(a)erinaco.ru> Committer: Savolainen Dmitri <savolainen(a)erinaco.ru> Date: 2015-06-20T22:02:28+03:00 dispatcher: relative weight distribution added - it is possible to assign "rweight" (relative weight) param to each host in destination group. rweight is in the integer range from 1 to 100. Active host usage probability is rweight/(sum of all active host rweights in destination group). So INACTIVE/DISABLED destinations are removed from probability calculation. --- Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/1d6c1d74ab028ca0d75c6cd9f6466a2… Patch: https://github.com/kamailio/kamailio/commit/1d6c1d74ab028ca0d75c6cd9f6466a2…

1 0

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015