Hi kamailio dev team.
Recently master branch accepted a patch that fixes usrloc mutexes usage.
Would be nice to see it backported to 5.0 branch.
commit dfcba5fbcc5046a12babd3c6e93555f89ffa9cbe
Module: kamailio
Branch: master
Commit: 1b38ad5ea0a17ea63d0319919ebeceaa043d8e0f
URL: https://github.com/kamailio/kamailio/commit/1b38ad5ea0a17ea63d0319919ebecea…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2017-10-30T15:01:28+01:00
modules: readme files regenerated - auth ... [skip ci]
---
Modified: src/modules/auth/README
Modified: src/modules/pua_reginfo/README
Modified: src/modules/tm/README
---
Diff: https://github.com/kamailio/kamailio/commit/1b38ad5ea0a17ea63d0319919ebecea…
Patch: https://github.com/kamailio/kamailio/commit/1b38ad5ea0a17ea63d0319919ebecea…
---
diff --git a/src/modules/auth/README b/src/modules/auth/README
index a5f879a0a4..5967149855 100644
--- a/src/modules/auth/README
+++ b/src/modules/auth/README
@@ -381,7 +381,7 @@ route{
3.6. one_time_nonce (boolean)
If set to 1 nonce reuse is disabled: each nonce is allowed only once,
- in the first reponse to a challenge. All the messages will be
+ in the first response to a challenge. All the messages will be
challenged, even retransmissions. Stateful mode should be used, to
catch retransmissions before the authentication checks (using
t_newtran() before the authentication checks and sending all the
diff --git a/src/modules/pua_reginfo/README b/src/modules/pua_reginfo/README
index 68c9a85205..3da81d094c 100644
--- a/src/modules/pua_reginfo/README
+++ b/src/modules/pua_reginfo/README
@@ -170,8 +170,8 @@ modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12")
This function processes received "NOTIFY"-requests and updates the
local registry accordingly.
- This method does not create any SIP-Reponse, this has to be done the
- script-writer.
+ This method does not create any SIP-Response, this has to be done by
+ the script-writer.
The parameter has to correspond to user location table (domain) where
to store the record.
diff --git a/src/modules/tm/README b/src/modules/tm/README
index bd10d0d779..0b484fa6a9 100644
--- a/src/modules/tm/README
+++ b/src/modules/tm/README
@@ -141,6 +141,7 @@ Daniel-Constantin Mierla
5.6. tm.reply
5.7. tm.reply_callid
5.8. tm.clean
+ 5.9. tm.stats
6. Event Routes
@@ -381,6 +382,7 @@ Chapter 1. Admin Guide
5.6. tm.reply
5.7. tm.reply_callid
5.8. tm.clean
+ 5.9. tm.stats
6. Event Routes
@@ -457,8 +459,7 @@ Chapter 1. Admin Guide
Note
Several Kamailio TM module functions are now implemented in the TMX
- module: “modules_k/tmx”. Check it to see if what you are looking for is
- there.
+ module. Check it to see if what you are looking for is there.
2. Serial Forking Based on Q Value
@@ -1348,7 +1349,7 @@ modparam("tm", "callid_matching", 1)
3.34. pass_provisional_replies (integer)
- If set, TMCB_LOCAL_REPONSE_OUT tm registered callbacks will be called
+ If set, TMCB_LOCAL_RESPONSE_OUT tm registered callbacks will be called
also for provisional replies.
Default value is 0 (off).
@@ -1777,8 +1778,8 @@ failure_route[1] {
}
...
- See test/onr.cfg for a more complex example of combination of serial
- with parallel forking.
+ See misc/examples/mixed/onr.cfg for a more complex example of
+ combination of serial with parallel forking.
4.7. t_on_branch_failure(branch_failure_route)
@@ -1881,7 +1882,7 @@ if (t_newtran()) {
} else sl_reply_error();
...
- See test/uas.cfg for more examples.
+ See misc/examples/mixed/uas.cfg for more examples.
4.11. t_reply(code, reason_phrase)
@@ -2809,6 +2810,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "",
5.6. tm.reply
5.7. tm.reply_callid
5.8. tm.clean
+ 5.9. tm.stats
5.1. tm.list
@@ -2834,7 +2836,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "",
5.3. tm.t_uac_wait
- Similar to rm.t_uac_start, but waits for the SIP reponse and tries to
+ Similar to tm.t_uac_start, but waits for the SIP response and tries to
provide its details via RPC response.
5.4. tm.cancel
@@ -2888,6 +2890,13 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "",
Parameters:
* none
+5.9. tm.stats
+
+ Gets information about current and past TM transaction handling.
+
+ Parameters:
+ * none
+
6. Event Routes
6.1. event_route[tm:branch-failure]
Module: kamailio
Branch: master
Commit: 9ed210ad397d0ad36c020b960a799e918482765f
URL: https://github.com/kamailio/kamailio/commit/9ed210ad397d0ad36c020b960a799e9…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2017-10-30T15:46:21+02:00
auth|pua_reginfo: fix common documentation typo
---
Modified: src/modules/auth/doc/auth_params.xml
Modified: src/modules/pua_reginfo/doc/pua_reginfo_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/9ed210ad397d0ad36c020b960a799e9…
Patch: https://github.com/kamailio/kamailio/commit/9ed210ad397d0ad36c020b960a799e9…
---
diff --git a/src/modules/auth/doc/auth_params.xml b/src/modules/auth/doc/auth_params.xml
index 8d6ed5a267..3995d08fa6 100644
--- a/src/modules/auth/doc/auth_params.xml
+++ b/src/modules/auth/doc/auth_params.xml
@@ -304,7 +304,7 @@ route{
<title><varname>one_time_nonce</varname> (boolean)</title>
<para>
If set to 1 nonce reuse is disabled: each nonce is allowed only once,
- in the first reponse to a challenge. All the messages will be
+ in the first response to a challenge. All the messages will be
challenged, even retransmissions. Stateful mode should be used, to
catch retransmissions before the authentication checks (using
<function>t_newtran()</function> before the authentication checks
diff --git a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml
index 9754055c33..deb90c8d74 100644
--- a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml
+++ b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml
@@ -166,8 +166,8 @@ modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12")
the local registry accordingly.
</para>
<para>
- This method does not create any SIP-Reponse, this has to be done
- the script-writer.
+ This method does not create any SIP-Response, this has to be done
+ by the script-writer.
</para>
<para>
The parameter has to correspond to user location table (domain)
Module: kamailio
Branch: master
Commit: e5b77a64f47dd103eebfe3dfe1208c050dd50a9d
URL: https://github.com/kamailio/kamailio/commit/e5b77a64f47dd103eebfe3dfe1208c0…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2017-10-30T15:46:04+02:00
tm: fix documentation typos and changed or obsolete paths
---
Modified: src/modules/tm/doc/functions.xml
Modified: src/modules/tm/doc/params.xml
Modified: src/modules/tm/doc/rpc.xml
Modified: src/modules/tm/doc/tm.xml
Modified: src/modules/tm/t_reply.c
---
Diff: https://github.com/kamailio/kamailio/commit/e5b77a64f47dd103eebfe3dfe1208c0…
Patch: https://github.com/kamailio/kamailio/commit/e5b77a64f47dd103eebfe3dfe1208c0…
---
diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml
index 3b20f3dab7..7983de257b 100644
--- a/src/modules/tm/doc/functions.xml
+++ b/src/modules/tm/doc/functions.xml
@@ -163,8 +163,8 @@ failure_route[1] {
</programlisting>
</example>
<para>
- See <filename>test/onr.cfg</filename> for a more complex example of
- combination of serial with parallel forking.
+ See <filename>misc/examples/mixed/onr.cfg</filename> for a more complex
+ example of combination of serial with parallel forking.
</para>
</section>
<section id="tm.f.t_on_branch_failure">
@@ -314,7 +314,7 @@ if (t_newtran()) {
</programlisting>
</example>
<para>
- See test/uas.cfg for more examples.
+ See <filename>misc/examples/mixed/uas.cfg</filename> for more examples.
</para>
</section>
diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml
index 5e222b8645..fef700464b 100644
--- a/src/modules/tm/doc/params.xml
+++ b/src/modules/tm/doc/params.xml
@@ -1019,7 +1019,7 @@ modparam("tm", "callid_matching", 1)
<section id="tm.p.pass_provisional_replies">
<title><varname>pass_provisional_replies</varname> (integer)</title>
<para>
- If set, TMCB_LOCAL_REPONSE_OUT tm registered callbacks will be called
+ If set, TMCB_LOCAL_RESPONSE_OUT tm registered callbacks will be called
also for provisional replies.
</para>
<para>
diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml
index efc445cbee..d92bafa4a6 100644
--- a/src/modules/tm/doc/rpc.xml
+++ b/src/modules/tm/doc/rpc.xml
@@ -65,7 +65,7 @@
<function moreinfo="none">tm.t_uac_wait</function>
</title>
<para>
- Similar to rm.t_uac_start, but waits for the SIP reponse and tries to
+ Similar to tm.t_uac_start, but waits for the SIP response and tries to
provide its details via RPC response.
</para>
</section>
diff --git a/src/modules/tm/doc/tm.xml b/src/modules/tm/doc/tm.xml
index 94eb2e49a3..918cc89f82 100644
--- a/src/modules/tm/doc/tm.xml
+++ b/src/modules/tm/doc/tm.xml
@@ -112,7 +112,7 @@
</para>
<note>
<para>Several Kamailio TM module functions are now
- implemented in the TMX module: <quote>modules_k/tmx</quote>. Check
+ implemented in the TMX module. Check
it to see if what you are looking for is there.</para>
</note>
</section>
diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c
index c26b5eca32..355f4d2e7e 100644
--- a/src/modules/tm/t_reply.c
+++ b/src/modules/tm/t_reply.c
@@ -1115,8 +1115,8 @@ inline static short int get_4xx_prio(unsigned char xx)
/* returns response priority, lower number => highest prio
*
* responses priority val
- * 0-99 32000+reponse (special)
- * 1xx 11000+reponse (special)
+ * 0-99 32000+response (special)
+ * 1xx 11000+response (special)
* 700-999 10000+response (very low)
* 5xx 5000+xx (low)
* 4xx 4000+xx
Module: kamailio
Branch: master
Commit: 80a78412d6ad02251d1bd64dd9ce72acd1742fa6
URL: https://github.com/kamailio/kamailio/commit/80a78412d6ad02251d1bd64dd9ce72a…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2017-10-29T09:17:01+01:00
modules: readme files regenerated - rtimer ... [skip ci]
---
Modified: src/modules/rtimer/README
---
Diff: https://github.com/kamailio/kamailio/commit/80a78412d6ad02251d1bd64dd9ce72a…
Patch: https://github.com/kamailio/kamailio/commit/80a78412d6ad02251d1bd64dd9ce72a…
---
diff --git a/src/modules/rtimer/README b/src/modules/rtimer/README
index e5e8454ce9..aec594b58c 100644
--- a/src/modules/rtimer/README
+++ b/src/modules/rtimer/README
@@ -33,6 +33,7 @@ Daniel-Constantin Mierla
1.1. Set timer parameter
1.2. Set exec parameter
+ 1.3. Use exec parameter with a Kemi engine
Chapter 1. Admin Guide
@@ -113,18 +114,32 @@ modparam("rtimer", "timer", "name=ta;interval=100000u;mode=1;")
The parameter can be set multiple times to get more routes executed on
same timer.
* timer - name of the timer.
- * route - the index of the route to be executed.
+ * route - the name of the route block to be executed, or the name of
+ the function from kemi script. The kemi function receives a string
+ parameter with the value being the name of the module.
Default value is NULL.
Example 1.2. Set exec parameter
...
modparam("rtimer", "timer", "name=ta;interval=10;mode=1;")
-modparam("rtimer", "exec", "timer=ta;route=8")
+modparam("rtimer", "exec", "timer=ta;route=ONTIMER")
-route[8] {
+route[ONTIMER] {
xlog("timer routine: time is $TF\n");
# delete from my sql cache table entries older than 2H
sql_query("delete from kamailio_cache where last_updated<$TS-3600");
}
...
+
+ Example 1.3. Use exec parameter with a Kemi engine
+...
+modparam("rtimer", "timer", "name=ta;interval=10;mode=1;")
+modparam("rtimer", "exec", "timer=ta;route=ksr_rtimer")
+...
+-- rtimer event callback function implemented in Lua
+function ksr_rtimer(evname)
+ KSR.info("===== rtimer module triggered event\n");
+ return 1;
+end
+...