sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:master:0fbac693: rtpproxy: init rtpproxy sockets array after allocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0fbac693b4d3ed913b64c2d000f27a96903b7e09 URL: https://github.com/kamailio/kamailio/commit/0fbac693b4d3ed913b64c2d000f27a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-07T14:53:28+02:00 rtpproxy: init rtpproxy sockets array after allocation - do not init sockets for PROC_MAIN (for for=yes) and PROC_INIT to avoid duplicating sockets with child processed --- Modified: modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/0fbac693b4d3ed913b64c2d000f27a9… Patch: https://github.com/kamailio/kamailio/commit/0fbac693b4d3ed913b64c2d000f27a9… --- diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index aacfb23..a36d323 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -862,6 +862,10 @@ child_init(int rank) if(rtpp_set_list==NULL ) return 0; + if(rank==PROC_INIT || (rank==PROC_MAIN && dont_fork==0)) { + return 0; + } + /* Iterate known RTP proxies - create sockets */ mypid = getpid(); @@ -870,6 +874,7 @@ child_init(int rank) LM_ERR("no more pkg memory\n"); return -1; } + memset(rtpp_socks, -1, sizeof(int)*rtpp_no); for(rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; rtpp_list = rtpp_list->rset_next){

8 years, 4 months

git:master:d76761bf: rtpengine: init rtp engine sockets array after allocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d76761bf95a5745240d655ee63241b8d4652611d URL: https://github.com/kamailio/kamailio/commit/d76761bf95a5745240d655ee63241b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-07T14:51:24+02:00 rtpengine: init rtp engine sockets array after allocation - it can result in closing the random values found in memory, which can overlap with valid sockets, due to follow up execution of build_rtpp_socks() - do not init sockets for PROC_MAIN (for for=yes) and PROC_INIT to avoid duplicating sockets with child processed --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d76761bf95a5745240d655ee63241b8… Patch: https://github.com/kamailio/kamailio/commit/d76761bf95a5745240d655ee63241b8… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 5fe83b0..afb9315 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -1809,6 +1809,7 @@ static int build_rtpp_socks(unsigned int current_rtpp_no) { for (i = 0; i < rtpp_socks_size; i++) { if (rtpp_socks[i] >= 0) { close(rtpp_socks[i]); + rtpp_socks[i] = -1; } } @@ -1818,6 +1819,7 @@ static int build_rtpp_socks(unsigned int current_rtpp_no) { LM_ERR("no more pkg memory for rtpp_socks\n"); return -1; } + memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); lock_get(rtpp_set_list->rset_head_lock); for (rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; @@ -1911,6 +1913,11 @@ child_init(int rank) if(!rtpp_set_list) return 0; + /* do not init sockets for PROC_INIT and main process when fork=yes */ + if(rank==PROC_INIT || (rank==PROC_MAIN && dont_fork==0)) { + return 0; + } + mypid = getpid(); lock_get(rtpp_no_lock); @@ -1921,6 +1928,7 @@ child_init(int rank) if (!rtpp_socks) { return -1; } + memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); // vector of pointers to queried nodes queried_nodes_ptr = (struct rtpp_node**)pkg_malloc(queried_nodes_limit * sizeof(struct rtpp_node*));

8 years, 4 months

mobile SIP provisioning with QR codes, TLS

by Daniel Pocock

We've got some GSoC students working on SIP and RTC related projects[1] this year under Debian. One of them will be looking at creating a library that can be used for provisioning apps like Lumicall[2] and CSipSimple[3] to work with servers like Kamailio If anybody would like to have some input on how the QR code or TLS certificates should be crafted, please come and join us on the free-rtc list: https://lists.fsfe.org/mailman/listinfo/free-rtc Regards, Daniel 1. https://wiki.debian.org/SummerOfCode2016/RTCProjects 2. https://lumicall.org 3. https://play.google.com/store/apps/details?id=com.csipsimple&hl=en

8 years, 4 months

git:master:adfce112: Merge pull request #698 from sjthomason/sipcapture-timestamp-fix

by GitHub

Module: kamailio Branch: master Commit: adfce1129913eb45c7c2d5854ce4b611b9b2e0e8 URL: https://github.com/kamailio/kamailio/commit/adfce1129913eb45c7c2d5854ce4b61… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-07T12:57:19+02:00 Merge pull request #698 from sjthomason/sipcapture-timestamp-fix Sipcapture timestamp fix --- Modified: modules/sipcapture/hep.c Modified: modules/sipcapture/hep.h Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/adfce1129913eb45c7c2d5854ce4b61… Patch: https://github.com/kamailio/kamailio/commit/adfce1129913eb45c7c2d5854ce4b61… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index 3114f2c..1ca2904 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -176,8 +176,8 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ hep_offset+=sizeof(struct hep_timehdr); heptime_tmp = (struct hep_timehdr*) hep_payload; - heptime->tv_sec = heptime_tmp->tv_sec; - heptime->tv_usec = heptime_tmp->tv_usec; + heptime->tv_sec = to_le(heptime_tmp->tv_sec); + heptime->tv_usec = to_le(heptime_tmp->tv_usec); heptime->captid = heptime_tmp->captid; } diff --git a/modules/sipcapture/hep.h b/modules/sipcapture/hep.h index c2433db..3135b6b 100644 --- a/modules/sipcapture/hep.h +++ b/modules/sipcapture/hep.h @@ -24,6 +24,13 @@ #ifndef _hep_h #define _hep_h +#include "../../endianness.h" + +#ifdef __IS_BIG_ENDIAN +#define to_le(x) bswap32(x) +#else +#define to_le(x) (x) +#endif #ifdef __OS_solaris typedef uint8_t u_int8_t; diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 4594e25..078f1a9 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1799,8 +1799,8 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_i if(hep_version == 2) { - hep_time.tv_sec = tvb.tv_sec; - hep_time.tv_usec = tvb.tv_usec; + hep_time.tv_sec = to_le(tvb.tv_sec); + hep_time.tv_usec = to_le(tvb.tv_usec); hep_time.captid = hep_capture_id; memcpy((void*)buffer+buflen, &hep_time, sizeof(struct hep_timehdr));

8 years, 4 months

git:master:0eac2809: siptrace: fix timestamp byte order

by Spencer Thomason

Module: kamailio Branch: master Commit: 0eac2809862cd8106c1fbfbcdcf0d05c768a9e64 URL: https://github.com/kamailio/kamailio/commit/0eac2809862cd8106c1fbfbcdcf0d05… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T03:03:40-07:00 siptrace: fix timestamp byte order - swap timestamp byte order on big endian machines --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0eac2809862cd8106c1fbfbcdcf0d05… Patch: https://github.com/kamailio/kamailio/commit/0eac2809862cd8106c1fbfbcdcf0d05… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 4594e25..078f1a9 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1799,8 +1799,8 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_i if(hep_version == 2) { - hep_time.tv_sec = tvb.tv_sec; - hep_time.tv_usec = tvb.tv_usec; + hep_time.tv_sec = to_le(tvb.tv_sec); + hep_time.tv_usec = to_le(tvb.tv_usec); hep_time.captid = hep_capture_id; memcpy((void*)buffer+buflen, &hep_time, sizeof(struct hep_timehdr));

8 years, 4 months

git:master:2200b214: sipcapture: fix timestamp byte order

by Spencer Thomason

Module: kamailio Branch: master Commit: 2200b214a314047697b4e080bc82b469933ff44b URL: https://github.com/kamailio/kamailio/commit/2200b214a314047697b4e080bc82b46… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T02:55:09-07:00 sipcapture: fix timestamp byte order - swap timestamp byte order on big endian machines --- Modified: modules/sipcapture/hep.c Modified: modules/sipcapture/hep.h --- Diff: https://github.com/kamailio/kamailio/commit/2200b214a314047697b4e080bc82b46… Patch: https://github.com/kamailio/kamailio/commit/2200b214a314047697b4e080bc82b46… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index 3114f2c..1ca2904 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -176,8 +176,8 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ hep_offset+=sizeof(struct hep_timehdr); heptime_tmp = (struct hep_timehdr*) hep_payload; - heptime->tv_sec = heptime_tmp->tv_sec; - heptime->tv_usec = heptime_tmp->tv_usec; + heptime->tv_sec = to_le(heptime_tmp->tv_sec); + heptime->tv_usec = to_le(heptime_tmp->tv_usec); heptime->captid = heptime_tmp->captid; } diff --git a/modules/sipcapture/hep.h b/modules/sipcapture/hep.h index c2433db..3135b6b 100644 --- a/modules/sipcapture/hep.h +++ b/modules/sipcapture/hep.h @@ -24,6 +24,13 @@ #ifndef _hep_h #define _hep_h +#include "../../endianness.h" + +#ifdef __IS_BIG_ENDIAN +#define to_le(x) bswap32(x) +#else +#define to_le(x) (x) +#endif #ifdef __OS_solaris typedef uint8_t u_int8_t;

8 years, 4 months

[kamailio/kamailio] Sipcapture timestamp fix (#698)

by sjthomason

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/698 -- Commit Summary -- * sipcapture: fix timestamp byte order * siptrace: fix timestamp byte order -- File Changes -- M modules/sipcapture/hep.c (4) M modules/sipcapture/hep.h (7) M modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/698.patch https://github.com/kamailio/kamailio/pull/698.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/698

8 years, 4 months

[kamailio/kamailio] db_mongodb: Compile warning CLANG (#696)

by Olle E. Johansson

´´´ CC (gcc) [M db_mongodb.so] mongodb_dbase.o mongodb_dbase.c:1207:48: warning: comparison of constant 0 with expression of type 'bool' is always false [-Wtautological-constant-out-of-range-compare] if(bson_append_document(udoc, "$set", 4, sdoc)<0) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ 1 warning generated. ´´´ --- 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/issues/696

8 years, 4 months

git:master:f32e12b3: db_mongodb: fix warning for bool comparison

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f32e12b3159cf3cd411505f875ccc8c56cf7c68f URL: https://github.com/kamailio/kamailio/commit/f32e12b3159cf3cd411505f875ccc8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-07T11:47:40+02:00 db_mongodb: fix warning for bool comparison - reported by Olle E. Johansson, GH #696 --- Modified: modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f32e12b3159cf3cd411505f875ccc8c… Patch: https://github.com/kamailio/kamailio/commit/f32e12b3159cf3cd411505f875ccc8c… --- diff --git a/modules/db_mongodb/mongodb_dbase.c b/modules/db_mongodb/mongodb_dbase.c index cad8a27..0aa3d21 100644 --- a/modules/db_mongodb/mongodb_dbase.c +++ b/modules/db_mongodb/mongodb_dbase.c @@ -1204,7 +1204,7 @@ int db_mongodb_update(const db1_con_t* _h, const db_key_t* _k, if(db_mongodb_bson_add(sdoc, _uk[i], _uv+i, i)<0) goto error; } - if(bson_append_document(udoc, "$set", 4, sdoc)<0) { + if(!bson_append_document(udoc, "$set", 4, sdoc)) { LM_ERR("failed to append document to bson document\n"); goto error; }

8 years, 4 months

git:master:c20f7d5c: Merge pull request #694 from sjthomason/add-byteswap-macros

by GitHub

Module: kamailio Branch: master Commit: c20f7d5cfa8d03265129363c5e52e1d50440a7bb URL: https://github.com/kamailio/kamailio/commit/c20f7d5cfa8d03265129363c5e52e1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-07T11:25:44+02:00 Merge pull request #694 from sjthomason/add-byteswap-macros core: add generic byte swap macros --- Modified: endianness.h --- Diff: https://github.com/kamailio/kamailio/commit/c20f7d5cfa8d03265129363c5e52e1d… Patch: https://github.com/kamailio/kamailio/commit/c20f7d5cfa8d03265129363c5e52e1d… --- diff --git a/endianness.h b/endianness.h index 53f0fba..e6edec2 100644 --- a/endianness.h +++ b/endianness.h @@ -30,6 +30,8 @@ * detected endianness corresponds to * the runtime detected one and -1 on * error (recommended action: bail out) + * - bswap16() - 16 bit byte swap + * - bswap32() - 32 bit byte swap * * Implementation notes: * Endian macro names/tests for different OSes: @@ -130,6 +132,29 @@ extern int endianness_sanity_check(void); #error BUG: both little & big endian detected in the same time #endif +#if defined __IS_LITTLE_ENDIAN +#include <arpa/inet.h> +#define bswap16(x) ntohs(x) +#define bswap32(x) ntohl(x) +#else /* !__IS_LITTLE_ENDIAN */ +#include <stdint.h> +#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +/* need at least GCC 4.8 for __builtin_bswap16 on all archs */ +#define bswap16(x) ((uint16_t)__builtin_bswap16(x)) +#else +#define bswap16(x) (((uint16_t)(x) >> 8) | \ + ((uint16_t)(x) << 8)) +#endif +#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +/* GCC >= 4.3 provides __builtin_bswap32 */ +#define bswap32(x) ((uint32_t)__builtin_bswap32(x)) +#else +#define bswap32(x) (((uint32_t)(x) << 24) | \ + (((uint32_t)(x) << 8) & 0xff0000) | \ + (((uint32_t)(x) >> 8) & 0xff00) | \ + ((uint32_t)(x) >> 24)) +#endif +#endif /* !__IS_LITTLE_ENDIAN */ #endif /* _endianness_h */

8 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016