sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: core: more version related rpcs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 20fd4b8b75002c70ecfa826509fb5e5f2046b034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20fd4b8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 20:38:08 2010 +0200 core: more version related rpcs core.flags - prints the compile flags. core.info - verbose version info, including the version, git hash, compiler, compile date and compile flags. --- core_cmd.c | 39 ++++++++++++++++++++++++++++++++++++++- ver.c | 4 ++++ ver.h | 4 ++++ 3 files changed, 46 insertions(+), 1 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 589908d..2305370 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -339,6 +339,38 @@ static void core_version(rpc_t* rpc, void* c) +static const char* core_flags_doc[] = { + "Returns the compile flags.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_flags(rpc_t* rpc, void* c) +{ + rpc->add(c, "s", ver_flags); +} + + + +static const char* core_info_doc[] = { + "Verbose info, including version number, compile flags, compiler," + "repository hash a.s.o.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_info(rpc_t* rpc, void* c) +{ + void* s; + + if (rpc->add(c, "{", &s) < 0) return; + rpc->struct_printf(s, "version", "%s %s", ver_name, ver_version); + rpc->struct_add(s, "s", "id", ver_id); + rpc->struct_add(s, "s", "compiler", ver_compiler); + rpc->struct_add(s, "s", "compiled", ver_compiled_time); + rpc->struct_add(s, "s", "flags", ver_flags); +} + + + static const char* core_uptime_doc[] = { "Returns uptime of SER server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -824,7 +856,12 @@ static rpc_export_t core_rpc_methods[] = { RET_ARRAY}, {"core.echo", core_echo, core_echo_doc, RET_ARRAY}, - {"core.version", core_version, core_version_doc, 0 }, + {"core.version", core_version, core_version_doc, + 0 }, + {"core.flags", core_flags, core_flags_doc, + 0 }, + {"core.info", core_info, core_info_doc, + 0 }, {"core.uptime", core_uptime, core_uptime_doc, 0 }, {"core.ps", core_ps, core_ps_doc, RET_ARRAY}, {"core.pwd", core_pwd, core_pwd_doc, RET_ARRAY}, diff --git a/ver.c b/ver.c index 80f1b26..e81586f 100644 --- a/ver.c +++ b/ver.c @@ -30,6 +30,10 @@ const char full_version[] = SER_FULL_VERSION " " REPO_VER; +const char ver_name[] = NAME; +const char ver_version[] = VERSION; +const char ver_arch[] = ARCH; +const char ver_os[] = OS_QUOTED; const char ver_id[] = REPO_HASH " " REPO_STATE; const char ver_compiled_time[] = __TIME__ " " __DATE__ ; const char ver_compiler[] = COMPILER; diff --git a/ver.h b/ver.h index ba036f3..25f1309 100644 --- a/ver.h +++ b/ver.h @@ -29,6 +29,10 @@ #define __ver_h extern const char full_version[]; +extern const char ver_name[]; +extern const char ver_version[]; +extern const char ver_arch[]; +extern const char ver_os[]; extern const char ver_id[]; extern const char ver_compiled_time[]; extern const char ver_compiler[];

14 years, 6 months

git:master: kex: print the git hash instead of the svn hash

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9683a7937dceb0a5e112c1b635c54fed87b7baa4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9683a79… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 20:40:14 2010 +0200 kex: print the git hash instead of the svn hash --- modules_k/kex/mi_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 241b0b6..36f5b93 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -144,8 +144,8 @@ static struct mi_root *mi_version(struct mi_root *cmd, void *param) if (node==0) goto error; - node = add_mi_node_child( rpl, 0, MI_SSTR("SVN"), SVNREVISION, - sizeof(SVNREVISION)-1); + node = add_mi_node_child( rpl, 0, MI_SSTR("GIT"), (char*)repo_hash, + strlen(repo_hash)); if (node==0) goto error;

14 years, 6 months

git:master: makefile: fix repo_state

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 420eb49f121793fe9094826e18bbf04ed1e65fce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=420eb49… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 21:00:37 2010 +0200 makefile: fix repo_state --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 516b294..7de18f7 100644 --- a/Makefile +++ b/Makefile @@ -564,8 +564,8 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ grep -v Makefile`" &&\ RV="$$RV"-dirty; echo "$$RV") repo_hash=$(subst -dirty,,$(repo_ver)) -repo_state=$(patsubst %-dirty,dirty,$(repo_ver)) -autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex +repo_state=$(subst %-dirty,dirty,$(findstring -dirty,$(repo_ver))) +autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex Makefile else # else if .git/ does not exist repo_ver=

14 years, 6 months

git:master: core: move version strings to a separate file

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 1ef55a0915c675ada0cecf7c7b6e0bb0d72f4da7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ef55a0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 19:59:26 2010 +0200 core: move version strings to a separate file - moved version strings to variables (instead of macros) and in a separate file (ver.c). This will require re-compiling only one small file and re-linking on version or repository changes (e.g. new commit or local uncommitted changes), instead of recompiling main.c and core_cmd.c. - more detailed info about the repository state is now available via repo_hash (hash of the top commit) and repo_state (dirty or ""). - the core.version rpc reports now directly the version number (complete with repository hash and state), without prefixing it with "Server:", e.g.: ser 3.0.99-dev1 (i386/linux) dd9681-dirty instead of Server: ser (3.0.99-dev1 (i386/freebsd)) d89437-dirty --- Makefile | 11 ++++++++--- core_cmd.c | 12 +++++------- main.c | 40 ++++++++++++++++------------------------ modules_k/kex/mi_core.c | 10 +++------- sr_module.h | 2 +- ver.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ ver.h | 43 +++++++++++++++++++++++++++++++++++++++++++ version.h => ver_defs.h | 9 +++------ 8 files changed, 125 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index b3fa651..516b294 100644 --- a/Makefile +++ b/Makefile @@ -491,12 +491,11 @@ modules_search_path=$(subst $(space),:,$(strip\ # $(addprefix $(modules_target),$(modules_dirs)))) # special depends for main.o -main.d main.o: autover.h main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' -#special depends for core_cmd.o -core_cmd.d core_cmd.o: autover.h +#special depends for ver.c +ver.d ver.o: autover.h include Makefile.shared @@ -564,10 +563,14 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ ; git diff-index --name-only HEAD 2>/dev/null | \ grep -v Makefile`" &&\ RV="$$RV"-dirty; echo "$$RV") +repo_hash=$(subst -dirty,,$(repo_ver)) +repo_state=$(patsubst %-dirty,dirty,$(repo_ver)) autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex else # else if .git/ does not exist repo_ver= +repo_hash="unknown" +repo_state= autover_h_dep= endif @@ -579,6 +582,8 @@ autover.h: $(autover_h_dep) @echo " */" >>$@ @echo "" >>$@ @echo "#define REPO_VER \"$(repo_ver)\"" >>$@ + @echo "#define REPO_HASH \"$(repo_hash)\"" >>$@ + @echo "#define REPO_STATE \"$(repo_state)\"" >>$@ .PHONY: all all: $(NAME) every-module diff --git a/core_cmd.c b/core_cmd.c index b049af9..589908d 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -20,18 +20,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** core rpcs. + * @file core_cmd.c + * @ingroup core */ #include <time.h> #include <sys/types.h> #include <signal.h> -#include "autover.h" +#include "ver.h" #include "mem/mem.h" #include "mem/shm_mem.h" #include "sr_module.h" @@ -336,7 +334,7 @@ static const char* core_version_doc[] = { static void core_version(rpc_t* rpc, void* c) { - rpc->add(c, "s", SERVER_HDR " " REPO_VER ); + rpc->add(c, "s", full_version); } diff --git a/main.c b/main.c index 7d28bcd..8f71731 100644 --- a/main.c +++ b/main.c @@ -73,23 +73,20 @@ * 2008-08-08 sctp support (andrei) * 2008-08-19 -l support for mmultihomed addresses/addresses lists * (e.g. -l (eth0, 1.2.3.4, foo.bar) ) (andrei) - * 2010-04-19 added daemon_status_fd pipe to communicate the parent process with - the main process in daemonize mode, so the parent process can return - the proper exit status code (ibc) + * 2010-04-19 added daemon_status_fd pipe to communicate the parent process + * with the main process in daemonize mode, so the parent process + * can return the proper exit status code (ibc) */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** main file (init, daemonize, startup) + * @file main.c + * @ingroup core + * Module: core */ -/*! \defgroup core SIP-router core - * - * This modules implements a SIP server with a module interface - * for extendability. +/*! @defgroup core SIP-router core * + * sip router core part. */ #include <stdio.h> @@ -190,8 +187,7 @@ #ifdef DEBUG_DMALLOC #include <dmalloc.h> #endif -#include "autover.h" -#include "version.h" +#include "ver.h" /* define SIG_DEBUG by default */ #ifdef NO_SIG_DEBUG @@ -200,10 +196,6 @@ #define SIG_DEBUG #endif -static char id[]="@(#) $Id$"; -static char* version=SER_FULL_VERSION " " REPO_VER; -static char* flags=SER_COMPILE_FLAGS; -char compiled[]= __TIME__ " " __DATE__ ; static char help_msg[]= "\ @@ -1688,7 +1680,7 @@ int main(int argc, char** argv) opterr = 0; while((c=getopt(argc,argv,options))!=-1) { if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { - printf("version: %s\n", version); + printf("version: %s\n", full_version); printf("%s",help_msg); exit(0); break; @@ -1724,8 +1716,8 @@ int main(int argc, char** argv) default_core_cfg.debug++; break; case 'V': - printf("version: %s\n", version); - printf("flags: %s\n", flags ); + printf("version: %s\n", full_version); + printf("flags: %s\n", ver_flags ); print_ct_constants(); #ifdef USE_SCTP tmp=malloc(256); @@ -1733,9 +1725,9 @@ int main(int argc, char** argv) printf("sctp unsupported socket options: %s\n", tmp); if (tmp) free(tmp); #endif - printf("%s\n",id); - printf("%s compiled on %s with %s\n", __FILE__, - compiled, COMPILER ); + printf("id: %s\n", ver_id); + printf("compiled on %s with %s\n", + ver_compiled_time, ver_compiler ); exit(0); break; diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 157d9f4..241b0b6 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -47,7 +47,7 @@ #include "../../pt.h" #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" -#include "../../version.h" +#include "../../ver.h" #include "../../cfg/cfg.h" #include "../../cfg/cfg_ctx.h" @@ -139,12 +139,8 @@ static struct mi_root *mi_version(struct mi_root *cmd, void *param) if (node==0) goto error; -#ifndef KAMAILIO_COMPILE_FLAGS -#define KAMAILIO_COMPILE_FLAGS SER_COMPILE_FLAGS -#endif - - node = add_mi_node_child( rpl, 0, MI_SSTR("Flags"), KAMAILIO_COMPILE_FLAGS, - sizeof(KAMAILIO_COMPILE_FLAGS)-1); + node = add_mi_node_child( rpl, 0, MI_SSTR("Flags"), (char*)ver_flags, + strlen(ver_flags)); if (node==0) goto error; diff --git a/sr_module.h b/sr_module.h index b055c88..d098f78 100644 --- a/sr_module.h +++ b/sr_module.h @@ -61,7 +61,7 @@ #include <dlfcn.h> #include "parser/msg_parser.h" /* for sip_msg */ -#include "version.h" +#include "ver_defs.h" #include "rpc.h" #include "route_struct.h" #include "route.h" diff --git a/ver.c b/ver.c new file mode 100644 index 0000000..80f1b26 --- /dev/null +++ b/ver.c @@ -0,0 +1,46 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * 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. + */ +/** version strings. + * @file ver.c + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-07-13 initial version (andrei) +*/ + +#include "ver_defs.h" +#include "autover.h" /* REPO_VER, REPO_STATE */ + + +const char full_version[] = SER_FULL_VERSION " " REPO_VER; +const char ver_id[] = REPO_HASH " " REPO_STATE; +const char ver_compiled_time[] = __TIME__ " " __DATE__ ; +const char ver_compiler[] = COMPILER; + +const char ver_flags[] = SER_COMPILE_FLAGS; + +/** hash-state. */ +const char repo_ver[] = REPO_VER; +/** git hash. */ +const char repo_hash[] = REPO_HASH; +/** state of the repository: dirty (uncommited changes) or "" */ +const char repo_state[] = REPO_STATE; + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/ver.h b/ver.h new file mode 100644 index 0000000..ba036f3 --- /dev/null +++ b/ver.h @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * 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. + */ +/** version strings. + * @file ver.h + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-07-13 initial version (andrei) +*/ + +#ifndef __ver_h +#define __ver_h + +extern const char full_version[]; +extern const char ver_id[]; +extern const char ver_compiled_time[]; +extern const char ver_compiler[]; +extern const char ver_flags[]; +extern const char repo_ver[]; +extern const char repo_hash[]; +extern const char repo_state[]; + + +#endif /*__ver_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/version.h b/ver_defs.h similarity index 98% rename from version.h rename to ver_defs.h index 1c60539..e6eb391 100644 --- a/version.h +++ b/ver_defs.h @@ -23,12 +23,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router core :: version and compile flag macros - * \ingroup core - * - * Module: \ref core +/** compile flags and other version related defines. + * @file ver_defs.h + * @ingroup core */ #ifndef version_h

14 years, 6 months

SF.net SVN: openser:[6020] branches/1.5/modules/dialog/dlg_handlers.c

by timoreimann＠users.sourceforge.net

Revision: 6020 http://openser.svn.sourceforge.net/openser/?rev=6020&view=rev Author: timoreimann Date: 2010-07-13 18:31:40 +0000 (Tue, 13 Jul 2010) Log Message: ----------- modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_TRANS_DELETED to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. Modified Paths: -------------- branches/1.5/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 6 months

git:kamailio_3.0: modules_k/dialog: Delay dialog deletion to absorb late in-dialog

by Timo Reimann

Module: sip-router Branch: kamailio_3.0 Commit: 24877089b48cdbf9389981c0e9285e6a3a1ce6c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2487708… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jun 28 10:50:05 2010 +0200 modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_DESTROY to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. (cherry picked from commit 3537c2d8c27617023cb9f9a569435483748fef1f) --- modules_k/dialog/dlg_handlers.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ad892b6..19b53e9 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -764,6 +764,20 @@ static void unreference_dialog(void *dialog) /*! + * \brief Unreference a dialog from tm callback (another wrapper) + * \param t transaction, unused + * \param type type of the entered callback + * \param param saved dialog structure in the callback + */ +static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) +{ + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + unref_dlg(dlg, 1); +} + + +/*! * \brief Function that is registered as RR callback for dialog tracking * * Function that is registered as RR callback for dialog tracking. It @@ -886,6 +900,17 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) set_current_dialog( req, dlg); _dlg_ctx.dlg = dlg; + /* delay deletion of dialog until transaction has died off in order + * to absorb in-air messages */ + if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { + if ( d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, + unref_dlg_from_cb, (void*)dlg, NULL)<0 ) { + LM_ERR("failed to register deletion delay function\n"); + } else { + ref_dlg(dlg, 1); + } + } + /* run actions for the transition */ if (event==DLG_EVENT_REQBYE && new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) {

14 years, 6 months

git:master: modules_k/dialog: Delay dialog deletion to absorb late in-dialog

by Timo Reimann

Module: sip-router Branch: master Commit: 3537c2d8c27617023cb9f9a569435483748fef1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3537c2d… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jun 28 10:50:05 2010 +0200 modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_DESTROY to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. --- modules_k/dialog/dlg_handlers.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ad892b6..19b53e9 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -764,6 +764,20 @@ static void unreference_dialog(void *dialog) /*! + * \brief Unreference a dialog from tm callback (another wrapper) + * \param t transaction, unused + * \param type type of the entered callback + * \param param saved dialog structure in the callback + */ +static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) +{ + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + unref_dlg(dlg, 1); +} + + +/*! * \brief Function that is registered as RR callback for dialog tracking * * Function that is registered as RR callback for dialog tracking. It @@ -886,6 +900,17 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) set_current_dialog( req, dlg); _dlg_ctx.dlg = dlg; + /* delay deletion of dialog until transaction has died off in order + * to absorb in-air messages */ + if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { + if ( d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, + unref_dlg_from_cb, (void*)dlg, NULL)<0 ) { + LM_ERR("failed to register deletion delay function\n"); + } else { + ref_dlg(dlg, 1); + } + } + /* run actions for the transition */ if (event==DLG_EVENT_REQBYE && new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) {

14 years, 6 months

[dialog MI dlg_end_dlg] error when terminating a dialog in state 2 (never removed from memory)

by Iñaki Baz Castillo

Hi, Kamailio 1.5.4, let's suppose this case: 1) A dialog in eary state (state 2): ~# kamctl fifo profile_list_dlgs out dialog:: hash=1055:330534072 state:: 2 2) Now try to terminate it: ~# kamctl fifo dlg_end_dlg 1055 330534072 3) It produces an error because in the early dialog there is no Contact for the called: ERROR:dialog:build_dlg_t: no contact available ERROR:dialog:send_bye: failed to create dlg_t CRITICAL:dialog:log_next_state_dlg: bogus event 7 in state 2 for dlg 0x7f25f0cde718 [3168:435552476] with clid 'hqpprxbyrutiytu@ibc-torre' and tags 'ysldc' '' 4) The dialog remains in state 2 (as the MI command shows), and later it's cancelled by the UAC. 5) MI profile_list_dlgs out will show the dialog in state 5 *forever*, it's never deleted from memory! (perhaps it's after expiration time, haven't checked it). NOTE: I do know that dlg_end_dlg is not ready for early dialogs, as it should trigger a transaction cancel (CANCEL to all the branches and 408 to the UAC) rather than sending a BYE, but this feature is not implemented. However the current code could leak. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 6 months

