sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:7d0a9749: mem: core api for shm management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7d0a97490d345c8c01c14a95a52c2926ea28c466 URL: https://github.com/kamailio/kamailio/commit/7d0a97490d345c8c01c14a95a52c292… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: core api for shm management --- Added: mem/shm.c Added: mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/7d0a97490d345c8c01c14a95a52c292… Patch: https://github.com/kamailio/kamailio/commit/7d0a97490d345c8c01c14a95a52c292…

9 years, 2 months

git:master:28bf5c45: mem: core api for pkg management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 28bf5c457ffcbe95ce5528d492f4ebc5b10ab68f URL: https://github.com/kamailio/kamailio/commit/28bf5c457ffcbe95ce5528d492f4ebc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: core api for pkg management --- Added: mem/pkg.c Added: mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/28bf5c457ffcbe95ce5528d492f4ebc… Patch: https://github.com/kamailio/kamailio/commit/28bf5c457ffcbe95ce5528d492f4ebc…

9 years, 2 months

git:master:876c20cf: mem: added api structures for pkg and shm management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 876c20cf55b23507dd390d177d5a7138d04815e4 URL: https://github.com/kamailio/kamailio/commit/876c20cf55b23507dd390d177d5a713… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: added api structures for pkg and shm management - a framework to allow specifying the memory manager at startup --- Added: mem/memapi.h --- Diff: https://github.com/kamailio/kamailio/commit/876c20cf55b23507dd390d177d5a713… Patch: https://github.com/kamailio/kamailio/commit/876c20cf55b23507dd390d177d5a713… --- diff --git a/mem/memapi.h b/mem/memapi.h new file mode 100644 index 0000000..e1b78a0 --- /dev/null +++ b/mem/memapi.h @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2015 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + + +#ifndef _sr_mem_api_ +#define _sr_mem_api_ + +#include "src_loc.h" +#include "meminfo.h" +#include "memdbg.h" + +#ifdef DBG_SR_MEMORY + +typedef void* (*sr_malloc_f)(void* mbp, unsigned long size, + const char* file, const char* func, unsigned int line); +typedef void (*sr_free_f)(void* mbp, void* p, const char* file, const char* func, + unsigned int line); +typedef void* (*sr_realloc_f)(void* mbp, void* p, unsigned long size, + const char* file, const char* func, unsigned int line); +typedef void* (*sr_resize_f)(void* mbp, void* p, unsigned long size, + const char* file, const char* func, unsigned int line); + +#else /*DBG_SR_MEMORY*/ + +typedef void* (*sr_malloc_f)(void* mbp, unsigned long size); +typedef void (*sr_free_f)(void* mbp, void* p); +typedef void* (*sr_realloc_f)(void* mbp, void* p, unsigned long size); +typedef void* (*sr_resize_f)(void* mbp, void* p, unsigned long size); + +#endif /*DBG_SR_MEMORY*/ + +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); +typedef void (*sr_mem_sums_f)(void* mbp); + +typedef void (*sr_mem_destroy_f)(void); + +/*private memory api*/ +typedef struct sr_pkg_api { + /*memory manager name - soft copy*/ + char *mname; + /*entire private memory zone - soft copy*/ + char *mem_pool; + /*memory manager block - soft copy*/ + void *mem_block; + /*memory chunk allocation*/ + sr_malloc_f xmalloc; + /*memory chunk reallocation*/ + sr_realloc_f xrealloc; + /*memory chunk free*/ + sr_free_f xfree; + /*memory status*/ + sr_mem_status_f xstatus; + /*memory info - internal metrics*/ + sr_mem_info_f xinfo; + /*memory available size*/ + sr_mem_available_f xavailable; + /*memory summary*/ + sr_mem_sums_f xsums; + /*memory destroy manager*/ + sr_mem_destroy_f xdestroy; +} sr_pkg_api_t; + +/*shared memory api*/ +typedef struct sr_shm_api { + /*memory manager name - soft copy*/ + char *mname; + /*entire private memory zone - soft copy*/ + void *mem_pool; + /*memory manager block - soft copy*/ + void *mem_block; + /*memory chunk allocation*/ + sr_malloc_f xmalloc; + /*memory chunk allocation without locking shm*/ + sr_malloc_f xmalloc_unsafe; + /*memory chunk reallocation*/ + sr_realloc_f xrealloc; + /*memory chunk resizing - free+malloc in same locking*/ + sr_resize_f xresize; + /*memory chunk free*/ + sr_free_f xfree; + /*memory chunk free without locking shsm*/ + sr_free_f xfree_unsafe; + /*memory status*/ + sr_mem_status_f xstatus; + /*memory info - internal metrics*/ + sr_mem_info_f xinfo; + /*memory available size*/ + sr_mem_available_f xavailable; + /*memory summary*/ + sr_mem_sums_f xsums; + /*memory destroy manager*/ + sr_mem_destroy_f xdestroy; +} sr_shm_api_t; + +#endif

