sr-dev December 2010

sr-dev@lists.kamailio.org

16 participants
115 discussions

git:master: kex: print private memory usage per process via rpc
by Daniel-Constantin Mierla 20 Dec '10

20 Dec '10

Module: sip-router Branch: master Commit: 829b7ff2e663c3ab7cc4ea95d2831eabef57b543 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=829b7ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 20 09:51:05 2010 +0100 kex: print private memory usage per process via rpc - new rpc command pkg.stats that prints used, free and real_used metrics per process for private memory (pkg) - you can see how much pkg each process is eating and how much is still available - should be useful to track pkg memory leaks and/or trigger alerts when there is no more pkg available --- modules_k/kex/kex_mod.c | 18 +++- modules_k/kex/pkg_stats.c | 249 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/pkg_stats.h | 39 +++++++ 3 files changed, 305 insertions(+), 1 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index d0d7525..c6b55b4 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -36,6 +36,7 @@ #include "km_core.h" #include "mi_core.h" #include "core_stats.h" +#include "pkg_stats.h" MODULE_VERSION @@ -47,6 +48,7 @@ MODULE_VERSION int w_is_myself(struct sip_msg *msg, char *uri, str *s2); static int mod_init(void); +static int child_init(int rank); static void destroy(void); static cmd_export_t cmds[]={ @@ -106,7 +108,7 @@ struct module_exports exports= { mod_init, /* module initialization function */ 0, (destroy_function) destroy, - 0 /* per-child init function */ + child_init /* per-child init function */ }; /** @@ -122,10 +124,24 @@ static int mod_init(void) if(register_mi_stats()<0) return -1; #endif + register_pkg_proc_stats(); + pkg_proc_stats_init_rpc(); return 0; } /** + * + */ +static int child_init(int rank) +{ + LM_DBG("rank is (%d)\n", rank); + if (rank==PROC_INIT) + return pkg_proc_stats_init(); + return pkg_proc_stats_myinit(rank); +} + + +/** * destroy function */ static void destroy(void) diff --git a/modules_k/kex/pkg_stats.c b/modules_k/kex/pkg_stats.c new file mode 100644 index 0000000..7a8d9c3 --- /dev/null +++ b/modules_k/kex/pkg_stats.c @@ -0,0 +1,249 @@ +/* + * $Id$ + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/*! + * \file + * \brief Kamailio pkg statistics + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <unistd.h> + +#include "../../dprint.h" +#include "../../ut.h" +#include "../../pt.h" +#include "../../events.h" +#include "../../mem/mem.h" +#include "../../mem/shm_mem.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" + + +/** + * + */ +typedef struct pkg_proc_stats { + int rank; + unsigned int pid; + unsigned int used; + unsigned int available; + unsigned int real_used; +} pkg_proc_stats_t; + +/** + * + */ +static pkg_proc_stats_t *_pkg_proc_stats_list = NULL; + +/** + * + */ +static int _pkg_proc_stats_no = 0; + +/** + * + */ +int pkg_proc_stats_init(void) +{ + _pkg_proc_stats_no = get_max_procs(); + + if(_pkg_proc_stats_no<=0) + return -1; + if(_pkg_proc_stats_list!=NULL) + return -1; + _pkg_proc_stats_list = (pkg_proc_stats_t*)shm_malloc( + _pkg_proc_stats_no*sizeof(pkg_proc_stats_t)); + if(_pkg_proc_stats_list==NULL) + return -1; + memset(_pkg_proc_stats_list, 0, + _pkg_proc_stats_no*sizeof(pkg_proc_stats_t)); + return 0; +} + +/** + * + */ +int pkg_proc_stats_myinit(int rank) +{ + struct mem_info info; + if(_pkg_proc_stats_list==NULL) + return -1; + if(process_no>=_pkg_proc_stats_no) + return -1; + _pkg_proc_stats_list[process_no].pid = (unsigned int)my_pid(); + _pkg_proc_stats_list[process_no].rank = rank; + + /* init pkg usage values */ + pkg_info(&info); + _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].real_used = info.real_used; + return 0; +} + +/** + * + */ +int pkg_proc_stats_destroy(void) +{ + if(_pkg_proc_stats_list==NULL) + return -1; + shm_free(_pkg_proc_stats_list); + _pkg_proc_stats_list = 0; + _pkg_proc_stats_no = 0; + return 0; +} + + +/** + * + */ +static int pkg_proc_update_used(void *data) +{ + if(_pkg_proc_stats_list==NULL) + return -1; + if(process_no>=_pkg_proc_stats_no) + return -1; + _pkg_proc_stats_list[process_no].used = (unsigned int)data; + return 0; +} + +/** + * + */ +static int pkg_proc_update_real_used(void *data) +{ + if(_pkg_proc_stats_list==NULL) + return -1; + if(process_no>=_pkg_proc_stats_no) + return -1; + _pkg_proc_stats_list[process_no].real_used = (unsigned int)data; + _pkg_proc_stats_list[process_no].available = pkg_available(); + return 0; +} + +/** + * + */ +int register_pkg_proc_stats(void) +{ + sr_event_register_cb(SREV_PKG_SET_USED, pkg_proc_update_used); + sr_event_register_cb(SREV_PKG_SET_REAL_USED, pkg_proc_update_real_used); + return 0; +} + +/** + * + */ +static const char* rpc_pkg_stats_doc[2] = { + "Private memory (pkg) statistics per process", + 0 +}; + +/** + * + */ +int pkg_proc_get_pid_index(unsigned int pid) +{ + int i; + for(i=0; i<_pkg_proc_stats_no; i++) + { + if(_pkg_proc_stats_list[i].pid == pid) + return i; + } + return -1; +} + +/** + * + */ +static void rpc_pkg_stats(rpc_t* rpc, void* ctx) +{ + int i; + int limit; + int lpid; + void* th; + + if(_pkg_proc_stats_list==NULL) + { + rpc->fault(ctx, 500, "Not initialized"); + return; + } + i = 0; + limit = _pkg_proc_stats_no; + if (rpc->scan(ctx, "*d", &lpid) == 1) + { + i = pkg_proc_get_pid_index((unsigned int)lpid); + if(i<0) + { + rpc->fault(ctx, 500, "No such pid"); + return; + } + limit = i + 1; + } + + for(; i<limit; i++) + { + /* add entry node */ + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "dddddd", + "entry", i, + "pid", _pkg_proc_stats_list[i].pid, + "rank", _pkg_proc_stats_list[i].rank, + "used", _pkg_proc_stats_list[i].used, + "free", _pkg_proc_stats_list[i].available, + "real_used", _pkg_proc_stats_list[i].real_used + )<0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + } +} + +/** + * + */ +rpc_export_t kex_pkg_rpc[] = { + {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, 0}, + {0, 0, 0, 0} +}; + +/** + * + */ +int pkg_proc_stats_init_rpc(void) +{ + if (rpc_register_array(kex_pkg_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +} + diff --git a/modules_k/kex/pkg_stats.h b/modules_k/kex/pkg_stats.h new file mode 100644 index 0000000..4f42758 --- /dev/null +++ b/modules_k/kex/pkg_stats.h @@ -0,0 +1,39 @@ +/* + * $Id$ + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/*! + * \file + * \brief Kamailio pkg statistics + */ + + +#ifndef _PKG_STATS_H_ +#define _PKG_STATS_H_ + +int pkg_proc_stats_init(void); +int pkg_proc_stats_myinit(int rank); +int pkg_proc_stats_destroy(void); +int register_pkg_proc_stats(void); +int pkg_proc_stats_init_rpc(void); + +#endif /*_PKG_STATS_H_*/

