sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:6addd34b: modules/sipcapture: added custom fields

by Alexandr Dubovikov

Module: kamailio Branch: master Commit: 6addd34bba9261b00e1eff575a186bf6fc446f36 URL: https://github.com/kamailio/kamailio/commit/6addd34bba9261b00e1eff575a186bf… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-09-30T11:46:57+02:00 modules/sipcapture: added custom fields --- Modified: modules/sipcapture/sipcapture.c Modified: modules/sipcapture/sipcapture.h --- Diff: https://github.com/kamailio/kamailio/commit/6addd34bba9261b00e1eff575a186bf… Patch: https://github.com/kamailio/kamailio/commit/6addd34bba9261b00e1eff575a186bf…

7 years, 7 months

[kamailio/kamailio] modules/sipcapture: added custom fields (#806)

by Alexandr Dubovikov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/806 -- Commit Summary -- * modules/sipcapture: added custom fields * modules/sipcapture: fixed if/else condition -- File Changes -- M modules/sipcapture/sipcapture.c (50) M modules/sipcapture/sipcapture.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/806.patch https://github.com/kamailio/kamailio/pull/806.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/806

7 years, 7 months

[kamailio/kamailio] modules/sipcapture: added custom fields (#805)

by Alexandr Dubovikov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/805 -- Commit Summary -- * modules/sipcapture: added custom fields -- File Changes -- M modules/sipcapture/sipcapture.c (50) M modules/sipcapture/sipcapture.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/805.patch https://github.com/kamailio/kamailio/pull/805.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/805

7 years, 7 months

git:4.4:64a8927b: dialog: no need to release the dialog when refreshing cseq

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 64a8927bd1f891c757a44fd31265ba4cd3a3d150 URL: https://github.com/kamailio/kamailio/commit/64a8927bd1f891c757a44fd31265ba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-29T09:22:45+02:00 dialog: no need to release the dialog when refreshing cseq - no direct reference was triggered inside the function (cherry picked from commit 3f9969d1790dd8d9349c0fa450c589f8038c43cc) --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/64a8927bd1f891c757a44fd31265ba4… Patch: https://github.com/kamailio/kamailio/commit/64a8927bd1f891c757a44fd31265ba4… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 7aaad02..4d60180 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -247,11 +247,9 @@ int dlg_cseq_refresh(sip_msg_t *msg, dlg_cell_t *dlg, sr_hdr_add_zs(msg, "P-K-CSeq-Refresh", &nval); done: - if(dlg!=NULL) dlg_release(dlg); return 0; error: - if(dlg!=NULL) dlg_release(dlg); return -1; }

7 years, 7 months

git:4.4:1987a419: dialog: wrapper defines for ref/unref operations to get file name and line

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 1987a419fbd551b6bc4550fe4f991a2a9d2ed2fb URL: https://github.com/kamailio/kamailio/commit/1987a419fbd551b6bc4550fe4f991a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-29T09:21:27+02:00 dialog: wrapper defines for ref/unref operations to get file name and line (cherry picked from commit be77f34091f63042b4df4d5445fc16c1da3ddcd9) --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/1987a419fbd551b6bc4550fe4f991a2… Patch: https://github.com/kamailio/kamailio/commit/1987a419fbd551b6bc4550fe4f991a2… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 9a96f1b..e0b603d 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -894,10 +894,12 @@ void link_dlg(struct dlg_cell *dlg, int n, int mode) * \param dlg dialog * \param cnt increment for the reference counter */ -void dlg_ref(dlg_cell_t *dlg, unsigned int cnt) +void dlg_ref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline) { dlg_entry_t *d_entry; + LM_DBG("ref op on %p with %d from %s:%d\n", dlg, cnt, fname, fline); d_entry = &(d_table->entries[dlg->h_entry]); dlg_lock( d_table, d_entry); @@ -912,10 +914,12 @@ void dlg_ref(dlg_cell_t *dlg, unsigned int cnt) * \param dlg dialog * \param cnt decrement for the reference counter */ -void dlg_unref(dlg_cell_t *dlg, unsigned int cnt) +void dlg_unref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline) { dlg_entry_t *d_entry; + LM_DBG("unref op on %p with %d from %s:%d\n", dlg, cnt, fname, fline); d_entry = &(d_table->entries[dlg->h_entry]); dlg_lock( d_table, d_entry); diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 954a7d4..f276f5c 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -387,8 +387,10 @@ void link_dlg(struct dlg_cell *dlg, int n, int mode); * \param dlg dialog * \param cnt decrement for the reference counter */ -void dlg_unref(dlg_cell_t *dlg, unsigned int cnt); +void dlg_unref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline); +#define dlg_unref(dlg, cnt) dlg_unref_helper((dlg), (cnt), __FILE__, __LINE__) /*! * \brief Refefence a dialog with locking @@ -396,8 +398,10 @@ void dlg_unref(dlg_cell_t *dlg, unsigned int cnt); * \param dlg dialog * \param cnt increment for the reference counter */ -void dlg_ref(dlg_cell_t *dlg, unsigned int cnt); +void dlg_ref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline); +#define dlg_ref(dlg, cnt) dlg_ref_helper((dlg), (cnt), __FILE__, __LINE__) /*! * \brief Release a dialog from ref counter by 1

7 years, 7 months

git:4.4:a83ca56b: http_client Terminate exported commands list

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: a83ca56b8481d7f0a13f6b4ba7aee7f2dbf4bb52 URL: https://github.com/kamailio/kamailio/commit/a83ca56b8481d7f0a13f6b4ba7aee7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-29T09:19:37+02:00 http_client Terminate exported commands list The list of exported functions was not terminated, which caused a segfault in find_mod_export_record() when reading outside the list. - backport of 166e6d80308adb822c9342cf75ac1ca8158e2f78 --- Modified: modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a83ca56b8481d7f0a13f6b4ba7aee7f… Patch: https://github.com/kamailio/kamailio/commit/a83ca56b8481d7f0a13f6b4ba7aee7f… --- diff --git a/modules/http_client/http_client.c b/modules/http_client/http_client.c index d05c346..a5aa800 100644 --- a/modules/http_client/http_client.c +++ b/modules/http_client/http_client.c @@ -133,6 +133,7 @@ static cmd_export_t cmds[] = { fixup_free_curl_connect_post, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, + {0,0,0,0,0,0} };

7 years, 7 months

git:master:276ccc31: Merge pull request #802 from giavac/master

by GitHub

Module: kamailio Branch: master Commit: 276ccc3149dc2eee546e0ad1db770c5269cace20 URL: https://github.com/kamailio/kamailio/commit/276ccc3149dc2eee546e0ad1db770c5… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-09-28T22:58:02+02:00 Merge pull request #802 from giavac/master sipcapture: remove workaround of correlation_id --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/276ccc3149dc2eee546e0ad1db770c5… Patch: https://github.com/kamailio/kamailio/commit/276ccc3149dc2eee546e0ad1db770c5… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 466b7d7..6988e45 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2348,7 +2348,6 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(log_table, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column; @@ -2523,7 +2522,6 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d else if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(_table->s, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column;

7 years, 7 months

git:master:6cb0bec7: sipcapture: remove workaround of correlation_id

by Giacomo Vacca

Module: kamailio Branch: master Commit: 6cb0bec7d2491ed3365dc237fc1d8608af246c3a URL: https://github.com/kamailio/kamailio/commit/6cb0bec7d2491ed3365dc237fc1d860… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2016-09-28T14:49:42+02:00 sipcapture: remove workaround of correlation_id - Compatible with Asterisk >= 10 --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/6cb0bec7d2491ed3365dc237fc1d860… Patch: https://github.com/kamailio/kamailio/commit/6cb0bec7d2491ed3365dc237fc1d860… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 466b7d7..6988e45 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2348,7 +2348,6 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(log_table, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column; @@ -2523,7 +2522,6 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d else if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(_table->s, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column;

7 years, 7 months

[kamailio/kamailio] sipcapture: remove workaround of correlation_id (#802)

by Giacomo Vacca

- Compatible with Asterisk >= 10 Without this items in `rtcp_capture` table from FreeSWITCH or RTPEngine would have the `correlation_id` truncated. Could be made conditional with the last element of correlation_id being `\0`, to keep compatibility with Asterisk 1.8, but otherwise this is a simple removal of the existing workaround. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/802 -- Commit Summary -- * sipcapture: remove workaround of correlation_id -- File Changes -- M modules/sipcapture/sipcapture.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/802.patch https://github.com/kamailio/kamailio/pull/802.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/802

7 years, 7 months

git:4.0:0bb77356: tls: proper check of libssl versions used for compilation and available on system

by Victor Seva

Module: kamailio Branch: 4.0 Commit: 0bb773561c8b41e770edb926cedc0968fa8b3ac2 URL: https://github.com/kamailio/kamailio/commit/0bb773561c8b41e770edb926cedc096… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-09-28T17:39:00+02:00 tls: proper check of libssl versions used for compilation and available on system - shift out the last 12bits, being the patch version and status (see man SSLeay) - reported by Victor Seva, GH #662 (cherry picked from commit c38b4c7345a6806f48a0cdb07841e10bc962e1bf) (cherry picked from commit 253909bf673c0a59e7adf578bb5df73eb157d0f2) (cherry picked from commit 5632abc108bf8ed8157a77806ea80b962db3fa4f) (cherry picked from commit 0a5f99b28d01d79cf2675df6d2a6220167e2476e) (cherry picked from commit 35c30994c4c9ed7ffa78224b37af5ec972c7ca61) --- Modified: modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/0bb773561c8b41e770edb926cedc096… Patch: https://github.com/kamailio/kamailio/commit/0bb773561c8b41e770edb926cedc096… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index b629afa..e02f07d 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -503,8 +503,10 @@ int init_tls_h(void) #endif ssl_version=SSLeay(); /* check if version have the same major minor and fix level - * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) */ - if ((ssl_version>>8)!=(OPENSSL_VERSION_NUMBER>>8)){ + * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) + * - values is represented as 0xMMNNFFPPS: major minor fix patch status + * 0x00090705f == 0.9.7e release */ + if ((ssl_version>>12)!=(OPENSSL_VERSION_NUMBER>>12)){ LOG(L_CRIT, "ERROR: tls: init_tls_h: installed openssl library " "version is too different from the library the ser tls module " "was compiled with: installed \"%s\" (0x%08lx), compiled "

7 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016