sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:5.0:10a6dec6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 10a6dec6a0278bfc4161651f28edf9402cc6b1d4 URL: https://github.com/kamailio/kamailio/commit/10a6dec6a0278bfc4161651f28edf94… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-25T12:16:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/10a6dec6a0278bfc4161651f28edf94… Patch: https://github.com/kamailio/kamailio/commit/10a6dec6a0278bfc4161651f28edf94… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index 451628d8b3..bc3360580f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -49,6 +49,7 @@ Alexandr Dubovikov 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -84,8 +85,9 @@ Alexandr Dubovikov 1.18. Set insert_retry_timeout parameter 1.19. Set callid_aleg_header parameter 1.20. Set topoh_unmask parameter - 1.21. sip_capture() usage - 1.22. report_capture() usage + 1.21. Set nonsip_hook parameter + 1.22. sip_capture() usage + 1.23. report_capture() usage Chapter 1. Admin Guide @@ -119,6 +121,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -186,6 +189,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 3.1. db_url (str) @@ -257,7 +261,7 @@ modparam("sipcapture", "db_insert_mode", 1) 3.6. capture_on (integer) - Parameter to enable/disable capture globaly (on(1)/off(0)) + Parameter to enable/disable capture globally (on(1)/off(0)) Default value is "0". @@ -456,6 +460,18 @@ modparam("sipcapture", "callid_aleg_header", "X-CallIDALeg") modparam("sipcapture", "topoh_unmask", 1) ... +3.21. nonsip_hook (int) + + If set to 1, event route sipcapture:siprequest is run when HEP message + is received. + + Default value is 0. + + Example 1.21. Set nonsip_hook parameter +... +modparam("sipcapture", "nonsip_hook", 1) +... + 4. Functions 4.1. sip_capture([table]) @@ -477,7 +493,7 @@ modparam("sipcapture", "topoh_unmask", 1) ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.21. sip_capture() usage + Example 1.22. sip_capture() usage ... sip_capture(); ... @@ -496,7 +512,7 @@ sip_capture("sip_capture_call_20160124"); ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.22. report_capture() usage + Example 1.23. report_capture() usage ... report_capture(); ...

1 0

git:master:cafabcf6: Merge pull request #1282 from oyvindkolbu/gcc-7
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: cafabcf658c203d07bd170b2ccbf8282600c19a0 URL: https://github.com/kamailio/kamailio/commit/cafabcf658c203d07bd170b2ccbf828… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:07:20+02:00 Merge pull request #1282 from oyvindkolbu/gcc-7 Support gcc 7+. --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cafabcf658c203d07bd170b2ccbf828… Patch: https://github.com/kamailio/kamailio/commit/cafabcf658c203d07bd170b2ccbf828…

1 0

