sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

Re: [sr-dev] [kamailio/kamailio] rr: more log details when 2nd rr with r2=on is not matching a local socket (b814c5a)

by Daniel-Constantin Mierla

Thanks, pushed a patch to fix it. -- 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/commit/b814c5aadc690ceeca75e6ce25bf850…

7 years, 6 months

git:master:e310762f: rr: fixed typo in log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e310762f71afd3e290e709f2d6786d44ce15ee1a URL: https://github.com/kamailio/kamailio/commit/e310762f71afd3e290e709f2d6786d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-27T11:26:43+02:00 rr: fixed typo in log message - due to previous commit - reported by Alberto Llamas --- Modified: modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/e310762f71afd3e290e709f2d6786d4… Patch: https://github.com/kamailio/kamailio/commit/e310762f71afd3e290e709f2d6786d4… --- diff --git a/modules/rr/loose.c b/modules/rr/loose.c index afcbbbc..ef68545 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -832,10 +832,10 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) set_force_socket(_m, si); } else { if (enable_socket_mismatch_warning) { - LM_WARN("no socket found for match second RR (%.*s)\n", + LM_WARN("no socket found to match second RR (%.*s)\n", rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); if(!is_myself(&puri)) { - LM_WARN("second RR uri si not myself (%.*s)\n", + LM_WARN("second RR uri is not myself (%.*s)\n", rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); } }

7 years, 6 months

Re: [sr-dev] [kamailio/kamailio] rr: more log details when 2nd rr with r2=on is not matching a local socket (b814c5a)

by Alberto Llamas

There is a typo. -- 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/commit/b814c5aadc690ceeca75e6ce25bf850…

7 years, 6 months

git:master:b814c5aa: rr: more log details when 2nd rr with r2=on is not matching a local socket

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b814c5aadc690ceeca75e6ce25bf850ddfc4b44a URL: https://github.com/kamailio/kamailio/commit/b814c5aadc690ceeca75e6ce25bf850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-27T09:41:51+02:00 rr: more log details when 2nd rr with r2=on is not matching a local socket --- Modified: modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/b814c5aadc690ceeca75e6ce25bf850… Patch: https://github.com/kamailio/kamailio/commit/b814c5aadc690ceeca75e6ce25bf850… --- diff --git a/modules/rr/loose.c b/modules/rr/loose.c index 71d7d43..afcbbbc 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -125,7 +125,7 @@ static inline int find_first_route(struct sip_msg* _m) static inline int is_myself(sip_uri_t *_puri) { int ret; - + ret = check_self(&_puri->host, _puri->port_no?_puri->port_no:SIP_PORT, 0);/* match all protos*/ if (ret < 0) return 0; @@ -138,7 +138,7 @@ static inline int is_myself(sip_uri_t *_puri) return 0; } #endif - + if(ret==1) { /* match on host:port, but if gruu, then fail */ if(_puri->gr.s!=NULL) @@ -831,8 +831,14 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) if (si) { set_force_socket(_m, si); } else { - if (enable_socket_mismatch_warning) - LM_WARN("no socket found for match second RR\n"); + if (enable_socket_mismatch_warning) { + LM_WARN("no socket found for match second RR (%.*s)\n", + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); + if(!is_myself(&puri)) { + LM_WARN("second RR uri si not myself (%.*s)\n", + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); + } + } } }

7 years, 6 months

git:master:0cfb2224: dmq_usrloc: Use ruid for saving/updating contacts

by Carsten Bock

Module: kamailio Branch: master Commit: 0cfb2224cbca5cfcf125ad46593573f1e4b94e36 URL: https://github.com/kamailio/kamailio/commit/0cfb2224cbca5cfcf125ad46593573f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-10-25T17:37:36+02:00 dmq_usrloc: Use ruid for saving/updating contacts --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/0cfb2224cbca5cfcf125ad46593573f… Patch: https://github.com/kamailio/kamailio/commit/0cfb2224cbca5cfcf125ad46593573f… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index c256af4..9fd6322 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -51,9 +51,9 @@ extern str _dmq_usrloc_domain; static int add_contact(str aor, ucontact_info_t* ci) { - urecord_t* r; + urecord_t* r = NULL; udomain_t* _d; - ucontact_t* c; + ucontact_t* c = NULL; str contact; int res; @@ -64,35 +64,52 @@ static int add_contact(str aor, ucontact_info_t* ci) dmq_ul.lock_udomain(_d, &aor); - res = dmq_ul.get_urecord(_d, &aor, &r); - if (res < 0) { - LM_ERR("failed to retrieve record from usrloc\n"); - goto error; - } else if ( res == 0) { - LM_DBG("'%.*s' found in usrloc\n", aor.len, ZSW(aor.s)); - res = dmq_ul.get_ucontact(r, ci->c, ci->callid, ci->path, ci->cseq, &c); - LM_DBG("get_ucontact = %d\n", res); - if (res==-1) { - LM_ERR("Invalid cseq\n"); + LM_DBG("aor: %.*s\n", aor.len, aor.s); + LM_DBG("ci->ruid: %.*s\n", ci->ruid.len, ci->ruid.s); + LM_DBG("aorhash: %i\n", dmq_ul.get_aorhash(&aor)); + + if (ci->ruid.len > 0) { + // Search by ruid, if possible + res = dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c); + if (res == 0) { + LM_DBG("Found contact\n"); + dmq_ul.update_ucontact(r, c, ci); + LM_DBG("Release record\n"); + dmq_ul.release_urecord(r); + LM_DBG("Unlock udomain\n"); + dmq_ul.unlock_udomain(_d, &aor); + return 0; + } + } + res = dmq_ul.get_urecord(_d, &aor, &r); + if (res < 0) { + LM_ERR("failed to retrieve record from usrloc\n"); goto error; - } else if (res > 0 ) { - LM_DBG("Not found contact\n"); + } else if ( res == 0) { + LM_DBG("'%.*s' found in usrloc\n", aor.len, ZSW(aor.s)); + res = dmq_ul.get_ucontact(r, ci->c, ci->callid, ci->path, ci->cseq, &c); + LM_DBG("get_ucontact = %d\n", res); + if (res==-1) { + LM_ERR("Invalid cseq\n"); + goto error; + } else if (res > 0 ) { + LM_DBG("Not found contact\n"); + contact.s = ci->c->s; + contact.len = ci->c->len; + dmq_ul.insert_ucontact(r, &contact, ci, &c); + } else if (res == 0) { + LM_DBG("Found contact\n"); + dmq_ul.update_ucontact(r, c, ci); + } + } else { + LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + dmq_ul.insert_urecord(_d, &aor, &r); + LM_DBG("Insert record\n"); contact.s = ci->c->s; contact.len = ci->c->len; dmq_ul.insert_ucontact(r, &contact, ci, &c); - } else if (res == 0) { - LM_DBG("Found contact\n"); - dmq_ul.update_ucontact(r, c, ci); + LM_DBG("Insert ucontact\n"); } - } else { - LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); - dmq_ul.insert_urecord(_d, &aor, &r); - LM_DBG("Insert record\n"); - contact.s = ci->c->s; - contact.len = ci->c->len; - dmq_ul.insert_ucontact(r, &contact, ci, &c); - LM_DBG("Insert ucontact\n"); - } LM_DBG("Release record\n"); dmq_ul.release_urecord(r);

7 years, 6 months

git:master:1460e478: sca: sca_call_info_update() fix [to|from]_aor values when using [to|from] header params

by Victor Seva

