sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:master:f5d4446d: topos: use _strnstr() from core instead of strnstr()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5d4446dae8db02e6d4136724f85baed65f7bf4a URL: https://github.com/kamailio/kamailio/commit/f5d4446dae8db02e6d4136724f85bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-15T12:40:47+01:00 topos: use _strnstr() from core instead of strnstr() --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/f5d4446dae8db02e6d4136724f85bae… Patch: https://github.com/kamailio/kamailio/commit/f5d4446dae8db02e6d4136724f85bae… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index a44ff34..eee546d 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -381,7 +381,7 @@ int tps_pack_request(sip_msg_t *msg, tps_data_t *ptsd) if(i==1) { ptsd->bs_contact.s = ptsd->cp; ptsd->bs_contact.len = rr->nameaddr.uri.len; - if(strnstr(ptsd->bs_contact.s, ";r2=on", + if(_strnstr(ptsd->bs_contact.s, ";r2=on", ptsd->bs_contact.len)==0) { LM_DBG("single record routing by proxy\n"); ptsd->as_contact.s = ptsd->cp;

8 years, 8 months

git:master:7772e14f: core: _strnstr() and _strnistr() defined in core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7772e14fc298956f57429a67ea4524818b22a158 URL: https://github.com/kamailio/kamailio/commit/7772e14fc298956f57429a67ea45248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-15T12:40:47+01:00 core: _strnstr() and _strnistr() defined in core - alternative to strnstr() which is not in all OSes, pluse the insensitive option --- Modified: str.c Modified: str.h --- Diff: https://github.com/kamailio/kamailio/commit/7772e14fc298956f57429a67ea45248… Patch: https://github.com/kamailio/kamailio/commit/7772e14fc298956f57429a67ea45248… --- diff --git a/str.c b/str.c index c9c4d33..fda76c9 100644 --- a/str.c +++ b/str.c @@ -1,5 +1,6 @@ /* * + * Copyright (C) 2015 kamailio.org * Copyright (C) 2014 Victor Seva <vseva(a)sipwise.com> * * This file is part of kamailio, a free SIP server. @@ -48,3 +49,53 @@ int str_append(str *orig, str *suffix, str *dest) memcpy(dest->s+orig->len, suffix->s, suffix->len); return 0; } + +/* +* Find the first occurrence of find in s, where the search is limited to the +* first slen characters of s. +*/ +char * _strnstr(const char* s, const char* find, size_t slen) +{ + char c, sc; + size_t len; + + if ((c = *find++) != '\0') { + len = strlen(find); + do { + do { + if (slen-- < 1 || (sc = *s++) == '\0') + return (NULL); + } while (sc != c); + if (len > slen) + return (NULL); + } while (strncmp(s, find, len) != 0); + s--; + } + return ((char *)s); +} + +/* + * Find the first case insensitive occurrence of find in s, where the + * search is limited to the first slen characters of s. + * Based on FreeBSD strnstr. + */ +char* _strnistr(const char *s, const char *find, size_t slen) +{ + char c, sc; + size_t len; + + if ((c = *find++) != '\0') { + len = strlen(find); + do { + do { + if ((sc = *s++) == '\0' || slen-- < 1) + return (NULL); + } while (sc != c); + if (len > slen) + return (NULL); + } while (strncasecmp(s, find, len) != 0); + s--; + } + return ((char *)s); +} + diff --git a/str.h b/str.h index 9ef8809..de226c7 100644 --- a/str.h +++ b/str.h @@ -21,6 +21,8 @@ #ifndef str_h #define str_h +#include <string.h> + /** @defgroup str_string Counted-Length Strings * @{ * @@ -125,4 +127,7 @@ typedef struct _str str; */ int str_append(str *orig, str *suffix, str *dest); +char* _strnstr(const char *s, const char *find, size_t slen); +char* _strnistr(const char *s, const char *find, size_t slen); + #endif

8 years, 8 months

git:master:057dd97e: modules/ims_registrar_scscf: provide protection for re-registration of implicit set

by jaybeepee

