sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

Adding new memory manager with the new API

by Daniel-Constantin Mierla

Hello, during Kamailio World I and Camille discussed briefly about enhancing kamailio to support selecting the memory manager without recompilation. This morning I pushed a bunch of patches allowing this via command line parameters. I am writing now to describe shortly the process of adding a new memory manager in the list of active ones. 1) a define should be available in the Makefile.defs to enable disable that memory manger completely during compilation (right now there are Q_MALLOC and F_MALLOC). The files with the code of the memory manager must be wrapped in such define 2) each memory manager has to export a set of function to do pkg and shm memory operations -- they are different as shm management requires some 'unsafe' functions (when locking must not be done). There are two API structures defined in mem/memapi.h 3) the new memory manger has to export two functions to initialize the memory management for pkg and shm. Theyr prototypes have to be added in mem/memcore.h. The implementation of those two functions must be done in the files with the code of the memory manager 4) extend memory manger conditions with the new name inside mem/pkg.c: pkg_init_manager(...) and mem/shm.c:shm_init_manager(...). 5) code of the memory manger has to be extended to export the two apis for pkg and shm -- looking at the last part of mem/f_malloc.c should give rather straightforward code to follow 6) debugging mode for memory manager must be enabled if DBG_SR_MEMORY is defined, because the API prototypes depend on it. For example, mem/f_malloc.h at the top enables debugging for f_malloc via: #ifdef DBG_SR_MEMORY #define DBG_F_MALLOC #endif General remarks: - it is theoretically possible to use one memory manger for shm and another one for pkg (e.g., pkg can use system malloc) - shm has some common api to allocate the pool of shared memory and destroy it, the manager should request the pool from the core api. Destroying of the shared pool is done also in the common code. - pkg is allocating directly with malloc the pool, so it is done inside each manager. Destroying at shut down has to be done there as well - the plan is to extend the code to allow loading the memory manager from a module -- it may need some time, for the moment existing memory managers can be converted and be left in the core Short term plans/goals: - hopefully Camille will find some spare time to convert TLSF to the new memory management api -- I can assist when needed - I plan to add a system malloc custom manager to be able to use system memory without recompilation. This will be different than compiling kamailio without PKG_MALLOC (which does inline replacement with malloc/free/...) - maybe resurrect other memory managers that are implemented in mem/ folder -- at least Doug Lea malloc seems to worth the troubles - said already, enhance so the code for memory malloc can be inside a module, to move out of core some of those managers The new memory management api is at beginning, suggestions to adjust it are welcome. 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

9 years, 2 months

git:master:4c2c7d22: modules/cdp: removed references to old shm management

by root

Module: kamailio Branch: master Commit: 4c2c7d229a6387bf4fb9bdfdc9c5c87cce0d47ba URL: https://github.com/kamailio/kamailio/commit/4c2c7d229a6387bf4fb9bdfdc9c5c87… Author: root <root(a)CSCFs-Development.it.za.corp.smilecoms.com> Committer: root <root(a)CSCFs-Development.it.za.corp.smilecoms.com> Date: 2015-09-14T17:07:12+02:00 modules/cdp: removed references to old shm management --- Modified: modules/cdp/globals.c --- Diff: https://github.com/kamailio/kamailio/commit/4c2c7d229a6387bf4fb9bdfdc9c5c87… Patch: https://github.com/kamailio/kamailio/commit/4c2c7d229a6387bf4fb9bdfdc9c5c87… --- diff --git a/modules/cdp/globals.c b/modules/cdp/globals.c index 76f0d59..d901d4c 100644 --- a/modules/cdp/globals.c +++ b/modules/cdp/globals.c @@ -45,6 +45,7 @@ #include "globals.h" #include "utils.h" +#include "../../mem/shm_mem.h" //str aaa_fqdn={"unset_fqdn",10}; //str aaa_realm={"unset_realm",11}; @@ -83,31 +84,6 @@ /** call it before exiting; if show_status==1, mem status is displayed */ void destroy_memory(int show_status) { - /*clean-up*/ - if (mem_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 */ -#ifdef SHM_MEM - if (show_status){ - LM_DBG( "Memory status (shm):\n"); - //shm_status(); -#ifndef SER_MOD_INTERFACE - shm_sums(); -#endif - } - /* zero all shmem alloc vars that we still use */ - shm_mem_destroy(); -#endif -#ifdef PKG_MALLOC - if (show_status){ - LM_DBG( "Memory status (pkg):\n"); - //pkg_status(); -#ifndef SER_MOD_INTERFACE - pkg_sums(); -#endif - } -#endif }

