sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.2:eaa70af0: tmx: safety check for bad cseq header in t_precheck_tran()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: eaa70af07b201a255ba593e102631818df4fe119 URL: https://github.com/kamailio/kamailio/commit/eaa70af07b201a255ba593e10263181… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-20T18:52:57+02:00 tmx: safety check for bad cseq header in t_precheck_tran() - reported by GH#331 (cherry picked from commit 3e84157b4bbce9c6bcb8c4563910811a7eb8f019) (cherry picked from commit 578200cd2f32dfcc45b1b1fe682a907cf21083e8) --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/eaa70af07b201a255ba593e10263181… Patch: https://github.com/kamailio/kamailio/commit/eaa70af07b201a255ba593e10263181… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 1e0f50f..631618a 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -204,7 +204,10 @@ int tmx_check_pretran(sip_msg_t *msg) LM_ERR("failed to parse required headers\n"); return -1; } - + if(msg->cseq==NULL || msg->cseq->parsed==NULL) { + LM_ERR("failed to parse cseq headers\n"); + return -1; + } if(get_cseq(msg)->method_id==METHOD_ACK || get_cseq(msg)->method_id==METHOD_CANCEL) { LM_DBG("no pre-transaction management for ACK or CANCEL\n");

9 years, 2 months

git:4.3:578200cd: tmx: safety check for bad cseq header in t_precheck_tran()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 578200cd2f32dfcc45b1b1fe682a907cf21083e8 URL: https://github.com/kamailio/kamailio/commit/578200cd2f32dfcc45b1b1fe682a907… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-20T18:51:37+02:00 tmx: safety check for bad cseq header in t_precheck_tran() - reported by GH#331 (cherry picked from commit 3e84157b4bbce9c6bcb8c4563910811a7eb8f019) --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/578200cd2f32dfcc45b1b1fe682a907… Patch: https://github.com/kamailio/kamailio/commit/578200cd2f32dfcc45b1b1fe682a907… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 1691432..8ba74df 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -210,7 +210,10 @@ int tmx_check_pretran(sip_msg_t *msg) LM_ERR("failed to parse required headers\n"); return -1; } - + if(msg->cseq==NULL || msg->cseq->parsed==NULL) { + LM_ERR("failed to parse cseq headers\n"); + return -1; + } if(get_cseq(msg)->method_id==METHOD_ACK || get_cseq(msg)->method_id==METHOD_CANCEL) { LM_DBG("no pre-transaction management for ACK or CANCEL\n");

9 years, 2 months

git:master:3e84157b: tmx: safety check for bad cseq header in t_precheck_tran()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e84157b4bbce9c6bcb8c4563910811a7eb8f019 URL: https://github.com/kamailio/kamailio/commit/3e84157b4bbce9c6bcb8c4563910811… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-20T18:48:18+02:00 tmx: safety check for bad cseq header in t_precheck_tran() - reported by GH#331 --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/3e84157b4bbce9c6bcb8c4563910811… Patch: https://github.com/kamailio/kamailio/commit/3e84157b4bbce9c6bcb8c4563910811… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 1691432..8ba74df 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -210,7 +210,10 @@ int tmx_check_pretran(sip_msg_t *msg) LM_ERR("failed to parse required headers\n"); return -1; } - + if(msg->cseq==NULL || msg->cseq->parsed==NULL) { + LM_ERR("failed to parse cseq headers\n"); + return -1; + } if(get_cseq(msg)->method_id==METHOD_ACK || get_cseq(msg)->method_id==METHOD_CANCEL) { LM_DBG("no pre-transaction management for ACK or CANCEL\n");

9 years, 2 months

git:master:58b4ea9c: sctp Documentation - change "sercmd" to "kamcmd"

by Olle E. Johansson