Module: kamailio Branch: master Commit: 1460e478d173681076ec106bafa15b7a424f42d0 URL: https://github.com/kamailio/kamailio/commit/1460e478d173681076ec106bafa15b7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-25T15:37:20+02:00 sca: sca_call_info_update() fix [to|from]_aor values when using [to|from] header params * params can have "<sip:user@domain>;tag=value" --- Modified: modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/1460e478d173681076ec106bafa15b7… Patch: https://github.com/kamailio/kamailio/commit/1460e478d173681076ec106bafa15b7… --- diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 3d92908..58213b3 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1900,8 +1900,11 @@ int sca_call_info_update(sip_msg_t *msg, char *p1, str *uri_to, str *uri_from) } LM_DBG("from[%.*s] param\n", STR_FMT(uri_from)); to_body_flags |= SCA_CALL_INFO_UPDATE_FLAG_FROM_ALLOC; - from_aor.s = uri_from->s; - from_aor.len = uri_from->len; + if (sca_uri_extract_aor(&from->uri, &from_aor) < 0) { + LM_ERR("Failed to extract AoR from From URI %.*s\n", + STR_FMT(&from->uri)); + goto done; + } } else if (sca_get_msg_from_header(msg, &from) < 0) { LM_ERR("Bad From header\n"); @@ -1914,8 +1917,11 @@ int sca_call_info_update(sip_msg_t *msg, char *p1, str *uri_to, str *uri_from) } LM_DBG("to[%.*s] param\n", STR_FMT(uri_to)); to_body_flags |= SCA_CALL_INFO_UPDATE_FLAG_TO_ALLOC; - to_aor.s = uri_to->s; - to_aor.len = uri_to->len; + if (sca_uri_extract_aor(&to->uri, &to_aor) < 0) { + LM_ERR("Failed to extract AoR from To URI %.*s\n", + STR_FMT(&to->uri)); + goto done; + } } else if (sca_get_msg_to_header(msg, &to) < 0) { LM_ERR("Bad To header\n"); @@ -1947,16 +1953,20 @@ int sca_call_info_update(sip_msg_t *msg, char *p1, str *uri_to, str *uri_from) } aor_flags |= SCA_CALL_INFO_UPDATE_FLAG_FROM_ALLOC; } - if (sca_uri_extract_aor(&to->uri, &to_aor) < 0) { - LM_ERR("Failed to extract AoR from To URI %.*s\n", - STR_FMT(&to->uri)); - goto done; + if (uri_to==NULL) { + if (sca_uri_extract_aor(&to->uri, &to_aor) < 0) { + LM_ERR("Failed to extract AoR from To URI %.*s\n", + STR_FMT(&to->uri)); + goto done; + } } } else { - if (sca_uri_extract_aor(&from->uri, &from_aor) < 0) { - LM_ERR("Failed to extract AoR from From URI %.*s\n", - STR_FMT(&from->uri)); - goto done; + if (uri_from==NULL) { + if (sca_uri_extract_aor(&from->uri, &from_aor) < 0) { + LM_ERR("Failed to extract AoR from From URI %.*s\n", + STR_FMT(&from->uri)); + goto done; + } } if (uri_to==NULL) { if (sca_create_canonical_aor(msg, &to_aor) < 0) {

7 years, 6 months

git:master:0683df11: mem: TLSF bit ops cleanup / 64 bits improvement

by Camille Oudot

Module: kamailio Branch: master Commit: 0683df11e319aa3db45cd9b18af3a3c3b02088a8 URL: https://github.com/kamailio/kamailio/commit/0683df11e319aa3db45cd9b18af3a3c… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-10-25T11:32:35+02:00 mem: TLSF bit ops cleanup / 64 bits improvement - remove unsupproted compilers - use 64 bits __builtin_clzl() instead of twice 32 bits __builtin_clz() --- Modified: mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/0683df11e319aa3db45cd9b18af3a3c… Patch: https://github.com/kamailio/kamailio/commit/0683df11e319aa3db45cd9b18af3a3c… --- diff --git a/mem/tlsf_malloc_bits.h b/mem/tlsf_malloc_bits.h index 3be2579..29c783d 100644 --- a/mem/tlsf_malloc_bits.h +++ b/mem/tlsf_malloc_bits.h @@ -37,6 +37,8 @@ /* ** gcc 3.4 and above have builtin support, specialized for architecture. ** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros */ #if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ && defined (__GNUC_PATCHLEVEL__) @@ -52,78 +54,13 @@ tlsf_decl int tlsf_fls(unsigned int word) return bit - 1; } -#elif defined (_MSC_VER) && (_MSC_VER >= 1400) && (defined (_M_IX86) || defined (_M_X64)) -/* Microsoft Visual C++ support on x86/X64 architectures. */ - -#include <intrin.h> - -#pragma intrinsic(_BitScanReverse) -#pragma intrinsic(_BitScanForward) - -tlsf_decl int tlsf_fls(unsigned int word) -{ - unsigned long index; - return _BitScanReverse(&index, word) ? index : -1; -} - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - unsigned long index; - return _BitScanForward(&index, word) ? index : -1; -} - -#elif defined (_MSC_VER) && defined (_M_PPC) -/* Microsoft Visual C++ support on PowerPC architectures. */ - -#include <ppcintrinsics.h> - -tlsf_decl int tlsf_fls(unsigned int word) -{ - const int bit = 32 - _CountLeadingZeros(word); - return bit - 1; -} - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - const unsigned int reverse = word & (~word + 1); - const int bit = 32 - _CountLeadingZeros(reverse); - return bit - 1; -} - -#elif defined (__ARMCC_VERSION) -/* RealView Compilation Tools for ARM */ - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - const unsigned int reverse = word & (~word + 1); - const int bit = 32 - __clz(reverse); - return bit - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - const int bit = word ? 32 - __clz(word) : 0; - return bit - 1; -} - -#elif defined (__ghs__) -/* Green Hills support for PowerPC */ - -#include <ppc_ghs.h> - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - const unsigned int reverse = word & (~word + 1); - const int bit = 32 - __CLZ32(reverse); - return bit - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) { - const int bit = word ? 32 - __CLZ32(word) : 0; + const int bit = size ? 64 - __builtin_clzl(size) : 0; return bit - 1; } - +#endif #else /* Fall back to generic implementation. */ @@ -152,9 +89,6 @@ tlsf_decl int tlsf_fls(unsigned int word) return tlsf_fls_generic(word) - 1; } -#endif - -/* Possibly 64-bit version of tlsf_fls. */ #if defined (TLSF_64BIT) tlsf_decl int tlsf_fls_sizet(size_t size) { @@ -171,7 +105,12 @@ tlsf_decl int tlsf_fls_sizet(size_t size) } return bits; } -#else +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) #define tlsf_fls_sizet tlsf_fls #endif

7 years, 6 months

git:master:bcc3857e: Merge pull request #829 from kamailio/janssonrpc-fix-memory-leak

by GitHub

Module: kamailio Branch: master Commit: bcc3857e21634485878eb82d89ca6f4e6b854934 URL: https://github.com/kamailio/kamailio/commit/bcc3857e21634485878eb82d89ca6f4… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2016-10-24T17:49:37-04:00 Merge pull request #829 from kamailio/janssonrpc-fix-memory-leak janssonrpc-c: fix memory leak when using janssonrpc_notification --- Modified: modules/janssonrpc-c/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/bcc3857e21634485878eb82d89ca6f4… Patch: https://github.com/kamailio/kamailio/commit/bcc3857e21634485878eb82d89ca6f4… --- diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c index ed0be6c..036032e 100644 --- a/modules/janssonrpc-c/janssonrpc_io.c +++ b/modules/janssonrpc-c/janssonrpc_io.c @@ -428,15 +428,18 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) if(ns) pkg_free(ns); if(json) free(json); - if (sent && notify_only == false) { - - const struct timeval tv = ms_to_tv(req->timeout); + if (sent) { + if (notify_only == true) { // free the request if using janssonrpc_notification function + free_request(req); + } else { + const struct timeval tv = ms_to_tv(req->timeout); - req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req); - if(event_add(req->timeout_ev, &tv)<0) { - ERR("event_add failed while setting request timer (%s).", - strerror(errno)); - return -1; + req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req); + if(event_add(req->timeout_ev, &tv)<0) { + ERR("event_add failed while setting request timer (%s).", + strerror(errno)); + return -1; + } } }

7 years, 7 months

git:master:c6b38e43: janssonrpc-c: fix memory leak when using janssonrpc_notification

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: c6b38e437387aba003bef8ef9496d5a7568e9c97 URL: https://github.com/kamailio/kamailio/commit/c6b38e437387aba003bef8ef9496d5a… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-10-24T15:53:29-04:00 janssonrpc-c: fix memory leak when using janssonrpc_notification --- Modified: modules/janssonrpc-c/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/c6b38e437387aba003bef8ef9496d5a… Patch: https://github.com/kamailio/kamailio/commit/c6b38e437387aba003bef8ef9496d5a… --- diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c index ed0be6c..036032e 100644 --- a/modules/janssonrpc-c/janssonrpc_io.c +++ b/modules/janssonrpc-c/janssonrpc_io.c @@ -428,15 +428,18 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) if(ns) pkg_free(ns); if(json) free(json); - if (sent && notify_only == false) { - - const struct timeval tv = ms_to_tv(req->timeout); + if (sent) { + if (notify_only == true) { // free the request if using janssonrpc_notification function + free_request(req); + } else { + const struct timeval tv = ms_to_tv(req->timeout); - req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req); - if(event_add(req->timeout_ev, &tv)<0) { - ERR("event_add failed while setting request timer (%s).", - strerror(errno)); - return -1; + req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req); + if(event_add(req->timeout_ev, &tv)<0) { + ERR("event_add failed while setting request timer (%s).", + strerror(errno)); + return -1; + } } }

7 years, 7 months

[kamailio/kamailio] janssonrpc-c: fix memory leak when using janssonrpc_notification (#829)

by Emmanuel Schmidbauer

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/829 -- Commit Summary -- * janssonrpc-c: fix memory leak when using janssonrpc_notification -- File Changes -- M modules/janssonrpc-c/janssonrpc_io.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/829.patch https://github.com/kamailio/kamailio/pull/829.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/829

7 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016