9 years, 2 months

[kamailio] UAC module - registration stuck in ONGOING state (does not retry) (#255)

by AndyJRobinson

I was finally able to catch an occurrence of the issue where a registration was getting stuck in the ONGOING state and not being retried. This is with 4.3.0. Here's an example of a successful registration from the logs: Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:callcentric.com> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (_sip._udp.callcentric.com(25), 33), h=428 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (alpha19.callcentric.com(23), 1), h=201 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: <core> [forward.c:174]: get_out_socket(): socket determined: 0x7751b8e4 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 42513 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:616]: parse_msg(): SIP Reply (status): Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:618]: parse_msg(): version: <SIP/2.0> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:620]: parse_msg(): status: <407> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:622]: parse_msg(): reason: <Proxy Authentication Required> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:1254]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK116a.65ec1863000000000000000000000000.0>; state=16 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:2642]: parse_via(): end of header reached, state=5 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:496]: parse_headers(): parse_headers: Via found, flags=2 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:498]: parse_headers(): parse_headers: this is the first via Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:134]: receive_msg(): After parse_msg... Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:1011]: t_check_msg(): DEBUG: t_check_msg: msg id=16741 global id=16740 T start=0xffffffff Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=10 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: uac [auth_hdr.c:402]: build_authorization_hdr(): hdr is <Proxy-Authorization: Digest username="removed", realm="callcentric.com", nonce="75a3bdc28a8d7f8bd7531ec41ac9ea25", uri="sip:callcentric.com", response="f8dc5c3d85280da5972c1a7ef0b53f08", algorithm=MD5 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:172]: parse_to_param(): DEBUG: add_param: tag=2afe4db221460197112d59bc9a08ee82-bb3d Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=29 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:callcentric.com> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (_sip._udp.callcentric.com(25), 33), h=428 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (alpha19.callcentric.com(23), 1), h=201 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [forward.c:174]: get_out_socket(): socket determined: 0x7751b8e4 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 42514 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:1589]: cleanup_uac_timers(): DEBUG: cleanup_uac_timers: RETR/FR timers reset Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:278]: receive_msg(): cleaning up Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:616]: parse_msg(): SIP Reply (status): Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:618]: parse_msg(): version: <SIP/2.0> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:620]: parse_msg(): status: <200> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:622]: parse_msg(): reason: <Ok> Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:1254]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK216a.928c6026000000000000000000000000.0>; state=16 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:2642]: parse_via(): end of header reached, state=5 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:496]: parse_headers(): parse_headers: Via found, flags=2 Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:498]: parse_headers(): parse_headers: this is the first via Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:134]: receive_msg(): After parse_msg... Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:1011]: t_check_msg(): DEBUG: t_check_msg: msg id=16742 global id=16741 T start=0xffffffff Sat Jul 18 23:03:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=10 Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:2053]: local_reply(): DEBUG: local transaction completed Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_hooks.c:266]: run_trans_callbacks_internal(): DBG: trans=0x76abc580, callback type 1024, id 0 entered Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: uac [uac_reg.c:723]: uac_reg_tm_callback(): completed with status 200 [uuid: removed+uac] Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:187]: get_hdr_field(): DEBUG: get_hdr_body : content_length=0 Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:89]: get_hdr_field(): found end of header Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:1589]: cleanup_uac_timers(): DEBUG: cleanup_uac_timers: RETR/FR timers reset Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:03:41 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Here's where the registration got stuck (I added the "ONGOING flag still set" message myself to help capture when this occurred). I see the 200 Ok response to the REGISTER with the Proxy-Authorization header, but don't see uac_reg_tm_callback being invoked. Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:callcentric.com> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (_sip._udp.callcentric.com(25), 33), h=428 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (alpha17.callcentric.com(23), 1), h=135 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: <core> [forward.c:174]: get_out_socket(): socket determined: 0x7751b8e4 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25189]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 42871 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:616]: parse_msg(): SIP Reply (status): Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:618]: parse_msg(): version: <SIP/2.0> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:620]: parse_msg(): status: <407> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:622]: parse_msg(): reason: <Proxy Authentication Required> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:1254]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK777a.be9fe760000000000000000000000000.0>; state=16 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:2642]: parse_via(): end of header reached, state=5 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:496]: parse_headers(): parse_headers: Via found, flags=2 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:498]: parse_headers(): parse_headers: this is the first via Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:134]: receive_msg(): After parse_msg... Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:1011]: t_check_msg(): DEBUG: t_check_msg: msg id=16764 global id=16763 T start=0xffffffff Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=10 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: uac [auth_hdr.c:203]: parse_authenticate_body(): <stale>="TRUE" state=4 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: uac [auth_hdr.c:203]: parse_authenticate_body(): <algorithm>="MD5" state=7 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: uac [auth_hdr.c:402]: build_authorization_hdr(): hdr is <Proxy-Authorization: Digest username="removed", realm="callcentric.com", nonce="b281825597a5ca2370701bd5a71d0f7b", uri="sip:callcentric.com", response="eae092a16bc01ac1333d922d088293a5", algorithm=MD5 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:172]: parse_to_param(): DEBUG: add_param: tag=2afe4db221460197112d59bc9a08ee82-5239 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=29 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:callcentric.com> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (_sip._udp.callcentric.com(25), 33), h=428 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (alpha17.callcentric.com(23), 1), h=135 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [forward.c:174]: get_out_socket(): socket determined: 0x7751b8e4 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 42872 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:1589]: cleanup_uac_timers(): DEBUG: cleanup_uac_timers: RETR/FR timers reset Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:278]: receive_msg(): cleaning up Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:616]: parse_msg(): SIP Reply (status): Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:618]: parse_msg(): version: <SIP/2.0> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:620]: parse_msg(): status: <200> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:622]: parse_msg(): reason: <Ok> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:1254]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK877a.1f487c81000000000000000000000000.0>; state=16 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_via.c:2642]: parse_via(): end of header reached, state=5 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:496]: parse_headers(): parse_headers: Via found, flags=2 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:498]: parse_headers(): parse_headers: this is the first via Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:134]: receive_msg(): After parse_msg... Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:1011]: t_check_msg(): DEBUG: t_check_msg: msg id=16765 global id=16764 T start=0xffffffff Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=10 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:173]: get_hdr_field(): DEBUG: get_hdr_field: <t> [35]; uri=[sip:removed@callcentric.com] Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:175]: get_hdr_field(): DEBUG: to body [<sip:removed@callcentric.com> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [parser/msg_parser.c:153]: get_hdr_field(): get_hdr_field: cseq <CSeq>: <11> <REGISTER> Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:888]: t_reply_matching(): DEBUG: t_reply_matching: hash 42872 label 0 branch 0 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:943]: t_reply_matching(): DEBUG: t_reply_matching: reply matched (T=0x76abc580)! Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_lookup.c:1080]: t_check_msg(): DEBUG: t_check_msg: msg id=16765 global id=16765 T end=0x76abc580 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:2136]: reply_received(): DEBUG: reply_received: org. status uas=0, uac[0]=0 local=2 is_invite=0) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:1230]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=200 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:2016]: local_reply(): DEBUG: local_reply: branch=0, save=0, winner=0 Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:2053]: local_reply(): DEBUG: local transaction completed Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: tm [t_reply.c:1589]: cleanup_uac_timers(): DEBUG: cleanup_uac_timers: RETR/FR timers reset Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) Sat Jul 18 23:18:40 2015 local0.debug /usr/sbin/kamailio[25184]: DEBUG: <core> [receive.c:278]: receive_msg(): cleaning up Sat Jul 18 23:24:40 2015 local0.err /usr/sbin/kamailio[25189]: ERROR: uac [uac_reg.c:935]: uac_reg_update(): ONGOING flag still set --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/255

9 years, 2 months

git:master:171553eb: tm: reset async suspended flag when continuing via failure_route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 171553ebcac2f00a015191f36f2f228c0d3e483b URL: https://github.com/kamailio/kamailio/commit/171553ebcac2f00a015191f36f2f228… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T12:53:54+02:00 tm: reset async suspended flag when continuing via failure_route - suspended transaction can be resumed automatically on timeout, without t_continue(), ending up in failure_route --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/171553ebcac2f00a015191f36f2f228… Patch: https://github.com/kamailio/kamailio/commit/171553ebcac2f00a015191f36f2f228… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8240ced..0041a4f 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -982,6 +982,8 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, * set next failure route, failure_route will not be reentered * on failure */ t->on_failure=0; + /* if continuing on timeout of a suspended transaction, reset the flag */ + t->flags &= ~T_ASYNC_SUSPENDED; if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { /* run a failure_route action if some was marked */ if (run_top_route(failure_rt.rlist[on_failure], &faked_req, 0)<0)

9 years, 2 months

git:master:52c4965b: tm: test if transaction was suspended before resuming inside t_continue()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52c4965bbb4cde5d7bddcf697aa504e7c2202ac1 URL: https://github.com/kamailio/kamailio/commit/52c4965bbb4cde5d7bddcf697aa504e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T12:45:28+02:00 tm: test if transaction was suspended before resuming inside t_continue() --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/52c4965bbb4cde5d7bddcf697aa504e… Patch: https://github.com/kamailio/kamailio/commit/52c4965bbb4cde5d7bddcf697aa504e… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 67572b6..1ca56db 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -106,10 +106,10 @@ int t_suspend(struct sip_msg *msg, * - failure route to be executed if the branch is not continued * before timeout */ t->uac[t->async_backup.blind_uac].on_failure = t->on_failure; + t->flags |= T_ASYNC_SUSPENDED; } else { LM_DBG("this is a suspend on reply - setting msg flag to SUSPEND\n"); msg->msg_flags |= FL_RPL_SUSPENDED; - t->flags |= T_ASYNC_SUSPENDED; /* this is a reply suspend find which branch */ if (t_check( msg , &branch )==-1){ @@ -131,6 +131,7 @@ int t_suspend(struct sip_msg *msg, LM_DBG("saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; + t->flags |= T_ASYNC_SUSPENDED; } *hash_index = t->hash_index; @@ -176,7 +177,13 @@ int t_continue(unsigned int hash_index, unsigned int label, return -1; } + if (!(t->flags & T_ASYNC_SUSPENDED)) { + LM_ERR("transaction is not suspended [%u:%u]\n", hash_index, label); + return -2; + } + if (t->flags & T_CANCELED) { + t->flags &= ~T_ASYNC_SUSPENDED; /* The transaction has already been canceled, * needless to continue */ UNREF(t); /* t_unref would kill the transaction */ @@ -219,6 +226,7 @@ int t_continue(unsigned int hash_index, unsigned int label, /* Either t_continue() has already been * called or the branch has already timed out. * Needless to continue. */ + t->flags &= ~T_ASYNC_SUSPENDED; UNLOCK_ASYNC_CONTINUE(t); UNREF(t); /* t_unref would kill the transaction */ return 1; @@ -444,12 +452,14 @@ int t_continue(unsigned int hash_index, unsigned int label, t->uac[branch].reply = 0; } - t->flags &= ~T_ASYNC_SUSPENDED; /*This transaction is no longer suspended so unsetting the SUSPEND flag*/ + /*This transaction is no longer suspended so unsetting the SUSPEND flag*/ + t->flags &= ~T_ASYNC_SUSPENDED; return 0; kill_trans: + t->flags &= ~T_ASYNC_SUSPENDED; /* The script has hopefully set the error code. If not, * let us reply with a default error. */ if ((kill_transaction_unsafe(t,

9 years, 2 months

git:4.3:3763f689: dialog: mark slot as lock if dialog found in state deleted for spiral detection

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 3763f689436b717b323d6d0337317ffc24d180a1 URL: https://github.com/kamailio/kamailio/commit/3763f689436b717b323d6d0337317ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T12:06:31+02:00 dialog: mark slot as lock if dialog found in state deleted for spiral detection (cherry picked from commit 6a9c892fd0a7a526ec6ced4b40479875477d96db) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/3763f689436b717b323d6d0337317ff… Patch: https://github.com/kamailio/kamailio/commit/3763f689436b717b323d6d0337317ff… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index ad88faa..bfee1fa 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -823,6 +823,7 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) } /* lock the slot - dlg found, but in dlg_state_deleted, do a new one */ dlg_hash_lock(&callid); + mlock = 1; } spiral_detected = 0;

9 years, 2 months

git:master:6a9c892f: dialog: mark slot as lock if dialog found in state deleted for spiral detection

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6a9c892fd0a7a526ec6ced4b40479875477d96db URL: https://github.com/kamailio/kamailio/commit/6a9c892fd0a7a526ec6ced4b4047987… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T12:05:27+02:00 dialog: mark slot as lock if dialog found in state deleted for spiral detection --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/6a9c892fd0a7a526ec6ced4b4047987… Patch: https://github.com/kamailio/kamailio/commit/6a9c892fd0a7a526ec6ced4b4047987… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 9f74e10..1ba3b5a 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -823,6 +823,7 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) } /* lock the slot - dlg found, but in dlg_state_deleted, do a new one */ dlg_hash_lock(&callid); + mlock = 1; } spiral_detected = 0;

9 years, 2 months

selecting memory manager at startup

by Daniel-Constantin Mierla

Hello, (cross-posting as it is relevant to user community as well). I just pushed a bunch of patches to master branch that will allow selecting the memory manger at kamailio startup, no longer needed to re-compile sources. There are two new command line parameters: * -x name: select the memory manager for shm * -X name: select the memory manager for pkg * if -x is provided but -X is not provided, then pkg uses same memory manager as shm * name can be: * fm - fast malloc (f_malloc) * qm - quick malloc (q_malloc) * default memory manager is fm (what was default so far) Both f_malloc and q_malloc are now compiled, selecting one or the other being possible. Other managers expected to be added in the list soon, especially TLSF, added not that long ago by Camille Oudot. Maybe reviving Doug Lea malloc (existing in dl_malloc.c) worth a try now that can be easily used. The debugging mode for each memory manager is controlled by DB_SR_MEMORY define via Makefile.defs -- right now it is enabled. All enabled memory mangers must be compiled either with or without DB_SR_MEMORY (it won't work to have one memory manger with DB_SR_MEMORY and another one without). Using system malloc for private (pkg) memory is possible by removing the define of PKG_MALLOC from Makefile.defs (same as it was before). This is a mode suitable for troubleshooting using external tools such as valgrind, because it does inline replacement of pkg_malloc() with malloc(), so those tools can track the place of allocation. I plan to add a system malloc custom manager, to allow selecting it with -X (system malloc won't work for shm management, because it is only for private memory). There is no performance impact at runtime, it is only the startup procedure that replaces the pointers to memory management functions. Hopefully with the new mechanism will be able to track easier memory issues -- e.g., qm malloc is better for troubleshooting, using it no longer requires recompilation, just starting kamailio with -x qm. Feedback, especially testing, will be very appreciated! 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

9 years, 2 months

git:master:abb732e2: Makefile.defs: version set to 4.4.0-dev4

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abb732e2cde4b7a94f48a47db7cfd42bc7bb6d6b URL: https://github.com/kamailio/kamailio/commit/abb732e2cde4b7a94f48a47db7cfd42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:46+02:00 Makefile.defs: version set to 4.4.0-dev4 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/abb732e2cde4b7a94f48a47db7cfd42… Patch: https://github.com/kamailio/kamailio/commit/abb732e2cde4b7a94f48a47db7cfd42… --- diff --git a/Makefile.defs b/Makefile.defs index 10a4e2b..fc6dfd7 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

9 years, 2 months

git:master:a7812ed9: mem: reintroduced the option to use system malloc if PKG_MALLOC is not defined

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a7812ed9e076105fcd483ae74c5a087caa4bf629 URL: https://github.com/kamailio/kamailio/commit/a7812ed9e076105fcd483ae74c5a087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:46+02:00 mem: reintroduced the option to use system malloc if PKG_MALLOC is not defined --- Modified: mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/a7812ed9e076105fcd483ae74c5a087… Patch: https://github.com/kamailio/kamailio/commit/a7812ed9e076105fcd483ae74c5a087… --- diff --git a/mem/pkg.h b/mem/pkg.h index b2a6c40..dd062bb 100644 --- a/mem/pkg.h +++ b/mem/pkg.h @@ -20,6 +20,8 @@ #ifndef _sr_pkg_h_ #define _sr_pkg_h_ +#ifdef PKG_MALLOC + #include "memapi.h" extern sr_pkg_api_t _pkg_root; @@ -47,4 +49,29 @@ int pkg_init_manager(char *name); void pkg_destroy_manager(void); void pkg_print_manager(void); +#else /*PKG_MALLOC*/ +/* use system allocator */ +# include <stdlib.h> +# include "memdbg.h" +# ifdef DBG_SYS_MALLOC +# define pkg_malloc(s) \ + ( { void *____v123; ____v123=malloc((s)); \ + MDBG("malloc %p size %lu end %p (%s:%d)\n", ____v123, (unsigned long)(s), (char*)____v123+(s), __FILE__, __LINE__);\ + ____v123; } ) +# define pkg_realloc(p, s) \ + ( { void *____v123; ____v123=realloc(p, s); \ + MDBG("realloc %p size %lu end %p (%s:%d)\n", ____v123, (unsigned long)(s), (char*)____v123+(s), __FILE__, __LINE__);\ + ____v123; } ) +# define pkg_free(p) do{ MDBG("free %p (%s:%d)\n", (p), __FILE__, __LINE__); free((p)); }while(0) +# else +# define pkg_malloc(s) malloc((s)) +# define pkg_realloc(p, s) realloc((p), (s)) +# define pkg_free(p) free((p)) +# endif +# define pkg_status() do{}while(0) +# define pkg_info(mi) do{ memset((mi),0, sizeof(*(mi))); } while(0) +# define pkg_available() 0 +# define pkg_sums() do{}while(0) +#endif /*PKG_MALLOC*/ + #endif

9 years, 2 months

← Newer
1
...
22
23
24
25
26
27
28
...
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