9 years, 2 months

git:master:88a7b00c: modules/ims: dialog, usrloc, qos and charging modules for IMS

by jaybeepee

Module: kamailio Branch: master Commit: 88a7b00cf964993151a76051dd0fded46c3bf61e URL: https://github.com/kamailio/kamailio/commit/88a7b00cf964993151a76051dd0fded… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-14T09:04:03+02:00 modules/ims: dialog, usrloc, qos and charging modules for IMS - dialog_ng - some fixes related to ref counting and state machine - usrlocs - fixes/improvements to internal storage for both P-CSCF and S-CSCF usrloc storage - registrars - fixes/improvements to the registrars for S-CSCF, P-CSCF - ims_charging - align to updated api for dialog_ng - ims_qos - align to updated api for dialog_ng --- Added: modules/ims_usrloc_scscf/contact_dlg_handlers.c Modified: modules/dialog_ng/Makefile Modified: modules/dialog_ng/dialog.c Modified: modules/dialog_ng/dlg_cb.c Modified: modules/dialog_ng/dlg_cb.h Modified: modules/dialog_ng/dlg_db_handler.c Modified: modules/dialog_ng/dlg_handlers.c Modified: modules/dialog_ng/dlg_handlers.h Modified: modules/dialog_ng/dlg_hash.c Modified: modules/dialog_ng/dlg_hash.h Modified: modules/dialog_ng/dlg_profile.c Modified: modules/dialog_ng/dlg_profile.h Modified: modules/dialog_ng/dlg_req_within.c Modified: modules/dialog_ng/dlg_var.c Modified: modules/dialog_ng/dlg_var.h Modified: modules/ims_charging/Makefile Modified: modules/ims_charging/Ro_data.c Modified: modules/ims_charging/dialog.c Modified: modules/ims_charging/dialog.h Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/ims_ro.h Modified: modules/ims_charging/mod.c Modified: modules/ims_charging/ro_db_handler.c Modified: modules/ims_charging/ro_session_hash.c Modified: modules/ims_charging/ro_session_hash.h Modified: modules/ims_charging/ro_timer.c Modified: modules/ims_qos/cdpeventprocessor.c Modified: modules/ims_qos/mod.c Modified: modules/ims_qos/rx_aar.c Modified: modules/ims_qos/rx_aar.h Modified: modules/ims_qos/rx_authdata.c Modified: modules/ims_qos/rx_authdata.h Modified: modules/ims_registrar_pcscf/notify.c Modified: modules/ims_registrar_pcscf/reg_mod.c Modified: modules/ims_registrar_pcscf/save.c Modified: modules/ims_registrar_pcscf/save.h Modified: modules/ims_registrar_pcscf/service_routes.c Modified: modules/ims_registrar_pcscf/service_routes.h Modified: modules/ims_registrar_scscf/cxdx_avp.c Modified: modules/ims_registrar_scscf/cxdx_callbacks.c Modified: modules/ims_registrar_scscf/cxdx_sar.c Modified: modules/ims_registrar_scscf/lookup.c Modified: modules/ims_registrar_scscf/reg_mod.c Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h Modified: modules/ims_registrar_scscf/reply.c Modified: modules/ims_registrar_scscf/save.c Modified: modules/ims_registrar_scscf/usrloc_cb.c Modified: modules/ims_usrloc_pcscf/pcontact.c Modified: modules/ims_usrloc_pcscf/pcontact.h Modified: modules/ims_usrloc_pcscf/udomain.c Modified: modules/ims_usrloc_pcscf/udomain.h Modified: modules/ims_usrloc_pcscf/ul_mod.c Modified: modules/ims_usrloc_pcscf/usrloc.c Modified: modules/ims_usrloc_pcscf/usrloc.h Modified: modules/ims_usrloc_pcscf/usrloc_db.c Modified: modules/ims_usrloc_pcscf/usrloc_db.h Modified: modules/ims_usrloc_scscf/dlist.c Modified: modules/ims_usrloc_scscf/dlist.h Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/impurecord.h Modified: modules/ims_usrloc_scscf/ucontact.c Modified: modules/ims_usrloc_scscf/ucontact.h Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/ul_mod.c Modified: modules/ims_usrloc_scscf/usrloc.c Modified: modules/ims_usrloc_scscf/usrloc.h Modified: modules/ims_usrloc_scscf/usrloc_db.c Removed: modules/ims_registrar_pcscf/lookup.c Removed: modules/ims_registrar_pcscf/lookup.h --- Diff: https://github.com/kamailio/kamailio/commit/88a7b00cf964993151a76051dd0fded… Patch: https://github.com/kamailio/kamailio/commit/88a7b00cf964993151a76051dd0fded…

