sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:41f6d98c: acc_diameter: removed unused variable
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 41f6d98cc19e514de6d0aea05cc1d17be3d95065 URL: https://github.com/kamailio/kamailio/commit/41f6d98cc19e514de6d0aea05cc1d17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:26:22+02:00 acc_diameter: removed unused variable --- Modified: src/modules/acc_diameter/diam_tcp.c --- Diff: https://github.com/kamailio/kamailio/commit/41f6d98cc19e514de6d0aea05cc1d17… Patch: https://github.com/kamailio/kamailio/commit/41f6d98cc19e514de6d0aea05cc1d17… --- diff --git a/src/modules/acc_diameter/diam_tcp.c b/src/modules/acc_diameter/diam_tcp.c index 77525479c5..59b8755ce2 100644 --- a/src/modules/acc_diameter/diam_tcp.c +++ b/src/modules/acc_diameter/diam_tcp.c @@ -95,7 +95,6 @@ int tcp_send_recv(int sfd, char* buf, int len, rd_buf_t* rb, unsigned long int result_code; AAAMessage *msg; AAA_AVP *avp; - char serviceType; unsigned int m_id; /* try to write the message to the Diameter client */ @@ -184,7 +183,6 @@ int tcp_send_recv(int sfd, char* buf, int len, rd_buf_t* rb, LM_ERR("AVP_Service_Type not found\n"); return AAA_ERROR; } - serviceType = avp->data.s[0]; result_code = ntohl(*((unsigned long int*)(msg->res_code->data.s))); switch(result_code)

1 0

git:master:85def4c2: core: tcp - print str error in debug message if faling to write to connection
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 85def4c200e216dce5d3d8e53461a69ab408fa3c URL: https://github.com/kamailio/kamailio/commit/85def4c200e216dce5d3d8e53461a69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T16:11:19+02:00 core: tcp - print str error in debug message if faling to write to connection --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/85def4c200e216dce5d3d8e53461a69… Patch: https://github.com/kamailio/kamailio/commit/85def4c200e216dce5d3d8e53461a69… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 06812db509..09f7f4301b 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2621,8 +2621,14 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, ENOTCONN appears on newer FreeBSD versions (non-blocking socket, connect() & send immediately) */ if ((n>=0) || errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOTCONN){ - LM_DBG("pending write on new connection %p " - "(%d/%d bytes written)\n", c, n, len); + if(n<0) { + LM_DBG("pending write on new connection %p " + "(%d/%d bytes written) (err: %d - %s)\n", c, n, len, + errno, strerror(errno)); + } else { + LM_DBG("pending write on new connection %p " + "(%d/%d bytes written)\n", c, n, len); + } if (unlikely(n<0)) n=0; else{ if (likely(c->state == S_CONN_CONNECT))

1 0

git:master:125db2c3: Merge pull request #1213 from christoph-v/ims_get_body_coredump
by GitHub 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 125db2c3650843aae2927a4625e3d42a755fa309 URL: https://github.com/kamailio/kamailio/commit/125db2c3650843aae2927a4625e3d42… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-11T15:54:28+02:00 Merge pull request #1213 from christoph-v/ims_get_body_coredump ims_auth: fixed rare core dump, due to null ptr check --- Modified: src/modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/125db2c3650843aae2927a4625e3d42… Patch: https://github.com/kamailio/kamailio/commit/125db2c3650843aae2927a4625e3d42… --- diff --git a/src/modules/ims_auth/utils.c b/src/modules/ims_auth/utils.c index 2e40cf8c46..94d02e3fe7 100644 --- a/src/modules/ims_auth/utils.c +++ b/src/modules/ims_auth/utils.c @@ -204,7 +204,9 @@ str ims_get_body(struct sip_msg * msg) LM_DBG("Error parsing until header Content-Length: \n"); return x; } - x.len = (int)(long)msg->content_length->parsed; + if (msg->content_length) + // Content-Length header might be missing + x.len = (int)(long)msg->content_length->parsed; if (x.len>0) x.s = get_body(msg);

1 0