[kamailio/kamailio] Support gcc 7+. (#1282)
by oyvindkolbu 25 Oct '17

25 Oct '17

Don't let Makefile.defs complain about old compiler when using gcc 7. This also gives gcc 7 the same default values as the other recent gcc versions. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1282 -- Commit Summary -- * Support gcc 7+. -- File Changes -- M src/Makefile.defs (70) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1282.patch https://github.com/kamailio/kamailio/pull/1282.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1282

2 2

git:master:c110c6b2: Support gcc 7+.
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: c110c6b2741739ff5f45953bfd0d46b9f3b888dc URL: https://github.com/kamailio/kamailio/commit/c110c6b2741739ff5f45953bfd0d46b… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T11:25:40+02:00 Support gcc 7+. --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c110c6b2741739ff5f45953bfd0d46b… Patch: https://github.com/kamailio/kamailio/commit/c110c6b2741739ff5f45953bfd0d46b…

1 0

git:5.0:81c7a69b: Merge pull request #1281 from oyvindkolbu/sipcapture-backport
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 81c7a69b0be87c39365c405f0e3f945b9d99a199 URL: https://github.com/kamailio/kamailio/commit/81c7a69b0be87c39365c405f0e3f945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:06:34+02:00 Merge pull request #1281 from oyvindkolbu/sipcapture-backport Sipcapture backport --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/examples/kamailio.cfg Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/81c7a69b0be87c39365c405f0e3f945… Patch: https://github.com/kamailio/kamailio/commit/81c7a69b0be87c39365c405f0e3f945…

1 0

git:5.0:055ad1cb: sipcapture: documentation typo
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 055ad1cb61f61d9996f0018727adfcb92fa98912 URL: https://github.com/kamailio/kamailio/commit/055ad1cb61f61d9996f0018727adfcb… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:51:22+02:00 sipcapture: documentation typo (cherry picked from commit 6452e86bcc3e4b927a2e511f3c7a9f464a69ac66) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/055ad1cb61f61d9996f0018727adfcb… Patch: https://github.com/kamailio/kamailio/commit/055ad1cb61f61d9996f0018727adfcb… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index d9d47cceda..c5590b3c1c 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -185,7 +185,7 @@ modparam("sipcapture", "db_insert_mode", 1) <section id="sipcapture.p.capture_on"> <title><varname>capture_on</varname> (integer)</title> <para> - Parameter to enable/disable capture globaly (on(1)/off(0)) + Parameter to enable/disable capture globally (on(1)/off(0)) </para> <para> <emphasis>

1 0

git:5.0:a3d53389: sipcapture: safety checks for values inside w_float2int()
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: a3d53389992f2ca7798a530d24677206b8be668b URL: https://github.com/kamailio/kamailio/commit/a3d53389992f2ca7798a530d2467720… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:51:16+02:00 sipcapture: safety checks for values inside w_float2int() (cherry picked from commit 97d8ebc966aba71efb3a964e71b00736db51401b) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/a3d53389992f2ca7798a530d2467720… Patch: https://github.com/kamailio/kamailio/commit/a3d53389992f2ca7798a530d2467720… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index a901236f46..99a1844c20 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1039,6 +1039,9 @@ static int w_float2int(struct sip_msg* _m, char* _val, char* _coof, char* s2) return -1; } + if(value.s==NULL || coof.s==NULL) + return -1; + ret = (int) (atof (value.s) * atoi(coof.s)); return ret ? ret : -1;

1 0

git:5.0:5274a0f9: sipcapture: keep hep buffer unmodified while getting PV $hep(NNN)
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 5274a0f9e5a5b74bbc37a6d74504b517d9dbfebe URL: https://github.com/kamailio/kamailio/commit/5274a0f9e5a5b74bbc37a6d74504b51… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:51:08+02:00 sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) - addition to GH PR #1191 (cherry picked from commit 2140d0141b5a7551ebbd072d801ce2339020dac0) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/5274a0f9e5a5b74bbc37a6d74504b51… Patch: https://github.com/kamailio/kamailio/commit/5274a0f9e5a5b74bbc37a6d74504b51… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index cd3338317c..6eaf13ab2b 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -973,8 +973,7 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch goto done; case 9: hg->time_sec = (hep_chunk_uint32_t *) (tmp); - hg->time_sec->data = ntohl(hg->time_sec->data); - ret = pv_get_uintval(msg, param, res, hg->time_sec->data); + ret = pv_get_uintval(msg, param, res, ntohl(hg->time_sec->data)); goto done; case 10:

1 0

git:5.0:f9092500: sipcapture: free allocated process memory before return
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: f909250081f06c5b9dfd96792cc7960ff00c9f32 URL: https://github.com/kamailio/kamailio/commit/f909250081f06c5b9dfd96792cc7960… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:58+02:00 sipcapture: free allocated process memory before return (cherry picked from commit ecf1ad77a2b9f69d5ae4f68fdc71cb1b10ebe729) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/f909250081f06c5b9dfd96792cc7960… Patch: https://github.com/kamailio/kamailio/commit/f909250081f06c5b9dfd96792cc7960… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 3e6d28793f..a901236f46 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -446,6 +446,7 @@ int parse_table_names (str table_name, str ** table_names){ names = (str*)pkg_malloc(sizeof(str) * no_tables); if(names == NULL) { LM_ERR("no more pkg memory left\n"); + pkg_free(table_name_cpy); return -1; } p = strtok (table_name_cpy,"| \t");

1 0

git:5.0:1c944f3f: sipcapture: fix custom field variable naming
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 1c944f3fb1d67dbeb97879d3177171af8d8aecd7 URL: https://github.com/kamailio/kamailio/commit/1c944f3fb1d67dbeb97879d3177171a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:53+02:00 sipcapture: fix custom field variable naming (cherry picked from commit c8a804f5e3c3b12b64871d3989a87d79d8627afe) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/1c944f3fb1d67dbeb97879d3177171a… Patch: https://github.com/kamailio/kamailio/commit/1c944f3fb1d67dbeb97879d3177171a… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 1111b9da65..3e6d28793f 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1887,7 +1887,7 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else { EMPTY_STR(sco.custom1); } /* Custom - field2 */ - if(custom_field3_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { + if(custom_field2_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { sco.custom2 = tmphdr[5]->body; } else { EMPTY_STR(sco.custom2); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017