Module: kamailio Branch: master Commit: 057dd97ea28d95b9bf733692a23d42d8211eeb4c URL: https://github.com/kamailio/kamailio/commit/057dd97ea28d95b9bf733692a23d42d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-15T13:40:32+02:00 modules/ims_registrar_scscf: provide protection for re-registration of implicit set --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/057dd97ea28d95b9bf733692a23d42d… Patch: https://github.com/kamailio/kamailio/commit/057dd97ea28d95b9bf733692a23d42d… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index da1dc69..a33dbcf 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -835,19 +835,23 @@ int update_contacts(struct sip_msg* msg, udomain_t* _d, continue; } + ul.lock_udomain(_d, &pi->public_identity); //update the implicit IMPU with the new data if (ul.update_impurecord(_d, &pi->public_identity, 0, reg_state, -1 /*do not change send sar on delete */, pi->barring, 0, s, ccf1, ccf2, ecf1, ecf2, &impu_rec) != 0) { LM_ERR("Unable to update implicit impurecord for <%.*s>.... continuing\n", pi->public_identity.len, pi->public_identity.s); + ul.unlock_udomain(_d, &pi->public_identity); continue; } //update the contacts for the explicit IMPU if (update_contacts_helper(msg, impu_rec, assignment_type, expires_hdr) != 0) { LM_ERR("Failed trying to update contacts for re-registration of implicit IMPU <%.*s>.......continuing\n", pi->public_identity.len, pi->public_identity.s); + ul.unlock_udomain(_d, &pi->public_identity); continue; } + ul.unlock_udomain(_d, &pi->public_identity); } } ul.lock_subscription(subscription);

8 years, 8 months