git:master:4e760394: ims_auth: fixed rare core dump, due to null ptr check
by Valentin Christoph 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 4e760394b63ab0bf3ca6deb1d527c96f800a834d URL: https://github.com/kamailio/kamailio/commit/4e760394b63ab0bf3ca6deb1d527c96… Author: Valentin Christoph <valentin(a)kapsch.net> Committer: Valentin Christoph <valentin(a)kapsch.net> Date: 2017-08-11T14:43:36+02:00 ims_auth: fixed rare core dump, due to null ptr check The ims_auth module reads the value from the Content-Length header of a REGISTER request, before decoding the message body. Due to a missing null pointer check, reading this value leads to core dump in case the Content-Length header is missing. --- Modified: src/modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/4e760394b63ab0bf3ca6deb1d527c96… Patch: https://github.com/kamailio/kamailio/commit/4e760394b63ab0bf3ca6deb1d527c96… --- diff --git a/src/modules/ims_auth/utils.c b/src/modules/ims_auth/utils.c index 2e40cf8c46..94d02e3fe7 100644 --- a/src/modules/ims_auth/utils.c +++ b/src/modules/ims_auth/utils.c @@ -204,7 +204,9 @@ str ims_get_body(struct sip_msg * msg) LM_DBG("Error parsing until header Content-Length: \n"); return x; } - x.len = (int)(long)msg->content_length->parsed; + if (msg->content_length) + // Content-Length header might be missing + x.len = (int)(long)msg->content_length->parsed; if (x.len>0) x.s = get_body(msg);

1 0

git:master:9df27ff7: tm: updated for the new shm global locking functions
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 9df27ff7afbf1cf8ee7b3afd1741355e9f6f866e URL: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:38:39+02:00 tm: updated for the new shm global locking functions --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… Patch: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 2e8e8e7717..19b5daec0b 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -147,7 +147,7 @@ void free_cell_helper( if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0); - shm_lock(); + shm_global_lock(); /* UA Server */ if(dead_cell->uas.request) sip_msg_free_unsafe(dead_cell->uas.request); @@ -167,9 +167,9 @@ void free_cell_helper( * otherwise the release function must to be aware of * the lock state (Miklos) */ - shm_unlock(); + shm_global_unlock(); cbs_tmp->release(cbs_tmp->param); - shm_lock(); + shm_global_lock(); } shm_free_unsafe(cbs_tmp); } @@ -250,7 +250,7 @@ void free_cell_helper( /* the cell's body */ shm_free_unsafe(dead_cell); - shm_unlock(); + shm_global_unlock(); t_stats_freed(); }

1 0

git:master:1ec69642: core: main.c - updates for shm unlock in shutdown cleanup
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 1ec6964249dc5db4bd69c612b626466cae896c41 URL: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:37:33+02:00 core: main.c - updates for shm unlock in shutdown cleanup - test if shm was initialized before global unlock --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… Patch: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… --- diff --git a/src/main.c b/src/main.c index a98a35693f..b65b0020ca 100644 --- a/src/main.c +++ b/src/main.c @@ -518,10 +518,11 @@ void cleanup(int show_status) /*clean-up*/ #ifndef SHM_SAFE_MALLOC - if (_shm_lock) - shm_unlock(); /* hack: force-unlock the shared memory lock in case - some process crashed and let it locked; this will - allow an almost gracious shutdown */ + if(shm_initialized()) { + /* force-unlock the shared memory lock in case some process crashed + * and let it locked; this will allow an almost gracious shutdown */ + shm_global_unlock(); + } #endif destroy_rpcs(); destroy_modules();

1 0

git:master:13a1e6c2: core: mem/tlsf_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 13a1e6c23576ab3797af6fefde6fcbbd2d0b83e3 URL: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:31:40+02:00 core: mem/tlsf_malloc - shared memory locking implemented internally --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb… Patch: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb…

1 0

git:master:bccdcf3c: core: mem/q_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: bccdcf3c456ef450399be337131fcf33e97eb57a URL: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:26:25+02:00 core: mem/q_malloc - shared memory locking implemented internally --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3… Patch: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3…

1 0

git:master:fcff3426: core: mem/f_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: fcff3426798a925dffd32b75569b9d86e0f131c3 URL: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:24:29+02:00 core: mem/f_malloc - shared memory locking implemented internally --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8… Patch: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8…

1 0