Module: kamailio Branch: master Commit: 58b4ea9ca31305a4450807add2c21e7ecb01614b URL: https://github.com/kamailio/kamailio/commit/58b4ea9ca31305a4450807add2c21e7… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T12:48:42+01:00 sctp Documentation - change "sercmd" to "kamcmd" --- Modified: modules/sctp/README Modified: modules/sctp/doc/sctp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/58b4ea9ca31305a4450807add2c21e7… Patch: https://github.com/kamailio/kamailio/commit/58b4ea9ca31305a4450807add2c21e7… --- diff --git a/modules/sctp/README b/modules/sctp/README index 1fb71dc..c8f5ffa 100644 --- a/modules/sctp/README +++ b/modules/sctp/README @@ -235,7 +235,7 @@ modparam("sctp", "sctp_send_retries", 1) better performance, but it will also disable some other features that depend on it (e.g. sctp_assoc_reuse). - Can be changed at runtime (sercmd sctp assoc_tracking 0), but changes + Can be changed at runtime (kamcmd sctp assoc_tracking 0), but changes will be allowed only if all the other features that depend on it are turned off (for example it can be turned off only if first sctp_assoc_reuse was turned off). diff --git a/modules/sctp/doc/sctp_admin.xml b/modules/sctp/doc/sctp_admin.xml index 3ede4ca..2fc495a 100644 --- a/modules/sctp/doc/sctp_admin.xml +++ b/modules/sctp/doc/sctp_admin.xml @@ -194,7 +194,7 @@ modparam("sctp", "sctp_send_retries", 1) features that depend on it (e.g. sctp_assoc_reuse). </para> <para> - Can be changed at runtime (sercmd sctp assoc_tracking 0), but changes + Can be changed at runtime (&sercmd; sctp assoc_tracking 0), but changes will be allowed only if all the other features that depend on it are turned off (for example it can be turned off only if first sctp_assoc_reuse was turned off).

9 years, 2 months

git:master:0c9ea3cc: tm Change "sercmd" to "kamcmd"

by Olle E. Johansson

Module: kamailio Branch: master Commit: 0c9ea3ccb7fac1180f26741422857807d24fcea1 URL: https://github.com/kamailio/kamailio/commit/0c9ea3ccb7fac1180f2674142285780… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T12:47:36+01:00 tm Change "sercmd" to "kamcmd" --- Modified: modules/tm/README Modified: modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/0c9ea3ccb7fac1180f2674142285780… Patch: https://github.com/kamailio/kamailio/commit/0c9ea3ccb7fac1180f2674142285780… --- diff --git a/modules/tm/README b/modules/tm/README index c36f42a..9b31ebc 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -1317,7 +1317,7 @@ modparam("tm", "via1_matching", 1) Default value is 0 (off). Can be set at runtime, e.g.: - $ sercmd cfg.set_now_int tm callid_matching 0 + $ kamcmd cfg.set_now_int tm callid_matching 0 Example 1.33. Set callid_matching parameter ... diff --git a/modules/tm/doc/params.xml b/modules/tm/doc/params.xml index 2e0099b..e85ebdc 100644 --- a/modules/tm/doc/params.xml +++ b/modules/tm/doc/params.xml @@ -1003,7 +1003,7 @@ modparam("tm", "via1_matching", 1) <para> Can be set at runtime, e.g.: <programlisting> - $ sercmd cfg.set_now_int tm callid_matching 0 + $ &sercmd; cfg.set_now_int tm callid_matching 0 </programlisting> </para> <example>

9 years, 2 months

git:master:52d88ef0: mi_rpc Change "sercmd" to "kamcmd" in docs

by Olle E. Johansson

Module: kamailio Branch: master Commit: 52d88ef0f0b0b361419edede208acd459af9fb1a URL: https://github.com/kamailio/kamailio/commit/52d88ef0f0b0b361419edede208acd4… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T12:46:06+01:00 mi_rpc Change "sercmd" to "kamcmd" in docs --- Modified: modules/mi_rpc/README Modified: modules/mi_rpc/doc/mi_rpc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/52d88ef0f0b0b361419edede208acd4… Patch: https://github.com/kamailio/kamailio/commit/52d88ef0f0b0b361419edede208acd4… --- diff --git a/modules/mi_rpc/README b/modules/mi_rpc/README index 9e93dd8..693fb87 100644 --- a/modules/mi_rpc/README +++ b/modules/mi_rpc/README @@ -119,7 +119,7 @@ modparam("mi_rpc","rpc_url","tcp:localhost:2046") Depending on the version (e.g. mi, mi_dg) it formats the output in a similar way to the corresponding kamailio mi module: * mi - uses a special, "pretty" format which generates nicer (more - readable) output when used with sercmd. + readable) output when used with kamcmd. * mi_dg - uses an output format similar to the kamailio mi_datagram module. * mi_fifo - uses an output format similar to the kamailio mi_fifo @@ -135,8 +135,8 @@ modparam("mi_rpc","rpc_url","tcp:localhost:2046") _parameters_ - the MI command parameters (optional). - Example using 'sercmd': -sercmd> mi uptime + Example using 'kamcmd': +kamcmd> mi uptime Now:: Thu Sep 24 18:17:15 2009 Up since:: Thu Sep 24 17:35:45 2009 Up time:: 2490 [sec] diff --git a/modules/mi_rpc/doc/mi_rpc_admin.xml b/modules/mi_rpc/doc/mi_rpc_admin.xml index c51793c..18b4bdc 100644 --- a/modules/mi_rpc/doc/mi_rpc_admin.xml +++ b/modules/mi_rpc/doc/mi_rpc_admin.xml @@ -96,7 +96,7 @@ modparam("mi_rpc","rpc_url","tcp:localhost:2046") <listitem> <function>mi</function> - uses a special, "pretty" format which generates nicer (more readable) output when used with - sercmd. + kamcmd. </listitem> <listitem> <function>mi_dg</function> - uses an output format similar to @@ -125,10 +125,10 @@ modparam("mi_rpc","rpc_url","tcp:localhost:2046") (optional). </para> <para> - Example using 'sercmd': + Example using 'kamcmd': </para> <programlisting format="linespecific"> -sercmd> mi uptime +kamcmd> mi uptime Now:: Thu Sep 24 18:17:15 2009 Up since:: Thu Sep 24 17:35:45 2009 Up time:: 2490 [sec]

9 years, 2 months

git:master:c1a1a1bb: srdb1 Check if the module is loaded, so the error message makes sense in case of missing module

by Olle E. Johansson

Module: kamailio Branch: master Commit: c1a1a1bb054ee79af6ca44d262c8f73c725a2d90 URL: https://github.com/kamailio/kamailio/commit/c1a1a1bb054ee79af6ca44d262c8f73… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T12:43:02+01:00 srdb1 Check if the module is loaded, so the error message makes sense in case of missing module If a module use a default database and it's not loaded, currently Kamailio complains that the module doesn't implement an API function instead of actually telling the Kamailian that the module is not loaded. This patch modifies that behaviour. --- Modified: lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/c1a1a1bb054ee79af6ca44d262c8f73… Patch: https://github.com/kamailio/kamailio/commit/c1a1a1bb054ee79af6ca44d262c8f73… --- diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index e7323e3..fda8f9e 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -199,6 +199,10 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) tmp = name; } + if (!find_module_by_name(tmp)) { + LM_ERR("Module %s not found. Missing loadmodule? \n", tmp); + goto error; + } dbind = (db_bind_api_f)find_mod_export(tmp, "db_bind_api", 0, 0); if(dbind != NULL) {

9 years, 2 months

git:master:6cbc77a8: curl Add information about return value of curl_connect

by Olle E. Johansson

Module: kamailio Branch: master Commit: 6cbc77a8048fa4c6e4c987b9bfaacad137db1255 URL: https://github.com/kamailio/kamailio/commit/6cbc77a8048fa4c6e4c987b9bfaacad… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T11:40:34+01:00 curl Add information about return value of curl_connect --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6cbc77a8048fa4c6e4c987b9bfaacad… Patch: https://github.com/kamailio/kamailio/commit/6cbc77a8048fa4c6e4c987b9bfaacad… --- diff --git a/modules/curl/README b/modules/curl/README index 58cf21b..1ce4575 100644 --- a/modules/curl/README +++ b/modules/curl/README @@ -294,6 +294,10 @@ content_type, data, result) Sends HTTP GET or POST request to a given connection. For a POST request, content-type can be specified. + The return value is the HTTP return code (if >=100) or the CURL error + code if below 100. See the $curlerror pseudovariable below for more + information about CURL error codes. + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. diff --git a/modules/curl/doc/curl_admin.xml b/modules/curl/doc/curl_admin.xml index ce3eba7..3bd7c31 100644 --- a/modules/curl/doc/curl_admin.xml +++ b/modules/curl/doc/curl_admin.xml @@ -270,8 +270,13 @@ modparam("curl", "curlcon", "apifour=>http://stockholm.example.com/api/getstuff; <function moreinfo="none">curl_connect(connection, url, content_type, data, result)</function> </title> <para> - Sends HTTP GET or POST request to a given connection. For a - POST request, content-type can be specified. + Sends HTTP GET or POST request to a given connection. For a + POST request, content-type can be specified. + </para> + <para> + The return value is the HTTP return code (if >=100) or the + CURL error code if below 100. See the $curlerror pseudovariable + below for more information about CURL error codes. </para> <para> This function can be used from REQUEST_ROUTE,