[kamailio] memory leak in permissions module (#533)

by Emmanuel Schmidbauer

Hello, We've noticed a memory leak caused by reloading the trusted table data. ```` kamctl trusted reload ```` We verified this by running script to reload the data frequently and captured memory usage using kex + corex. Thanks, Emmanuel --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/533

8 years, 8 months

git:4.4:2271e6bd: modules/topos: fix warning: variable "ptsd" set but not used [-Wunused-but-set-variable]

by Ovidiu Sas

Module: kamailio Branch: 4.4 Commit: 2271e6bdaf2916d1c50d367d09041b2d6142a09d URL: https://github.com/kamailio/kamailio/commit/2271e6bdaf2916d1c50d367d09041b2… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-03-14T17:09:17-04:00 modules/topos: fix warning: variable "ptsd" set but not used [-Wunused-but-set-variable] (cherry picked from commit f50c712f401f50b8ca36addbd8440f418a9b266f) --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/2271e6bdaf2916d1c50d367d09041b2… Patch: https://github.com/kamailio/kamailio/commit/2271e6bdaf2916d1c50d367d09041b2… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index da1adc9..a44ff34 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -489,13 +489,11 @@ int tps_response_received(sip_msg_t *msg) tps_data_t mtsd; tps_data_t stsd; tps_data_t btsd; - tps_data_t *ptsd; str lkey; memset(&mtsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); - ptsd = &mtsd; lkey = msg->callid->body;

8 years, 8 months

git:master:f50c712f: modules/topos: fix warning: variable "ptsd" set but not used [-Wunused-but-set-variable]

by Ovidiu Sas

Module: kamailio Branch: master Commit: f50c712f401f50b8ca36addbd8440f418a9b266f URL: https://github.com/kamailio/kamailio/commit/f50c712f401f50b8ca36addbd8440f4… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-03-14T17:07:46-04:00 modules/topos: fix warning: variable "ptsd" set but not used [-Wunused-but-set-variable] --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/f50c712f401f50b8ca36addbd8440f4… Patch: https://github.com/kamailio/kamailio/commit/f50c712f401f50b8ca36addbd8440f4… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index da1adc9..a44ff34 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -489,13 +489,11 @@ int tps_response_received(sip_msg_t *msg) tps_data_t mtsd; tps_data_t stsd; tps_data_t btsd; - tps_data_t *ptsd; str lkey; memset(&mtsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); - ptsd = &mtsd; lkey = msg->callid->body;

8 years, 8 months

git:4.4:3ef987c3: modules/topos: fix warning: comparison between pointer and integer [enabled by default]

by Ovidiu Sas

Module: kamailio Branch: 4.4 Commit: 3ef987c3230bb76f0eb1dea35998866271c93f31 URL: https://github.com/kamailio/kamailio/commit/3ef987c3230bb76f0eb1dea35998866… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-03-14T17:05:00-04:00 modules/topos: fix warning: comparison between pointer and integer [enabled by default] (cherry picked from commit b4d1206fd50bb61d1ad9ff4ed500157105b140b6) --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/3ef987c3230bb76f0eb1dea35998866… Patch: https://github.com/kamailio/kamailio/commit/3ef987c3230bb76f0eb1dea35998866… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 0aa12ad..da1adc9 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -382,7 +382,7 @@ int tps_pack_request(sip_msg_t *msg, tps_data_t *ptsd) ptsd->bs_contact.s = ptsd->cp; ptsd->bs_contact.len = rr->nameaddr.uri.len; if(strnstr(ptsd->bs_contact.s, ";r2=on", - ptsd->bs_contact.len)==NULL) { + ptsd->bs_contact.len)==0) { LM_DBG("single record routing by proxy\n"); ptsd->as_contact.s = ptsd->cp; ptsd->as_contact.len = rr->nameaddr.uri.len;

8 years, 8 months

git:master:b4d1206f: modules/topos: fix warning: comparison between pointer and integer [enabled by default]

by Ovidiu Sas

Module: kamailio Branch: master Commit: b4d1206fd50bb61d1ad9ff4ed500157105b140b6 URL: https://github.com/kamailio/kamailio/commit/b4d1206fd50bb61d1ad9ff4ed500157… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-03-14T17:03:30-04:00 modules/topos: fix warning: comparison between pointer and integer [enabled by default] --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/b4d1206fd50bb61d1ad9ff4ed500157… Patch: https://github.com/kamailio/kamailio/commit/b4d1206fd50bb61d1ad9ff4ed500157… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 0aa12ad..da1adc9 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -382,7 +382,7 @@ int tps_pack_request(sip_msg_t *msg, tps_data_t *ptsd) ptsd->bs_contact.s = ptsd->cp; ptsd->bs_contact.len = rr->nameaddr.uri.len; if(strnstr(ptsd->bs_contact.s, ";r2=on", - ptsd->bs_contact.len)==NULL) { + ptsd->bs_contact.len)==0) { LM_DBG("single record routing by proxy\n"); ptsd->as_contact.s = ptsd->cp; ptsd->as_contact.len = rr->nameaddr.uri.len;

8 years, 8 months

git:4.4:0977d5a3: modules/topos: fix warning: label "ready" defined but not used [-Wunused-label]

by Ovidiu Sas

Module: kamailio Branch: 4.4 Commit: 0977d5a392b4c9236fa1334141df640d10aa1cb9 URL: https://github.com/kamailio/kamailio/commit/0977d5a392b4c9236fa1334141df640… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-03-14T17:02:12-04:00 modules/topos: fix warning: label "ready" defined but not used [-Wunused-label] --- Modified: modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0977d5a392b4c9236fa1334141df640… Patch: https://github.com/kamailio/kamailio/commit/0977d5a392b4c9236fa1334141df640… --- diff --git a/modules/topos/topos_mod.c b/modules/topos/topos_mod.c index a0ae6bc..99267a1 100644 --- a/modules/topos/topos_mod.c +++ b/modules/topos/topos_mod.c @@ -354,7 +354,6 @@ int tps_msg_sent(void *data) tps_response_sent(&msg); } -ready: obuf->s = tps_msg_update(&msg, (unsigned int*)&obuf->len); done:

8 years, 8 months

git:master:ac989df8: modules/topos: fix warning: label "ready" defined but not used [-Wunused-label]

by Ovidiu Sas

Module: kamailio Branch: master Commit: ac989df8e30f198917786e077e1b61f1efc04129 URL: https://github.com/kamailio/kamailio/commit/ac989df8e30f198917786e077e1b61f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-03-14T16:59:41-04:00 modules/topos: fix warning: label "ready" defined but not used [-Wunused-label] --- Modified: modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac989df8e30f198917786e077e1b61f… Patch: https://github.com/kamailio/kamailio/commit/ac989df8e30f198917786e077e1b61f… --- diff --git a/modules/topos/topos_mod.c b/modules/topos/topos_mod.c index a0ae6bc..99267a1 100644 --- a/modules/topos/topos_mod.c +++ b/modules/topos/topos_mod.c @@ -354,7 +354,6 @@ int tps_msg_sent(void *data) tps_response_sent(&msg); } -ready: obuf->s = tps_msg_update(&msg, (unsigned int*)&obuf->len); done:

8 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016