Module: kamailio
Branch: 4.2
Commit: 83b3c2425a0e886677954936a60111224edc740b
URL: https://github.com/kamailio/kamailio/commit/83b3c2425a0e886677954936a601112…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-01-28T13:40:00+01:00
jsonrpc-c: explicitely listed glibc as dependency
(cherry picked from commit 11f300f2c7c8ffe4a6b49b471ffcd116ee218985)
---
Modified: modules/jsonrpc-c/README
Modified: modules/jsonrpc-c/doc/jsonrpc-c_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/83b3c2425a0e886677954936a601112…
Patch: https://github.com/kamailio/kamailio/commit/83b3c2425a0e886677954936a601112…
---
diff --git a/modules/jsonrpc-c/README b/modules/jsonrpc-c/README
index fcddab0..20676ee 100644
--- a/modules/jsonrpc-c/README
+++ b/modules/jsonrpc-c/README
@@ -77,9 +77,6 @@ Chapter 1. Admin Guide
2.1. Kamailio Modules
2.2. External Libraries or Applications
- This module uses Linux specific API, it might not compile on other
- types of operating systems.
-
2.1. Kamailio Modules
The following modules must be loaded before this module:
@@ -87,10 +84,14 @@ Chapter 1. Admin Guide
2.2. External Libraries or Applications
+ Note: this module uses Linux specific API, part of glibc library, it
+ might not compile on other types of operating systems.
+
The following libraries or applications must be installed before
running Kamailio with this module loaded:
* libjson (https://github.com/json-c/json-c/wiki)
* libevent - http://libevent.org/
+ * glibc - http://www.gnu.org/software/libc/ (v2.8 or higher)
3. Parameters
diff --git a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml
index c27508b..5776d5c 100644
--- a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml
+++ b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml
@@ -32,10 +32,6 @@
<section>
<title>Dependencies</title>
- <para>
- This module uses Linux specific API, it might not compile on other
- types of operating systems.
- </para>
<section>
<title>&kamailio; Modules</title>
<para>
@@ -52,6 +48,10 @@
<section>
<title>External Libraries or Applications</title>
<para>
+ Note: this module uses Linux specific API, part of glibc library,
+ it might not compile on other types of operating systems.
+ </para>
+ <para>
The following libraries or applications must be installed before running
&kamailio; with this module loaded:
<itemizedlist>
@@ -65,6 +65,12 @@
<emphasis>libevent</emphasis> - http://libevent.org/
</para>
</listitem>
+ <listitem>
+ <para>
+ <emphasis>glibc</emphasis> - http://www.gnu.org/software/libc/
+ (v2.8 or higher)
+ </para>
+ </listitem>
</itemizedlist>
</para>
</section>
Module: kamailio
Branch: 4.2
Commit: 688593f15e2a67dfaf00d3b371633b3f93e3d584
URL: https://github.com/kamailio/kamailio/commit/688593f15e2a67dfaf00d3b371633b3…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-01-28T13:39:36+01:00
pike: check that timer var is initialized before accessing the fields
- safe start with empty config, reported by Olle E. Johansson, GH#39
(cherry picked from commit c87a75c5fb7aa5d940093fbbca8d9557cc9a0239)
---
Modified: modules/pike/pike_funcs.c
---
Diff: https://github.com/kamailio/kamailio/commit/688593f15e2a67dfaf00d3b371633b3…
Patch: https://github.com/kamailio/kamailio/commit/688593f15e2a67dfaf00d3b371633b3…
---
diff --git a/modules/pike/pike_funcs.c b/modules/pike/pike_funcs.c
index e159a27..0e1a9e1 100644
--- a/modules/pike/pike_funcs.c
+++ b/modules/pike/pike_funcs.c
@@ -184,7 +184,7 @@ void clean_routine(unsigned int ticks , void *param)
/* LM_DBG("entering (%d)\n",ticks); */
/* before locking check first if the list is not empty and if can
* be at least one element removed */
- if ( is_list_empty( timer )) return; /* quick exit */
+ if (timer==0 || is_list_empty( timer )) return; /* quick exit */
/* get the expired elements */
lock_get( timer_lock );
Module: kamailio
Branch: 4.2
Commit: 332d8fa0aace2c331f464042084e421acaee8a80
URL: https://github.com/kamailio/kamailio/commit/332d8fa0aace2c331f464042084e421…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-01-28T13:39:11+01:00
acc: removed note in the docs about no-db support for cdrs
(cherry picked from commit 75db07b5d7794b0f67d5798917d1833a21382bb7)
---
Modified: modules/acc/doc/acc_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/332d8fa0aace2c331f464042084e421…
Patch: https://github.com/kamailio/kamailio/commit/332d8fa0aace2c331f464042084e421…
---
diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml
index 9d0403c..eb7acdc 100644
--- a/modules/acc/doc/acc_admin.xml
+++ b/modules/acc/doc/acc_admin.xml
@@ -352,12 +352,6 @@ if (uri=~"sip:+40") /* calls to Romania */ {
</para>
<para>
- Note that CDR generation does not involve any kind of database storage (yet). In order
- to persist the CDRs into a database you will have to set up an exterior process (i.e.,
- a script living outside of &kamailio;) and implement the storage task yourself.
- </para>
-
- <para>
Sometimes, dialogs expire because the UA has a problem and a final message is never
transmitted. You can toggle on/off the generation of CDR-based logging in such cases
with only the dlg_vars showing by using the cdr_expired_dlg_enable parameter
Module: kamailio
Branch: 4.2
Commit: 8e40cee0473dab5e7796c6479f46f5994280b76a
URL: https://github.com/kamailio/kamailio/commit/8e40cee0473dab5e7796c6479f46f59…
Author: Martin Mikkelsen <martin.mikkelsen(a)zisson.no>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-01-28T13:38:39+01:00
auth: use correct parameter for pv_auth_check checks
The pv_auth_check has a flags and a checks parameter but the flags
parameter is used for both. This means that if flags has the 1-bit set
it will enable both HA1-passwords and from/to URI checks and setting the
1-bit in the checks parameter does not do anything.
This fixes the parameters so that the checks parameter is used for the
to/from URI checks.
(cherry picked from commit 2cdda10aa232e545ba79ca71876f0160a68e324b)
---
Modified: modules/auth/auth_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/8e40cee0473dab5e7796c6479f46f59…
Patch: https://github.com/kamailio/kamailio/commit/8e40cee0473dab5e7796c6479f46f59…
---
diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c
index 364e4a6..e08048a 100644
--- a/modules/auth/auth_mod.c
+++ b/modules/auth/auth_mod.c
@@ -772,7 +772,7 @@ static int pv_auth_check(sip_msg_t *msg, char *realm,
ret = pv_authenticate(msg, &srealm, &spasswd, vflags, HDR_PROXYAUTH_T,
&msg->first_line.u.request.method);
- if(ret==AUTH_OK && (vflags&AUTH_CHECK_ID_F)) {
+ if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) {
hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth;
srealm = ((auth_body_t*)(hdr->parsed))->digest.username.user;
Module: kamailio
Branch: 4.2
Commit: 3271a8f4fad18f525165b7c08037355679b01767
URL: https://github.com/kamailio/kamailio/commit/3271a8f4fad18f525165b7c08037355…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-01-28T13:37:22+01:00
async: Clarify difference between modparam("async","workers",x) and async_workers in core config
(cherry picked from commit 06557a25af96d3de05d0302f202e6c4cbd0b84e9)
---
Modified: modules/async/README
Modified: modules/async/doc/async_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/3271a8f4fad18f525165b7c08037355…
Patch: https://github.com/kamailio/kamailio/commit/3271a8f4fad18f525165b7c08037355…
---
diff --git a/modules/async/README b/modules/async/README
index 327dc68..ce4daf3 100644
--- a/modules/async/README
+++ b/modules/async/README
@@ -38,7 +38,8 @@ Daniel-Constantin Mierla
1.1. Set workers parameter
1.2. async_route usage
1.3. async_sleep usage
- 1.4. async_task_route usage
+ 1.4. async_workers usage
+ 1.5. async_task_route usage
Chapter 1. Admin Guide
@@ -97,7 +98,7 @@ Chapter 1. Admin Guide
3.1. workers (int)
Number of worker processes to be started to handle the asynchronous
- tasks.
+ tasks for async_route() and async_sleep().
Default value is 1.
@@ -170,6 +171,16 @@ exit;
The task is executed as soon as a process from asynchronous framework
is idle, there is no wait time for the task like for async_route(...).
+ To enable the core asynchronous framework, you need to set the
+ async_workers core parameter in the configuration file. See the core
+ cookbook for more information.
+
+ Example 1.4. async_workers usage
+...
+; Enable 8 worker processes used by async and other modules
+async_workers=8
+...
+
In case of internal errors, the function returns false, otherwise the
function exits the execution of the script at that moment (return 0
behaviour).
@@ -184,7 +195,7 @@ exit;
This function can be used from REQUEST_ROUTE.
- Example 1.4. async_task_route usage
+ Example 1.5. async_task_route usage
...
async_task_route("RESUME");
...
diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml
index 18d9388..31ad797 100644
--- a/modules/async/doc/async_admin.xml
+++ b/modules/async/doc/async_admin.xml
@@ -70,7 +70,7 @@
<title><varname>workers</varname> (int)</title>
<para>
Number of worker processes to be started to handle the asynchronous
- tasks.
+ tasks for async_route() and async_sleep().
</para>
<para>
<emphasis>
@@ -175,6 +175,20 @@ exit;
async_route(...).
</para>
<para>
+ To enable the core asynchronous framework, you need to set the
+ <emphasis>async_workers</emphasis> core parameter in the configuration
+ file. See the core cookbook for more information.
+ <example>
+ <title><function>async_workers</function> usage</title>
+ <programlisting format="linespecific">
+...
+; Enable 8 worker processes used by async and other modules
+async_workers=8
+...
+</programlisting>
+ </example>
+ </para>
+ <para>
In case of internal errors, the function returns false, otherwise the
function exits the execution of the script at that moment (return
0 behaviour).