- 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.patchhttps://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
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 "