sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

git:4.2:9bb59f92: dispatcher: readme file updated
by Daniel-Constantin Mierla 17 Dec '14

17 Dec '14

Module: kamailio Branch: 4.2 Commit: 9bb59f922da4474e3b30e7f47cf841c9e40c3ffd URL: https://github.com/kamailio/kamailio/commit/9bb59f922da4474e3b30e7f47cf841c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2014-12-18T00:52:48+01:00 dispatcher: readme file updated --- Modified: modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/9bb59f922da4474e3b30e7f47cf841c… Patch: https://github.com/kamailio/kamailio/commit/9bb59f922da4474e3b30e7f47cf841c… --- diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 1987823..8f2c96a 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -91,6 +91,10 @@ Carsten Bock 7. Installation and Running 7.1. Destination List File + + 7.1.1. Special Attributes + 7.1.2. File Format + 7.2. Kamailio config file 8. Event routes @@ -207,6 +211,10 @@ Chapter 1. Admin Guide 7. Installation and Running 7.1. Destination List File + + 7.1.1. Special Attributes + 7.1.2. File Format + 7.2. Kamailio config file 8. Event routes @@ -1039,6 +1047,10 @@ kamcmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 7. Installation and Running 7.1. Destination List File + + 7.1.1. Special Attributes + 7.1.2. File Format + 7.2. Kamailio config file 7.1. Destination List File @@ -1056,9 +1068,29 @@ kamcmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 probing destination (sending keep alives); * priority: sets the priority in destination list (based on it is done the initial ordering inside the set) - * attributes: extra filed in form of name1=value1;...;nameN=valueN. - There are some predefined names that are used of weight and call - load dispatching. + * attributes: extra fields in form of name1=value1;...;nameN=valueN. + There are some reserved names for attributes used by the module for + specific load balancing algorithms, see the section 'Special + Attributes'. + +7.1.1. Special Attributes + + There are some predefined names: + * 'duid' - used for call load dispatching. It must be an unique value + to identify a destination (gateway address). Practically the load + within the group is associated with this value. + * 'maxload' - used for call load dispatching. It must be a positive + integer, defining the upper limit of active calls per destination. + When the limit is reached, then the gateway is no longer selected + for new calls until an exiting call via that gateway is terminated. + If set to 0, then no active call limit is used. + * 'weight' - used for weight based load distribution. It must be set + to a positive integer value beteen 0 and 100. The value represents + the percent of calls to be sent to that gateways. + * 'socket' - used to set the sending socket for the gateway. It is + used for sending the SIP traffic as well as OPTIONS keepalives. + +7.1.2. File Format Line format is: ...

1 0

git:4.2:3cb767da: dispatcher: dedicated section for attributes in docs
by Daniel-Constantin Mierla 17 Dec '14

17 Dec '14

Module: kamailio Branch: 4.2 Commit: 3cb767da8e049da87fd4e4c8dd824a59cd10b971 URL: https://github.com/kamailio/kamailio/commit/3cb767da8e049da87fd4e4c8dd824a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2014-12-18T00:52:11+01:00 dispatcher: dedicated section for attributes in docs - file format has it own section too (cherry picked from commit 610a93ea038f9eb10ac611263891813b734fc7a0) Conflicts: modules/dispatcher/doc/dispatcher_admin.xml --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3cb767da8e049da87fd4e4c8dd824a5… Patch: https://github.com/kamailio/kamailio/commit/3cb767da8e049da87fd4e4c8dd824a5… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index f4e0eaf..0159189 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1321,11 +1321,48 @@ onreply_route { is done the initial ordering inside the set)</para> </listitem> <listitem> - <para>attributes: extra filed in form of - name1=value1;...;nameN=valueN. There are some predefined names - that are used of weight and call load dispatching.</para> + <para>attributes: extra fields in form of + name1=value1;...;nameN=valueN. There are some reserved names + for attributes used by the module for specific load balancing + algorithms, see the section 'Special Attributes'. + </para> </listitem> </itemizedlist> + <section id="dispatcher.ex.attributes"> + <title>Special Attributes</title> + <para> + There are some predefined names: + <itemizedlist> + <listitem> + 'duid' - used for call load dispatching. It must be an + unique value to identify a destination (gateway address). + Practically the load within the group is associated with + this value. + </listitem> + <listitem> + 'maxload' - used for call load dispatching. It must be + a positive integer, defining the upper limit of active + calls per destination. When the limit is reached, then + the gateway is no longer selected for new calls until + an exiting call via that gateway is terminated. If set + to 0, then no active call limit is used. + </listitem> + <listitem> + 'weight' - used for weight based load distribution. It + must be set to a positive integer value beteen 0 and + 100. The value represents the percent of calls to be + sent to that gateways. + </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. + </listitem> + </itemizedlist> + </para> + </section> + <section id="dispatcher.ex.fileforma"> + <title>File Format</title> <para> Line format is: </para> @@ -1357,6 +1394,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </programlisting> </example> </section> + </section> <section id="dispatcher.ex.config"> <title>&kamailio; config file</title>

1 0

git:master:7bf4c6d7: auth_db: more details for is_subscriber()
by Daniel-Constantin Mierla 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: 7bf4c6d72774b521b4e9bbc5375c4e952a224676 URL: https://github.com/kamailio/kamailio/commit/7bf4c6d72774b521b4e9bbc5375c4e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2014-12-17T23:34:21+01:00 auth_db: more details for is_subscriber() --- Modified: modules/auth_db/README Modified: modules/auth_db/doc/auth_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7bf4c6d72774b521b4e9bbc5375c4e9… Patch: https://github.com/kamailio/kamailio/commit/7bf4c6d72774b521b4e9bbc5375c4e9… --- diff --git a/modules/auth_db/README b/modules/auth_db/README index 9e25b08..949878d 100644 --- a/modules/auth_db/README +++ b/modules/auth_db/README @@ -463,15 +463,17 @@ if (!auth_check("$fd", "subscriber", "1")) { (usually subscriber table). The string may contain pseudo variables. * flags - set of flags to control the behaviour of the function. If - it is 1, then the function will use the domain part of the URI to - perform the database table search. + 1st bit is set, then the function will use the domain part of the + URI to perform the database table search. If 2nd bit is set, then + the credentials are not loaded in variables (a simple check if + subscriber exists). The parameter may be a pseudo variable. This function can be used from ANY_ROUTE. Example 1.13. is_subscriber usage ... -if (!is_subscriber("$ru", "subscriber", "1")) { +if (!is_subscriber("$ru", "subscriber", "3")) { # callee is not a local subscriber ... } diff --git a/modules/auth_db/doc/auth_db_admin.xml b/modules/auth_db/doc/auth_db_admin.xml index 74d6d00..1b83296 100644 --- a/modules/auth_db/doc/auth_db_admin.xml +++ b/modules/auth_db/doc/auth_db_admin.xml @@ -585,8 +585,10 @@ if (!auth_check("$fd", "subscriber", "1")) { </listitem> <listitem> <para><emphasis>flags</emphasis> - set of flags to control the - behaviour of the function. If it is 1, then the function will + behaviour of the function. If 1st bit is set, then the function will use the domain part of the URI to perform the database table search. + If 2nd bit is set, then the credentials are not loaded in variables + (a simple check if subscriber exists). </para> <para> The parameter may be a pseudo variable. @@ -600,7 +602,7 @@ if (!auth_check("$fd", "subscriber", "1")) { <title>is_subscriber usage</title> <programlisting format="linespecific"> ... -if (!is_subscriber("$ru", "subscriber", "1")) { +if (!is_subscriber("$ru", "subscriber", "3")) { # callee is not a local subscriber ... }

1 0

git:master:d948ca56: auth_db: fixed is_subscriber() when load_credentials is not set
by Daniel-Constantin Mierla 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: d948ca564b4f669905485e040e295f54bd3f36a2 URL: https://github.com/kamailio/kamailio/commit/d948ca564b4f669905485e040e295f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2014-12-17T23:30:29+01:00 auth_db: fixed is_subscriber() when load_credentials is not set - the flag parameter can be also explicit on skipping the credentials --- Modified: modules/auth_db/authdb_mod.c Modified: modules/auth_db/authorize.c Modified: modules/auth_db/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/d948ca564b4f669905485e040e295f5… Patch: https://github.com/kamailio/kamailio/commit/d948ca564b4f669905485e040e295f5… --- diff --git a/modules/auth_db/authdb_mod.c b/modules/auth_db/authdb_mod.c index c21d36b..ec44e67 100644 --- a/modules/auth_db/authdb_mod.c +++ b/modules/auth_db/authdb_mod.c @@ -274,8 +274,9 @@ static int w_is_subscriber(sip_msg_t *msg, char *_uri, char* _table, LM_DBG("uri [%.*s] table [%.*s] flags [%d]\n", suri.len, suri.s, stable.len, stable.s, iflags); - ret = fetch_credentials(msg, &puri.user, (iflags==1)?&puri.host:NULL, - &stable); + ret = fetch_credentials(msg, &puri.user, + (iflags&AUTH_DB_SUBS_USE_DOMAIN)?&puri.host:NULL, + &stable, iflags); if(ret>=0) return 1; diff --git a/modules/auth_db/authorize.c b/modules/auth_db/authorize.c index b3700f2..13c1044 100644 --- a/modules/auth_db/authorize.c +++ b/modules/auth_db/authorize.c @@ -50,9 +50,10 @@ #include "../../mem/mem.h" #include "api.h" #include "authdb_mod.h" +#include "authorize.h" -int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table) +int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int flags) { pv_elem_t *cred; db_key_t keys[2]; @@ -62,11 +63,17 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table) int n, nc; - col = pkg_malloc(sizeof(*col) * (credentials_n + 1)); + if(flags&AUTH_DB_SUBS_SKIP_CREDENTIALS) { + nc = 1; + } else { + nc = credentials_n; + } + col = pkg_malloc(sizeof(*col) * (nc+1)); if (col == NULL) { LM_ERR("no more pkg memory\n"); return -1; } + col[0] = &user_column; keys[0] = &user_column; keys[1] = &domain_column; @@ -86,7 +93,6 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table) n = 2; } - nc = credentials_n; if (auth_dbf.use_table(auth_db_handle, table) < 0) { LM_ERR("failed to use_table\n"); pkg_free(col); @@ -110,6 +116,10 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table) table->len, table->s); return -2; } + if(flags&AUTH_DB_SUBS_SKIP_CREDENTIALS) { + /* there is a result and flag to skip loading credentials is set */ + goto done; + } for (cred=credentials, n=0; cred; cred=cred->next, n++) { if (db_val2pv_spec(msg, &RES_ROWS(res)[0].values[n], cred->spec) != 0) { if(res) @@ -119,6 +129,8 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table) return -3; } } + +done: if(res) auth_dbf.free_result(auth_db_handle, res); return 0; diff --git a/modules/auth_db/authorize.h b/modules/auth_db/authorize.h index f716480..3746fd6 100644 --- a/modules/auth_db/authorize.h +++ b/modules/auth_db/authorize.h @@ -51,10 +51,13 @@ int www_authenticate2(struct sip_msg* _msg, char* _realm, char* _table, char *_m */ int auth_check(struct sip_msg* _m, char* _realm, char* _table, char *_flags); + +#define AUTH_DB_SUBS_USE_DOMAIN 1<<0 +#define AUTH_DB_SUBS_SKIP_CREDENTIALS 1<<1 /* * Fetch credentials for a specific user */ -int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table); +int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int flags); /* * Bind to AUTH_DB API

1 0

Maintenance work on kamailio.org - Wed, Dec 17
by Daniel-Constantin Mierla 17 Dec '14

17 Dec '14

Hello, on Wednesday (Dec 17) late afternoon in Europe (probably starting around 18:00, Berlin time), we plan some maintenance work on kamailio.org server. Hopefully the downtime will be short and barely noticeable. But as we know, sometime we have to expect the unexpected, therefore in case the server is unavailable a bit longer, keep in mind that it is a scheduled work. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 2

git:master:42f5eefc: userblacklist Remove the db definition file (now part of _admin) from the master xml file
by Olle E. Johansson 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: 42f5eefc595d65ab5953232335f6f686661526ca URL: https://github.com/kamailio/kamailio/commit/42f5eefc595d65ab5953232335f6f68… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2014-12-17T22:19:16+01:00 userblacklist Remove the db definition file (now part of _admin) from the master xml file --- Modified: modules/userblacklist/doc/userblacklist.xml --- Diff: https://github.com/kamailio/kamailio/commit/42f5eefc595d65ab5953232335f6f68… Patch: https://github.com/kamailio/kamailio/commit/42f5eefc595d65ab5953232335f6f68… --- diff --git a/modules/userblacklist/doc/userblacklist.xml b/modules/userblacklist/doc/userblacklist.xml index bfb652f..ef62472 100644 --- a/modules/userblacklist/doc/userblacklist.xml +++ b/modules/userblacklist/doc/userblacklist.xml @@ -32,6 +32,5 @@ </bookinfo> <toc></toc> <xi:include href="userblacklist_admin.xml"/> - <xi:include href="userblacklist_db.xml"/> </book>

1 0

git:master:f8b7aa5d: userblacklist Reorganize README and add section ID's
by Olle E. Johansson 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: f8b7aa5d37f4d834620399b8c2fe295620bb5e66 URL: https://github.com/kamailio/kamailio/commit/f8b7aa5d37f4d834620399b8c2fe295… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2014-12-17T22:17:59+01:00 userblacklist Reorganize README and add section ID's The database parameters was at the end of the README, which is not like any other module. --- Modified: modules/userblacklist/README Modified: modules/userblacklist/doc/userblacklist_admin.xml Removed: modules/userblacklist/doc/userblacklist_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/f8b7aa5d37f4d834620399b8c2fe295… Patch: https://github.com/kamailio/kamailio/commit/f8b7aa5d37f4d834620399b8c2fe295…

1 0

git:master:23765917: userblacklist Adding section IDs to documentation
by Olle E. Johansson 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: 2376591772d4fb20f64613331256ddf97e8b7b07 URL: https://github.com/kamailio/kamailio/commit/2376591772d4fb20f64613331256ddf… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2014-12-17T22:05:04+01:00 userblacklist Adding section IDs to documentation --- Modified: modules/userblacklist/README Modified: modules/userblacklist/doc/userblacklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2376591772d4fb20f64613331256ddf… Patch: https://github.com/kamailio/kamailio/commit/2376591772d4fb20f64613331256ddf…

1 0

git:master:cb79f355: mangler Update README with section IDs, minor changes
by Olle E. Johansson 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: cb79f35594c6a5059d9b76da96b9945f75f897f2 URL: https://github.com/kamailio/kamailio/commit/cb79f35594c6a5059d9b76da96b9945… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2014-12-17T21:44:15+01:00 mangler Update README with section IDs, minor changes --- Modified: modules/mangler/README Modified: modules/mangler/doc/mangler_functions.xml Modified: modules/mangler/doc/mangler_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb79f35594c6a5059d9b76da96b9945… Patch: https://github.com/kamailio/kamailio/commit/cb79f35594c6a5059d9b76da96b9945…

1 0

git:master:ae87f7c1: tm Update readme with section ID's, fix typos
by Olle E. Johansson 17 Dec '14

17 Dec '14

Module: kamailio Branch: master Commit: ae87f7c1d2fc860482c1c92c88a9ba6963b6bc81 URL: https://github.com/kamailio/kamailio/commit/ae87f7c1d2fc860482c1c92c88a9ba6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2014-12-17T21:25:49+01:00 tm Update readme with section ID's, fix typos Yes, it was a boring flight... --- Modified: modules/tm/README Modified: modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae87f7c1d2fc860482c1c92c88a9ba6… Patch: https://github.com/kamailio/kamailio/commit/ae87f7c1d2fc860482c1c92c88a9ba6…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014