sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.3:d6d2474b: mem: removed unused variables
by Daniel-Constantin Mierla 17 Sep '15

17 Sep '15

Module: kamailio Branch: 4.3 Commit: d6d2474bbbd6a6fd08cbede42ad1cd64cc47dc64 URL: https://github.com/kamailio/kamailio/commit/d6d2474bbbd6a6fd08cbede42ad1cd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T13:25:31+02:00 mem: removed unused variables - two old vars not needed anymore after previous commit (cherry picked from commit 16bcb9d257622a68eed44d6eea5e342f35dbde83) --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/d6d2474bbbd6a6fd08cbede42ad1cd6… Patch: https://github.com/kamailio/kamailio/commit/d6d2474bbbd6a6fd08cbede42ad1cd6… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 834a017..a62665e 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -521,8 +521,6 @@ void* fm_malloc(struct fm_block* qm, unsigned long size) */ static void fm_join_frag(struct fm_block* qm, struct fm_frag* f) { - int hash; - struct fm_frag *pf; struct fm_frag *n; n=FRAG_NEXT(f);

1 0

git:4.3:7ac3eea0: modules/tm: precent possible seg fault if branch reply is null
by Daniel-Constantin Mierla 17 Sep '15

17 Sep '15

Module: kamailio Branch: 4.3 Commit: 7ac3eea0c49872a75d384e94ee0b4380caf440e0 URL: https://github.com/kamailio/kamailio/commit/7ac3eea0c49872a75d384e94ee0b438… Author: jaybeepee <jason.penton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T13:22:26+02:00 modules/tm: precent possible seg fault if branch reply is null (cherry picked from commit aec9850491a8e8fa919396ae0e0f1d99d30c607c) --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/7ac3eea0c49872a75d384e94ee0b438… Patch: https://github.com/kamailio/kamailio/commit/7ac3eea0c49872a75d384e94ee0b438… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 86fb3be..de18a2a 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -298,7 +298,13 @@ int t_continue(unsigned int hash_index, unsigned int label, LM_DBG("continuing from a suspended reply" " - resetting the suspend branch flag\n"); + if (t->uac[branch].reply) { t->uac[branch].reply->msg_flags &= ~FL_RPL_SUSPENDED; + } else { + LM_WARN("no reply in t_continue for branch. not much we can do\n"); + return 0; + } + if (t->uas.request) t->uas.request->msg_flags&= ~FL_RPL_SUSPENDED; faked_env( t, t->uac[branch].reply, 1);

1 0

git:4.3:3ddf71b9: mem/f_malloc: simplified free frags management
by Daniel-Constantin Mierla 17 Sep '15

17 Sep '15

Module: kamailio Branch: 4.3 Commit: 3ddf71b943530e98ba94ad9d9ec37be3a90e1182 URL: https://github.com/kamailio/kamailio/commit/3ddf71b943530e98ba94ad9d9ec37be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T13:20:16+02:00 mem/f_malloc: simplified free frags management - avoid address referencing to previous free fragments, it can get invalidated on joins - straight doubly linked list also speeds join/defrag (cherry picked from commit 2d0455d9f2266ad67867e03aa652863e37d5a8d2) --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/3ddf71b943530e98ba94ad9d9ec37be… Patch: https://github.com/kamailio/kamailio/commit/3ddf71b943530e98ba94ad9d9ec37be…

1 0

git:master:ee3d24d2: ims_registrar_pcscf: Re-Added the pcscf_unregister-function, aligned with latest changes
by Carsten Bock 17 Sep '15

17 Sep '15

Module: kamailio Branch: master Commit: ee3d24d256356bf1da5e6af28aa1274402cf1da1 URL: https://github.com/kamailio/kamailio/commit/ee3d24d256356bf1da5e6af28aa1274… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-17T14:08:28+02:00 ims_registrar_pcscf: Re-Added the pcscf_unregister-function, aligned with latest changes --- Modified: modules/ims_registrar_pcscf/reg_mod.c Modified: modules/ims_registrar_pcscf/service_routes.c Modified: modules/ims_registrar_pcscf/service_routes.h --- Diff: https://github.com/kamailio/kamailio/commit/ee3d24d256356bf1da5e6af28aa1274… Patch: https://github.com/kamailio/kamailio/commit/ee3d24d256356bf1da5e6af28aa1274…