1 0

git:master: debugger: added some comments for functions
by Daniel-Constantin Mierla 20 Dec '10

20 Dec '10

Module: sip-router Branch: master Commit: e2335db0b437157001c08da2802fcdf3de6c712a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2335db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 20 09:44:43 2010 +0100 debugger: added some comments for functions --- modules/debugger/debugger_mod.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index e0fa8f2..8b85afb 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -116,6 +116,9 @@ static int mod_init(void) return dbg_init_bp_list(); } +/** + * child init function + */ static int child_init(int rank) { LM_DBG("rank is (%d)\n", rank); @@ -123,6 +126,7 @@ static int child_init(int rank) return dbg_init_pid_list(); return dbg_init_mypid(); } + /** * destroy module function */ @@ -130,6 +134,9 @@ static void mod_destroy(void) { } +/** + * cfg wrapper to set breakpoint (not implemented yet) + */ static int w_dbg_breakpoint(struct sip_msg* msg, char* point, char* str2) { return 1; @@ -150,6 +157,9 @@ static struct action *dbg_fixup_get_action(void **param, int param_no) } +/** + * fixup for cfg set breakpoint function + */ static int fixup_dbg_breakpoint(void** param, int param_no) { struct action *a;

1 0

git:master: core: added core events for pkg operations
by Daniel-Constantin Mierla 20 Dec '10

20 Dec '10

Module: sip-router Branch: master Commit: 70e7b57085ea7453c2a49393241af2328169167a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70e7b57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 20 09:39:40 2010 +0100 core: added core events for pkg operations - ability to track pkg used and real_used metrics --- events.c | 38 ++++++++++++++++++++++++++++++++++++++ events.h | 12 ++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/events.c b/events.c index 61abc5f..881da1d 100644 --- a/events.c +++ b/events.c @@ -32,6 +32,9 @@ static sr_event_cb_t _sr_events_list; static int _sr_events_inited = 0; +/** + * + */ void sr_event_cb_init(void) { if(_sr_events_inited == 0) @@ -41,6 +44,9 @@ void sr_event_cb_init(void) } } +/** + * + */ int sr_event_register_cb(int type, sr_event_cb_f f) { sr_event_cb_init(); @@ -65,12 +71,25 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.run_action = f; else return -1; break; + case SREV_PKG_SET_USED: + if(_sr_events_list.pkg_set_used==0) + _sr_events_list.pkg_set_used = f; + else return -1; + break; + case SREV_PKG_SET_REAL_USED: + if(_sr_events_list.pkg_set_real_used==0) + _sr_events_list.pkg_set_real_used = f; + else return -1; + break; default: return -1; } return 0; } +/** + * + */ int sr_event_exec(int type, void *data) { int ret; @@ -121,11 +140,26 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.run_action(data); return ret; } else return 1; + case SREV_PKG_SET_USED: + if(unlikely(_sr_events_list.pkg_set_used!=0)) + { + ret = _sr_events_list.pkg_set_used(data); + return ret; + } else return 1; + case SREV_PKG_SET_REAL_USED: + if(unlikely(_sr_events_list.pkg_set_real_used!=0)) + { + ret = _sr_events_list.pkg_set_real_used(data); + return ret; + } else return 1; default: return -1; } } +/** + * + */ int sr_event_enabled(int type) { switch(type) { @@ -137,6 +171,10 @@ int sr_event_enabled(int type) return (_sr_events_list.core_stats!=0)?1:0; case SREV_CFG_RUN_ACTION: return (_sr_events_list.run_action!=0)?1:0; + case SREV_PKG_SET_USED: + return (_sr_events_list.pkg_set_used!=0)?1:0; + case SREV_PKG_SET_REAL_USED: + return (_sr_events_list.pkg_set_real_used!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index 6f79070..fdbcb45 100644 --- a/events.h +++ b/events.h @@ -23,10 +23,12 @@ #include "parser/msg_parser.h" -#define SREV_NET_DATA_IN 1 -#define SREV_NET_DATA_OUT 2 -#define SREV_CORE_STATS 3 -#define SREV_CFG_RUN_ACTION 4 +#define SREV_NET_DATA_IN 1 +#define SREV_NET_DATA_OUT 2 +#define SREV_CORE_STATS 3 +#define SREV_CFG_RUN_ACTION 4 +#define SREV_PKG_SET_USED 5 +#define SREV_PKG_SET_REAL_USED 6 typedef int (*sr_event_cb_f)(void *data); @@ -35,6 +37,8 @@ typedef struct sr_event_cb { sr_event_cb_f net_data_out; sr_event_cb_f core_stats; sr_event_cb_f run_action; + sr_event_cb_f pkg_set_used; + sr_event_cb_f pkg_set_real_used; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

git:master: cfgutils: added pkg_summary() and shm_summary()
by Daniel-Constantin Mierla 19 Dec '10

19 Dec '10

Module: sip-router Branch: master Commit: 122099d069aecd7f2cd74fd840f446236a88b885 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=122099d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 19 21:13:06 2010 +0100 cfgutils: added pkg_summary() and shm_summary() - ability to print summary of pkg and shm from config --- modules_k/cfgutils/cfgutils.c | 46 ++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/modules_k/cfgutils/cfgutils.c b/modules_k/cfgutils/cfgutils.c index 828a460..3472768 100644 --- a/modules_k/cfgutils/cfgutils.c +++ b/modules_k/cfgutils/cfgutils.c @@ -88,6 +88,8 @@ static int m_usleep(struct sip_msg*, char *, char *); static int dbg_abort(struct sip_msg*, char*,char*); static int dbg_pkg_status(struct sip_msg*, char*,char*); static int dbg_shm_status(struct sip_msg*, char*,char*); +static int dbg_pkg_summary(struct sip_msg*, char*,char*); +static int dbg_shm_summary(struct sip_msg*, char*,char*); static int set_gflag(struct sip_msg*, char *, char *); static int reset_gflag(struct sip_msg*, char *, char *); @@ -137,33 +139,37 @@ static cmd_export_t cmds[]={ 1, /* number of parameters */ fixup_prob, 0, /* */ /* can be applied to original/failed requests and replies */ - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rand_reset_prob", (cmd_function)reset_prob, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rand_get_prob", (cmd_function)get_prob, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rand_event", (cmd_function)rand_event, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"sleep", (cmd_function)m_sleep, 1, fixup_uint_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"usleep", (cmd_function)m_usleep, 1, fixup_uint_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"abort", (cmd_function)dbg_abort, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"pkg_status", (cmd_function)dbg_pkg_status, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"shm_status", (cmd_function)dbg_shm_status, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, + {"pkg_summary", (cmd_function)dbg_pkg_summary, 0, 0, 0, + ANY_ROUTE}, + {"shm_summary", (cmd_function)dbg_shm_summary, 0, 0, 0, + ANY_ROUTE}, {"set_gflag", (cmd_function)set_gflag, 1, fixup_gflags, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"reset_gflag", (cmd_function)reset_gflag, 1, fixup_gflags, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_gflag", (cmd_function)is_gflag, 1, fixup_gflags, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"lock", (cmd_function)cfg_lock, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"unlock", (cmd_function)cfg_unlock, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -660,6 +666,18 @@ static int dbg_shm_status(struct sip_msg* msg, char* foo, char* bar) return 1; } +static int dbg_pkg_summary(struct sip_msg* msg, char* foo, char* bar) +{ + pkg_sums(); + return 1; +} + +static int dbg_shm_summary(struct sip_msg* msg, char* foo, char* bar) +{ + shm_sums(); + return 1; +} + int cfg_lock_helper(struct sip_msg *msg, gparam_p key, int mode) { str s;

1 0

git:master: cfgutils: documented pkg/shm_summary()
by Daniel-Constantin Mierla 19 Dec '10

19 Dec '10

Module: sip-router Branch: master Commit: c55058315ef8105f3d073340e050b6d49a2fe465 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c550583… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 19 21:23:15 2010 +0100 cfgutils: documented pkg/shm_summary() --- modules_k/cfgutils/README | 190 +++++++++++++++++------------ modules_k/cfgutils/doc/cfgutils_admin.xml | 51 ++++++++- 2 files changed, 164 insertions(+), 77 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c55…

1 0

crash while parsing uri
by Juha Heinanen 19 Dec '10

19 Dec '10

sr master crashes while parsing uri. looks like it is related to db acc_extra, but don't know which uri it was. actually, when i look at my db_extra var, it contains $ru and the rest are avps. so perhaps the crash came while parsing request-uri. -- juha Program terminated with signal 11, Segmentation fault. [New process 17398] #0 parse_uri (buf=0x20000000a <Address 0x20000000a out of bounds>, len=1249306511, uri=0x2b0fc2c9bb28) at parser/parse_uri.c:389 389 scheme=buf[0]+(buf[1]<<8)+(buf[2]<<16)+(buf[3]<<24); (gdb) where #0 parse_uri (buf=0x20000000a <Address 0x20000000a out of bounds>, len=1249306511, uri=0x2b0fc2c9bb28) at parser/parse_uri.c:389 #1 0x00000000004fe88f in parse_sip_msg_uri (msg=0x2b0fc2c9b748) at parser/parse_uri.c:1407 #2 0x00002b0fc11158d5 in pv_get_ruri (msg=0x2b0fc2c9bb28, param=0x984238, res=0x2b0fc2c9b9c8) at pv_core.c:207 #3 0x0000000000466743 in pv_get_spec_value (msg=0x2b0fc2c9b748, sp=0x984220, value=0x2b0fc2c9b9c8) at pvapi.c:988 #4 0x00002b0fc175167c in extra2strar (extra=0x984210, rq=0x2b0fc2c9b748, val_arr=<value optimized out>, int_arr=0x2b0fc1968f7c, type_arr=0x2b0fc19690c7 "") at acc_extra.c:262 #5 0x00002b0fc1750720 in acc_db_request (rq=0x2b0fc2c9b748) at acc.c:385 #6 0x00002b0fc1752bd8 in on_missed (t=<value optimized out>, req=0x2b0fc2c9b748, reply=<value optimized out>, code=503) at acc_logic.c:356 #7 0x00002b0fc1753654 in tmcb_func (t=0x2b0fc2c93ad0, type=<value optimized out>, ps=<value optimized out>) at acc_logic.c:399 #8 0x00002b0fbe84d1ac in run_trans_callbacks_internal ( cb_lst=0x2b0fc2c93b40, type=128, trans=0x2b0fc2c93ad0, params=0x7fffee58ed20) at t_hooks.c:290 #9 0x00002b0fbe84d40a in run_trans_callbacks (type=27, trans=<value optimized out>, req=0x246, rpl=0x20000000a, code=6) at t_hooks.c:317 #10 0x00002b0fbe86d8cc in _reply_light (trans=0x2b0fc2c93ad0, buf=0x8a4dc0 "SIP/2.0 503 Service not available\r\nVia: SIP/2.0/TCP 192.98.100.10;branch=z9hG4bK2ee1.89c63a36.0\r\nVia: SIP/2.0/UDP 192.168.0.169:5074;received=192.98.100.128;rport=62461;branch=z9hG4bKuukwknpo\r\nTo: <si"..., len=455, code=503, to_tag=<value optimized out>, to_tag_len=<value optimized out>, lock=1, bm=0x7fffee58eea0) ---Type <return> to continue, or q <return> to quit--- at t_reply.c:646 #11 0x00002b0fbe86eaf1 in _reply (trans=0x2b0fc2c93ad0, p_msg=0x8d77e0, code=503, text=<value optimized out>, lock=1) at t_reply.c:726 #12 0x00002b0fbe85df55 in w_t_reply_wrp (m=0x8d77e0, code=<value optimized out>, txt=<value optimized out>) at tm.c:1256 #13 0x00002b0fbf9362cd in send_reply (msg=0x8d77e0, code=503, reason=0x7fffee58f000) at sl.c:268 #14 0x00002b0fbf9365e5 in w_send_reply (msg=0x8d77e0, p1=<value optimized out>, p2=0x930d18 "xO\223") at sl.c:306 #15 0x0000000000415ab6 in do_action (h=0x7fffee5915c0, a=0x934d50, msg=0x8d77e0) at action.c:1100 #16 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x934d50, msg=0x8d77e0) at action.c:1588 #17 0x000000000041620c in do_action (h=0x7fffee5915c0, a=0x934fa0, msg=0x8d77e0) at action.c:1089 #18 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x934fa0, msg=0x8d77e0) at action.c:1588 #19 0x000000000041620c in do_action (h=0x7fffee5915c0, a=0x935090, msg=0x8d77e0) at action.c:1089 #20 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x933c60, msg=0x8d77e0) at action.c:1588 #21 0x000000000041620c in do_action (h=0x7fffee5915c0, a=0x935a10, msg=0x8d77e0) at action.c:1089 #22 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x935a10, msg=0x8d77e0) at action.c:1588 #23 0x0000000000415b57 in do_action (h=0x7fffee5915c0, a=0x942688, msg=0x8d77e0) at action.c:1392 #24 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x931f88, msg=0x8d77e0) at action.c:1588 ---Type <return> to continue, or q <return> to quit--- #25 0x00000000004176ff in do_action (h=0x7fffee5915c0, a=0x931c88, msg=0x8d77e0) at action.c:712 #26 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x92bfb8, msg=0x8d77e0) at action.c:1588 #27 0x00000000004176ff in do_action (h=0x7fffee5915c0, a=0x8d4858, msg=0x8d77e0) at action.c:712 #28 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x87dc00, msg=0x8d77e0) at action.c:1588 #29 0x00000000004176ff in do_action (h=0x7fffee5915c0, a=0x87cb58, msg=0x8d77e0) at action.c:712 #30 0x000000000041c462 in run_actions (h=0x7fffee5915c0, a=0x877578, msg=0x8d77e0) at action.c:1588 #31 0x000000000041c723 in run_top_route (a=0x877578, msg=0x8d77e0, c=<value optimized out>) at action.c:1661 #32 0x00000000004704fe in receive_msg ( buf=0x2b0fc2c8f430 "INVITE *********\r\n"..., len=<value optimized out>, rcv_info=0x2b0fc2c8f168) at receive.c:205 #33 0x00000000004cc1d1 in tcp_read_req (con=0x2b0fc2c8f150, bytes_read=0x7fffee591930, read_flags=0x7fffee59192c) at tcp_read.c:978 #34 0x00000000004ccc2e in handle_io (fm=0x98c1d8, events=1, idx=-1) at tcp_read.c:1150 #35 0x00000000004cf760 in tcp_receive_loop (unix_sock=<value optimized out>) at io_wait.h:1091 #36 0x00000000004a8fb7 in tcp_init_children () at tcp_main.c:4819 #37 0x000000000044da94 in main_loop () at main.c:1632 #38 0x000000000044ffd0 in main (argc=<value optimized out>, argv=0x7fffee591cd8) at main.c:2398

2 10

git:master: acc(k): take r-uri from winning branch for missed call acc
by Daniel-Constantin Mierla 19 Dec '10

19 Dec '10

Module: sip-router Branch: master Commit: ade20f7c8c26e732b7e7ad89a6d2c22b71228f60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ade20f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 19 11:56:49 2010 +0100 acc(k): take r-uri from winning branch for missed call acc - only if the branch was relayed, otherwise uac struct might be unfinished due to drop call in config. Use r-uri from uas struct otherwise - reported by Juha Henanen --- modules_k/acc/acc_logic.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules_k/acc/acc_logic.c b/modules_k/acc/acc_logic.c index 38666a1..dd2fd6f 100644 --- a/modules_k/acc/acc_logic.c +++ b/modules_k/acc/acc_logic.c @@ -326,13 +326,19 @@ static inline void acc_onreply_in(struct cell *t, struct sip_msg *req, static inline void on_missed(struct cell *t, struct sip_msg *req, struct sip_msg *reply, int code) { - str new_uri_bk; + str new_uri_bk = {0, 0}; int flags_to_reset = 0; /* set as new_uri the last branch */ - new_uri_bk = req->new_uri; - req->new_uri = t->uac[t->nr_of_outgoings-1].uri; - req->parsed_uri_ok = 0; + if (t->relayed_reply_branch>=0) { + new_uri_bk = req->new_uri; + req->new_uri = t->uac[t->relayed_reply_branch].uri; + req->parsed_uri_ok = 0; + } else { + new_uri_bk.len = -1; + new_uri_bk.s = 0; + } + /* set env variables */ env_set_to( get_rpl_to(t,reply) ); env_set_code_status( code, reply); @@ -380,8 +386,11 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, */ reset_acc_flag( req, flags_to_reset ); - req->new_uri = new_uri_bk; - req->parsed_uri_ok = 0; + if (new_uri_bk.len>=0) { + req->new_uri = new_uri_bk; + req->parsed_uri_ok = 0; + } + }

1 0

git:master: dialplan: don't print PV name in replacement
by Daniel-Constantin Mierla 17 Dec '10

17 Dec '10

Module: sip-router Branch: master Commit: eb005b74c1d47d215b17ac395efafe56c14ec295 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb005b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 18 00:34:54 2010 +0100 dialplan: don't print PV name in replacement - reported by Andreas Granig --- modules/dialplan/dp_repl.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 5831f36..2b8454c 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -123,6 +123,8 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, pv_value_t sv; str* uri; int ovector[3 * (MAX_REPLACE_WITH + 1)]; + char *p; + int size; dp_output_buf[0] = '\0'; result->s = dp_output_buf; @@ -180,6 +182,7 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, /* offset- offset in the replacement string */ result->len = repl_nb = offset = 0; + p=repl_comp->replacement.s; while( repl_nb < repl_comp->n_escapes){ token = repl_comp->replace[repl_nb]; @@ -191,9 +194,11 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, goto error; } /*copy from the replacing string*/ - memcpy(result->s + result->len, repl_comp->replacement.s + offset, - token.offset-offset); - result->len += (token.offset - offset); + size=repl_comp->replacement.s+repl_comp->replace[repl_nb].offset-p; + memcpy(result->s + result->len, p, size); + result->len += size; + p+=size+repl_comp->replace[repl_nb].size; + offset += token.offset-offset; /*update the offset*/ } @@ -261,10 +266,9 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, /* anything left? */ if( repl_nb && token.offset+token.size < repl_comp->replacement.len){ /*copy from the replacing string*/ - memcpy(result->s + result->len, - repl_comp->replacement.s + token.offset+token.size, - repl_comp->replacement.len -(token.offset+token.size) ); - result->len +=repl_comp->replacement.len-(token.offset+token.size); + size = repl_comp->replacement.s+repl_comp->replacement.len-p; + memcpy(result->s + result->len, p, size); + result->len += size; } result->s[result->len] = '\0';

1 0

SR master: [tcp_main.c:700]: _wbufq_add(): ERROR: wbufq_add(371 bytes): write queue full or timeout
by Iñaki Baz Castillo 17 Dec '10

17 Dec '10

Hi, I'm testing TCP support in Kamailio master branch. The test is a bit special because I open a TCP connection (client and proxy in localhost) and send a TCP data containing 5000 SIP requests together (which is valid). Then wait for responses and parses them. Kamailio just replies stateless for all those requests (no routing, no forwarding, no more processing). There are two TCP workers. Sometimes it works ok and all the replies are received, but sometimes Kamailio gives an error after receiving N requests (i.e. 1072 requests): kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1071#015#012 kamailio[18349]: ERROR: <core> [tcp_main.c:700]: _wbufq_add(): ERROR: wbufq_add(372 bytes): write queue full or timeout (32455, total 32455, last write 0 s ago) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1072#015#012 kamailio[18350]: ERROR: <core> [tcp_main.c:3594]: handle_ser_child(): handle_ser_child: ERROR: received CON_ERROR for 0x7fc0dd172880 (id 65), refcnt 3, flags 0x601c kamailio[18349]: ERROR: <core> [tcp_main.c:2743]: tcpconn_1st_send(): connect 127.0.0.1:51901 failed (RST) Connection refused kamailio[18349]: ERROR: <core> [tcp_main.c:2753]: tcpconn_1st_send(): 127.0.0.1:51901: connect & send for 0x7fc0dd17c648 failed: Connection refused (111) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1073#015#012 kamailio[18349]: ERROR: <core> [tcp_main.c:2743]: tcpconn_1st_send(): connect 127.0.0.1:51901 failed (RST) Connection refused kamailio[18349]: ERROR: <core> [tcp_main.c:2753]: tcpconn_1st_send(): 127.0.0.1:51901: connect & send for 0x7fc0dd17c648 failed: Connection refused (111) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1074#015#012 kamailio[18349]: ERROR: <core> [tcp_main.c:2743]: tcpconn_1st_send(): connect 127.0.0.1:51901 failed (RST) Connection refused kamailio[18349]: ERROR: <core> [tcp_main.c:2753]: tcpconn_1st_send(): 127.0.0.1:51901: connect & send for 0x7fc0dd17c648 failed: Connection refused (111) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1075#015#012 kamailio[18349]: ERROR: <core> [tcp_main.c:2743]: tcpconn_1st_send(): connect 127.0.0.1:51901 failed (RST) Connection refused kamailio[18349]: ERROR: <core> [tcp_main.c:2753]: tcpconn_1st_send(): 127.0.0.1:51901: connect & send for 0x7fc0dd17c648 failed: Connection refused (111) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1076#015#012 kamailio[18349]: ERROR: <core> [tcp_main.c:2743]: tcpconn_1st_send(): connect 127.0.0.1:51901 failed (RST) Connection refused kamailio[18349]: ERROR: <core> [tcp_main.c:2753]: tcpconn_1st_send(): 127.0.0.1:51901: connect & send for 0x7fc0dd17c648 failed: Connection refused (111) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed kamailio[18349]: INFO: <script>: Branch = z9hG4bK1---num-request-1077#015#012 kamailio[18349]: ERROR: <core> [tcp_main.c:2743]: tcpconn_1st_send(): connect 127.0.0.1:51901 failed (RST) Connection refused kamailio[18349]: ERROR: <core> [tcp_main.c:2753]: tcpconn_1st_send(): 127.0.0.1:51901: connect & send for 0x7fc0dd17c648 failed: Connection refused (111) kamailio[18349]: ERROR: sl [../../forward.h:169]: msg_send(): msg_send: ERROR: tcp_send failed And finally Kamailio closes the TCP connection: kamailio[18349]: WARNING: <core> [tcp_read.c:1195]: handle_io(): WARNING: tcp_receive: handle_io: F_TCPCONN connection marked as bad: 0x7fc0dd172880 id 65 refcnt 1 I've no special parameters for TCP in the kamailio.cfg, just the default config file. Is it a bug? can it be improved by setting some parameter? However it's strange the fact that the error just occurs sometimes (but very often). Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 4

continue statement
by Juha Heinanen 17 Dec '10

17 Dec '10

one of my configs looks really ugly due to lack of continue statement in while loop. i have created a ticket about it, but looks like feature tickets (none of them) are really paid attention to. could someone give me some hints on what source files to start reading if i try to add continue statement myself? -- juha

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2010