git:master:13bdd0e1: core: mem/shm - shared memory api updated to allow locking by manager
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 13bdd0e15883a07d396210b8a372c1b51786f2a9 URL: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:21:59+02:00 core: mem/shm - shared memory api updated to allow locking by manager - instead of generic global lock, allow memory manager to handle locking for shared memory --- Modified: src/core/mem/memapi.h Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… Patch: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… --- diff --git a/src/core/mem/memapi.h b/src/core/mem/memapi.h index 198bd4d25a..dc1cd80f03 100644 --- a/src/core/mem/memapi.h +++ b/src/core/mem/memapi.h @@ -46,6 +46,9 @@ typedef void* (*sr_resize_f)(void* mbp, void* p, size_t size); #endif /*DBG_SR_MEMORY*/ +typedef void (*sr_shm_glock_f)(void* mbp); +typedef void (*sr_shm_gunlock_f)(void* mbp); + typedef void (*sr_mem_status_f)(void* mbp); typedef void (*sr_mem_info_f)(void* mbp, struct mem_info* info); typedef unsigned long (*sr_mem_available_f)(void* mbp); @@ -128,6 +131,10 @@ typedef struct sr_shm_api { sr_mem_mod_get_stats_f xmodstats; /*memory stats free per module*/ sr_mem_mod_free_stats_f xfmodstats; + /*memory managing global lock*/ + sr_shm_glock_f xglock; + /*memory managing global unlock*/ + sr_shm_gunlock_f xgunlock; } sr_shm_api_t; #endif diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index f48cf3baad..3dbc34f11a 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -48,8 +48,6 @@ void shm_core_destroy(void); static int _shm_core_shmid[SHM_CORE_POOLS_SIZE] = { -1 }; /*shared memory id*/ #endif -gen_lock_t* _shm_lock=0; - static void* _shm_core_pools_mem[SHM_CORE_POOLS_SIZE] = { (void*)-1 }; static int _shm_core_pools_num = 1; @@ -168,41 +166,6 @@ void* shm_core_get_pool(void) } /** - * init the core lock - */ -int shm_core_lock_init(void) -{ - if (_shm_lock) { - LM_DBG("shared memory lock initialized\n"); - return 0; - } - _shm_lock=shm_malloc_unsafe(sizeof(gen_lock_t)); /* skip lock_alloc, - race cond*/ - if (_shm_lock==0){ - LOG(L_CRIT, "could not allocate lock\n"); - shm_core_destroy(); - return -1; - } - if (lock_init(_shm_lock)==0){ - LOG(L_CRIT, "could not initialize lock\n"); - shm_core_destroy(); - return -1; - } - return 0; -} - -/** - * - */ -void shm_core_lock_destroy(void) -{ - if (_shm_lock){ - DBG("destroying the shared memory lock\n"); - lock_destroy(_shm_lock); /* we don't need to dealloc it*/ - } -} - -/** * */ void shm_core_destroy(void) @@ -255,6 +218,8 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.xdestroy = ap->xdestroy; _shm_root.xmodstats = ap->xmodstats; _shm_root.xfmodstats = ap->xfmodstats; + _shm_root.xglock = ap->xglock; + _shm_root.xgunlock = ap->xgunlock; return 0; } @@ -291,11 +256,10 @@ int shm_init_manager(char *name) */ void shm_destroy_manager(void) { - shm_core_lock_destroy(); if(_shm_root.xdestroy) { - _shm_root.xdestroy(); LM_DBG("destroying memory manager: %s\n", (_shm_root.mname)?_shm_root.mname:"unknown"); + _shm_root.xdestroy(); } shm_core_destroy(); } diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 7af16be766..5d58071359 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -38,12 +38,6 @@ #include "../dprint.h" #include "../lock_ops.h" /* we don't include locking.h on purpose */ -extern gen_lock_t* _shm_lock; -#define shm_lock() lock_get(_shm_lock) -#define shm_unlock() lock_release(_shm_lock) -int shm_core_lock_init(void); -void shm_core_lock_destroy(void); - extern sr_shm_api_t _shm_root; #ifdef DBG_SR_MEMORY @@ -82,6 +76,9 @@ extern sr_shm_api_t _shm_root; # define shm_mod_get_stats(x) _shm_root.xmodstats(_shm_root.mem_block, x) # define shm_mod_free_stats(x) _shm_root.xfmodstats(x) +# define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) +# define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) + void* shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017