1 0

git:master:33c54495: tm: warn in case of transaction is not suspended by a continue is attempted
by Daniel-Constantin Mierla 17 Sep '15

17 Sep '15

Module: kamailio Branch: master Commit: 33c5449563becd2357b648ec469ef247a6ae2f5d URL: https://github.com/kamailio/kamailio/commit/33c5449563becd2357b648ec469ef24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T12:50:55+02:00 tm: warn in case of transaction is not suspended by a continue is attempted --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/33c5449563becd2357b648ec469ef24… Patch: https://github.com/kamailio/kamailio/commit/33c5449563becd2357b648ec469ef24… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 1ca56db..e657959 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -178,7 +178,7 @@ int t_continue(unsigned int hash_index, unsigned int label, } if (!(t->flags & T_ASYNC_SUSPENDED)) { - LM_ERR("transaction is not suspended [%u:%u]\n", hash_index, label); + LM_WARN("transaction is not suspended [%u:%u]\n", hash_index, label); return -2; }

1 0

git:master:2682d856: tmx: err to work if resuming suspended transaction fails
by Daniel-Constantin Mierla 17 Sep '15

17 Sep '15

Module: kamailio Branch: master Commit: 2682d85657d1caf96961a6153cd82c506fde7d0d URL: https://github.com/kamailio/kamailio/commit/2682d85657d1caf96961a6153cd82c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T12:48:36+02:00 tmx: err to work if resuming suspended transaction fails - it can be a non-suspended transaction id or after expiration --- Modified: modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2682d85657d1caf96961a6153cd82c5… Patch: https://github.com/kamailio/kamailio/commit/2682d85657d1caf96961a6153cd82c5… --- diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index 28dbcd7..d2d8e60 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -638,7 +638,7 @@ static int w_t_continue(struct sip_msg* msg, char *idx, char *lbl, char *rtn) if(_tmx_tmb.t_continue(tindex, tlabel, act)<0) { - LM_ERR("resuming the processing of transaction [%u:%u] failed\n", + LM_WARN("resuming the processing of transaction [%u:%u] failed\n", tindex, tlabel); return -1; }

1 0

git:master:ffc48521: modules/ims_usrloc_pcscf: fixed free of service_routes from pcontact in P-CSCF
by jaybeepee 17 Sep '15

17 Sep '15

Module: kamailio Branch: master Commit: ffc485212457499fdfa7c9ebb8dc1b04a4058bfb URL: https://github.com/kamailio/kamailio/commit/ffc485212457499fdfa7c9ebb8dc1b0… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-17T11:28:09+02:00 modules/ims_usrloc_pcscf: fixed free of service_routes from pcontact in P-CSCF --- Modified: modules/ims_usrloc_pcscf/pcontact.c Modified: modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/ffc485212457499fdfa7c9ebb8dc1b0… Patch: https://github.com/kamailio/kamailio/commit/ffc485212457499fdfa7c9ebb8dc1b0… --- diff --git a/modules/ims_usrloc_pcscf/pcontact.c b/modules/ims_usrloc_pcscf/pcontact.c index 1bb0af2..33e4a8a 100644 --- a/modules/ims_usrloc_pcscf/pcontact.c +++ b/modules/ims_usrloc_pcscf/pcontact.c @@ -270,10 +270,10 @@ void free_pcontact(pcontact_t* _c) { for (i = 0; i < _c->num_service_routes; i++) { if (_c->service_routes[i].s) shm_free(_c->service_routes[i].s); - shm_free(_c->service_routes); - _c->service_routes = 0; - _c->num_service_routes = 0; } + shm_free(_c->service_routes); + _c->service_routes = 0; + _c->num_service_routes = 0; } if (_c->rx_session_id.len > 0 && _c->rx_session_id.s) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index e1f2ef5..421cf52 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -354,10 +354,10 @@ int update_pcontact(struct udomain* _d, struct pcontact_info* _ci, struct pconta for (i=0; i<_c->num_service_routes; i++) { if (_c->service_routes[i].s) shm_free(_c->service_routes[i].s); - shm_free(_c->service_routes); - _c->service_routes=0; - _c->num_service_routes=0; } + shm_free(_c->service_routes); + _c->service_routes=0; + _c->num_service_routes=0; } //now add the new service routes if (_ci->num_service_routes > 0) {