9 years, 2 months

kz_amqp_add_connection(): connection url exceeds max size 50

by Michael Dunton

https://github.com/kamailio/kamailio/blob/4.2/modules/kazoo/kz_amqp.c#L385 My amqp url is longer than 50 characters. I was wondering why was a max limit of 50 and not another number set here? Would it be possible to submit an update to change the size of this variable? Your input is greatly appreciated.

9 years, 2 months

git:master:16bcb9d2: mem: removed unused variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 16bcb9d257622a68eed44d6eea5e342f35dbde83 URL: https://github.com/kamailio/kamailio/commit/16bcb9d257622a68eed44d6eea5e342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-11T16:39:36+02:00 mem: removed unused variables - two old vars not needed anymore after previous commit --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/16bcb9d257622a68eed44d6eea5e342… Patch: https://github.com/kamailio/kamailio/commit/16bcb9d257622a68eed44d6eea5e342… --- 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);

9 years, 2 months

git:master:2d0455d9: mem/f_malloc: simplified free frags management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d0455d9f2266ad67867e03aa652863e37d5a8d2 URL: https://github.com/kamailio/kamailio/commit/2d0455d9f2266ad67867e03aa652863… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-11T16:32:32+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 --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/2d0455d9f2266ad67867e03aa652863… Patch: https://github.com/kamailio/kamailio/commit/2d0455d9f2266ad67867e03aa652863…

9 years, 2 months

git:master:aec98504: modules/tm: precent possible seg fault if branch reply is null

by jaybeepee

Module: kamailio Branch: master Commit: aec9850491a8e8fa919396ae0e0f1d99d30c607c URL: https://github.com/kamailio/kamailio/commit/aec9850491a8e8fa919396ae0e0f1d9… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T13:38:37+02:00 modules/tm: precent possible seg fault if branch reply is null --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/aec9850491a8e8fa919396ae0e0f1d9… Patch: https://github.com/kamailio/kamailio/commit/aec9850491a8e8fa919396ae0e0f1d9… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 64f9af8..67572b6 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);

9 years, 2 months

git:master:8913435f: modules/cdp: remove unused variable

by jaybeepee

Module: kamailio Branch: master Commit: 8913435fe629e5972fe264e619e493659fc5e010 URL: https://github.com/kamailio/kamailio/commit/8913435fe629e5972fe264e619e4936… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T12:14:12+02:00 modules/cdp: remove unused variable --- Modified: modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/8913435fe629e5972fe264e619e4936… Patch: https://github.com/kamailio/kamailio/commit/8913435fe629e5972fe264e619e4936… --- diff --git a/modules/cdp/authstatemachine.c b/modules/cdp/authstatemachine.c index 33b5690..21f0544 100644 --- a/modules/cdp/authstatemachine.c +++ b/modules/cdp/authstatemachine.c @@ -88,7 +88,7 @@ int get_auth_session_state(AAAMessage* msg) { void update_auth_session_timers(cdp_auth_session_t *x, AAAMessage *msg) { AAA_AVP *avp; uint32_t session_timeout = 0, grace_period = 0, auth_lifetime = 0; - int update_grace = 0, update_timeout = 0, update_lifetime = 0; + int update_grace = 0, update_lifetime = 0; avp = AAAFindMatchingAVP(msg, 0, AVP_Auth_Grace_Period, 0, 0); if (avp && avp->data.len == 4) { @@ -129,7 +129,6 @@ void update_auth_session_timers(cdp_auth_session_t *x, AAAMessage *msg) { x->lifetime = time(0) + auth_lifetime; } if (x->timeout != -1 && x->timeout < x->lifetime) { - update_timeout = 1; x->timeout = x->lifetime + x->grace_period; } }

9 years, 2 months

git:master:00e8c10a: modules/cdp: fix lifetime and session timeout logic

by jaybeepee

Module: kamailio Branch: master Commit: 00e8c10a5f96b7e8fbf8193885d1dc8450df3e45 URL: https://github.com/kamailio/kamailio/commit/00e8c10a5f96b7e8fbf8193885d1dc8… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T12:11:58+02:00 modules/cdp: fix lifetime and session timeout logic --- Modified: modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/00e8c10a5f96b7e8fbf8193885d1dc8… Patch: https://github.com/kamailio/kamailio/commit/00e8c10a5f96b7e8fbf8193885d1dc8…

9 years, 2 months

← Newer
1
...
24
25
26
27
28
29
30
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015