9 years, 2 months

git:master:dd19f2f6: curl Adding docs on the curl_connect function

by Olle E. Johansson

Module: kamailio Branch: master Commit: dd19f2f6fea6c9095baaaee3eda9f4aaf86127dc URL: https://github.com/kamailio/kamailio/commit/dd19f2f6fea6c9095baaaee3eda9f4a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T11:34:39+01:00 curl Adding docs on the curl_connect function These docs needs to be extended, but it is a starting point --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd19f2f6fea6c9095baaaee3eda9f4a… Patch: https://github.com/kamailio/kamailio/commit/dd19f2f6fea6c9095baaaee3eda9f4a…

9 years, 2 months

git:master:123fa9af: curl Add documentation for RPC command curl.listcon

by Olle E. Johansson

Module: kamailio Branch: master Commit: 123fa9af495ee7b79e97fa4a9c54fd0618d6a9c0 URL: https://github.com/kamailio/kamailio/commit/123fa9af495ee7b79e97fa4a9c54fd0… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T10:50:58+01:00 curl Add documentation for RPC command curl.listcon --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/123fa9af495ee7b79e97fa4a9c54fd0… Patch: https://github.com/kamailio/kamailio/commit/123fa9af495ee7b79e97fa4a9c54fd0… --- diff --git a/modules/curl/README b/modules/curl/README index 2929ae2..e145e4c 100644 --- a/modules/curl/README +++ b/modules/curl/README @@ -48,11 +48,15 @@ Carsten Bock 5.1. $curlerror(error) - 6. Counters + 6. RPC Commands - 6.1. curl.connections - 6.2. curl.connok - 6.3. curl.connfail + 6.1. curl.listcon + + 7. Counters + + 7.1. curl.connections + 7.2. curl.connok + 7.3. curl.connfail List of Examples @@ -95,11 +99,15 @@ Chapter 1. Admin Guide 5.1. $curlerror(error) - 6. Counters + 6. RPC Commands + + 6.1. curl.listcon - 6.1. curl.connections - 6.2. curl.connok - 6.3. curl.connfail + 7. Counters + + 7.1. curl.connections + 7.2. curl.connok + 7.3. curl.connfail 1. Overview @@ -323,20 +331,31 @@ switch ($retcode) { cURL error codes, please visit http://curl.haxx.se/libcurl/c/libcurl-errors.html -6. Counters +6. RPC Commands + + 6.1. curl.listcon + +6.1. curl.listcon + + Lists all defined CURL connections + + Parameters: + * No parameters + +7. Counters - 6.1. curl.connections - 6.2. curl.connok - 6.3. curl.connfail + 7.1. curl.connections + 7.2. curl.connok + 7.3. curl.connfail -6.1. curl.connections +7.1. curl.connections The number of connection definitions that are in-memory. -6.2. curl.connok +7.2. curl.connok The number of successful connections since Kamailio start -6.3. curl.connfail +7.3. curl.connfail The number of failed connections since Kamailio start diff --git a/modules/curl/doc/curl_admin.xml b/modules/curl/doc/curl_admin.xml index 5f33dd1..49445d4 100644 --- a/modules/curl/doc/curl_admin.xml +++ b/modules/curl/doc/curl_admin.xml @@ -337,6 +337,20 @@ switch ($retcode) { </section> </section> <section> + <title>RPC Commands</title> + <section> + <title><function moreinfo="none">curl.listcon</function></title> + <para> + Lists all defined CURL connections + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>No parameters</para></listitem> + + </itemizedlist> + </section> + </section> + <section> <title>Counters</title> <section > <title>

9 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015