1 0

git:master:33f15912: core: cast operator (int) converts hex strings as well
by Daniel-Constantin Mierla 16 Sep '15

16 Sep '15

Module: kamailio Branch: master Commit: 33f159121193b3ed09e2ec7aa7b55aa543aeb852 URL: https://github.com/kamailio/kamailio/commit/33f159121193b3ed09e2ec7aa7b55aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T00:15:19+02:00 core: cast operator (int) converts hex strings as well - in addition to dec string --- Modified: rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/33f159121193b3ed09e2ec7aa7b55aa… Patch: https://github.com/kamailio/kamailio/commit/33f159121193b3ed09e2ec7aa7b55aa… --- diff --git a/rvalue.c b/rvalue.c index 52c12ed..e4524f5 100644 --- a/rvalue.c +++ b/rvalue.c @@ -997,16 +997,20 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, /* if "" => 0 (most likely case) */ if (likely(s->len==0)) *i=0; else if (unlikely(str2sint(s, i)!=0)){ - /* error converting to int => non numeric => 0 */ - *i=0; + /* dec to int failed, try hex to int */ + if(!(s->len>2 && s->s[0]=='0' && (s->s[1]=='x' || s->s[1]=='X') + && (hexstr2int(s->s+2, s->len-2, (unsigned int*)i)==0))) { + /* error converting to int => non numeric => 0 */ + *i=0; #ifdef RV_STR2INT_VERBOSE_ERR - WARN("automatic string to int conversion for \"%.*s\" failed\n", + WARN("automatic string to int conversion for \"%.*s\" failed\n", s->len, ZSW(s->s)); - /* return an error code */ + /* return an error code */ #endif #ifdef RV_STR2INT_ERR - ret=-1; + ret=-1; #endif + } } if (destroy_pval) pv_value_destroy(&pval);

1 0

heavy implementation of sdp_content()
by Juha Heinanen 16 Sep '15

16 Sep '15

i was studying implementation of sdpops/sdp_content() function and noticed that it is heavy, because it parses the whole sdp: static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) { if(parse_sdp(msg)==0 && msg->body!=NULL) return 1; return -1; } sdp_with_ice(), for example, just searches a string from the body. how about this: - sdp_content() succeeds if content-type is application/sdp and content-length > 0. - sdp_content() succeeds if content-type is multipart/mixed and body has line that includes string "application/sdp". - otherwise sdp_content() fails. -- juha

1 0

compile tests - travis-ci
by Daniel-Constantin Mierla 16 Sep '15

16 Sep '15

Hello, following the IRC devel meeting that just ended, I am trying to identify the compile time options that are relevant to build for. The goal is to detect if changes that compile fine with some of those options, don't break the compilation when options are different. In my mind comes only those related to memory debugging. So the builds should be: A) Using PKG malloc 1) memory debugging turned off MEMDBG=0 make ... 2) memory debugging turned on MEMDBG=1 make B) compile with system malloc instead of pkg malloc -DPKG_MALLOC needs to be removed from Makefile.defs Not really relevant here, -DDBG_SYS_MALLOC can be added to compile flags as a second time compile. I will try to simplify setting this options, so for now A would be good to have. Besides these, I wonder if people here use other compile flags that the default one, in order to identify what other combination of flags should be used for testing that compilation is done ok. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - http://asipto.com/u/kat

2 1

← Newer
1
...
19
20
21
22
23
24
25
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015