dialog module: failed_dlgs semantics

by Timo Reimann

Hi, what's the dialog module's "failed_dlgs" counter variable (defined in modules_k/dialog.c) supposed to indicate? My understanding would be that it shows the number of dialogs that could not reach the "confirmed" call state, i.e., calls for which the caller received a non-2xx final response after the initial INVITE during routing. However, the variable is increased in situations for which a dialog could not be set up in the very first place due to either - malformed SIP headers in the INVITE request, - lack of shared memory, and - unsuccessful callback registrations to the rr or tm module which are all checked in dlg_handler.c's dlg_new_dialog() function prior to any further response processing. What I'd prefer to do to the least is additionally update the counter variable every time a non-2xx final response has been received to indicate call failure in the SIP sense. Going one step further, I'd remove the update code from its current place because I do not see much meaning in running statistics on hard errors as given above. The cases are already covered by ERROR-level log messages so they will be reported anyway. To sum up my goal: If no one objects, I will change the code such that hard errors are not covered by failed_dlgs anymore but failure to establish SIP sessions are. Cheers, --Timo

14 years, 6 months

SF.net SVN: openser:[6019] branches/1.5/modules/dialog/dlg_handlers.c

by timoreimann＠users.sourceforge.net

Revision: 6019 http://openser.svn.sourceforge.net/openser/?rev=6019&view=rev Author: timoreimann Date: 2010-07-13 16:55:11 +0000 (Tue, 13 Jul 2010) Log Message: ----------- Increase failed_dlgs when a non-2xx final response has been received only. Modified Paths: -------------- branches/1.5/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev