sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:3.1: core: print cfg line for failed eval expressions
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: aaa605dff829c2924a7324ec9d487a58843e5db1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aaa605d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 00:02:47 2011 +0100 core: print cfg line for failed eval expressions (cherry picked from commit bf7cacc549e18d483a892c208cd27c9263b86c49) --- lvalue.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/lvalue.c b/lvalue.c index a8dcbd9..bce987f 100644 --- a/lvalue.c +++ b/lvalue.c @@ -395,7 +395,8 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, } switch(lv->type){ case LV_NONE: - BUG("uninitialized/invalid lvalue (%d)\n", lv->type); + BUG("uninitialized/invalid lvalue (%d) (cfg line: %d)\n", + lv->type, rve->fpos.s_line); goto error; case LV_AVP: ret=lval_avp_assign(h, msg, lv, rv); @@ -404,6 +405,11 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=lval_pvar_assign(h, msg, lv, rv); break; } + if (unlikely(ret<0)){ + ERR("assignmet failed at pos: (%d,%d-%d,%d)\n", + rve->fpos.s_line, rve->fpos.s_col, + rve->fpos.e_line, rve->fpos.e_col); + } rval_destroy(rv); return ret; error:

1 0

git:3.1: snmpstats: start the agentx process
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: cf783925a78100faeff4199a201ad46e7b58247c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf78392… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 09:16:05 2011 +0100 snmpstats: start the agentx process (cherry picked from commit 41e163ccd7ea6b52886e67928d453f454a239208) --- modules_k/snmpstats/snmpstats.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 9e52c03..248e693 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -266,6 +266,9 @@ static int mod_init(void) /* Register the alarm checking function to run periodically */ register_timer(run_alarm_check, 0, ALARM_AGENT_FREQUENCY_IN_SECONDS); + /* add space for one extra process */ + register_procs(1); + return 0; } @@ -275,11 +278,21 @@ static int mod_init(void) * process, and register a handler for any state changes of our child. */ static int mod_child_init(int rank) { + int pid; + /* We only want to setup a single process, under the main attendant. */ if (rank != PROC_MAIN) { return 0; } + pid=fork_process(PROC_NOCHLDINIT, "SNMP AgentX", 1); + if (pid<0) + return -1; /* error */ + if(pid==0){ + /* child */ + agentx_child(1); + } + /* Spawn a child that will check the system up time. */ spawn_sysUpTime_child();

1 0

git:3.1: sanity: print broken uri if failed to parse
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: cd7dfe3e6ad90356c4fbf22edc399cdbf9ff2ecd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd7dfe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 27 21:33:13 2011 +0100 sanity: print broken uri if failed to parse (cherry picked from commit f3217b68093f82da411b6870eaabeaba9e229e0c) --- modules/sanity/sanity.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/sanity/sanity.c b/modules/sanity/sanity.c index c7cc41b..e60a28c 100644 --- a/modules/sanity/sanity.c +++ b/modules/sanity/sanity.c @@ -218,7 +218,8 @@ int check_ruri_scheme(struct sip_msg* _msg) { if (_msg->parsed_uri_ok == 0 && parse_sip_msg_uri(_msg) != 1) { /* unsupported schemes end up here already */ - LOG(L_WARN, "sanity_check(): check_ruri_scheme(): failed to parse request uri\n"); + LM_WARN("failed to parse request uri [%.*s]\n", + GET_RURI(_msg)->len, GET_RURI(_msg)->s); } if (_msg->parsed_uri.type == ERROR_URI_T) { if (_msg->REQ_METHOD != METHOD_ACK) {

1 0

git:3.1: core: small spelling fix in log message
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: c8611d41efd19d0c8f146cb2e2121c380c644663 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8611d4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 15:29:45 2011 +0100 core: small spelling fix in log message (cherry picked from commit 536e5901c83b4c9b8d6aff7dd32e2fe0fefe6d0b) --- lvalue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lvalue.c b/lvalue.c index bce987f..e13e1a5 100644 --- a/lvalue.c +++ b/lvalue.c @@ -406,7 +406,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, break; } if (unlikely(ret<0)){ - ERR("assignmet failed at pos: (%d,%d-%d,%d)\n", + ERR("assignment failed at pos: (%d,%d-%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); }

1 0

git:3.1: snmpstats: return from agentx spawning
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: e78f8c30935aa61ba99ac60af9c26286da054076 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e78f8c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 09:26:10 2011 +0100 snmpstats: return from agentx spawning (cherry picked from commit 97a616f1e34ef3e2631f2a67e9c36cf3516a0441) --- modules_k/snmpstats/snmpstats.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 248e693..831251b 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -285,12 +285,14 @@ static int mod_child_init(int rank) return 0; } + /* Spawn SNMP AgentX process */ pid=fork_process(PROC_NOCHLDINIT, "SNMP AgentX", 1); if (pid<0) return -1; /* error */ if(pid==0){ /* child */ agentx_child(1); + return 0; } /* Spawn a child that will check the system up time. */

1 0

git:master: snmpstats: support of OPTIONS advertised also for siputils module
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: 9d5bae90cdd40e05e6aaff488a5c86f7241aa261 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d5bae9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 17:20:19 2011 +0100 snmpstats: support of OPTIONS advertised also for siputils module --- modules_k/snmpstats/snmpSIPMethodSupportedTable.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/snmpstats/snmpSIPMethodSupportedTable.c b/modules_k/snmpstats/snmpSIPMethodSupportedTable.c index f574235..fc62953 100644 --- a/modules_k/snmpstats/snmpSIPMethodSupportedTable.c +++ b/modules_k/snmpstats/snmpSIPMethodSupportedTable.c @@ -150,7 +150,7 @@ void init_openserSIPMethodSupportedTable(void) createRow(4, "METHOD_BYE"); } - if (module_loaded("options")) { + if (module_loaded("options") || module_loaded("siputils")) { createRow(6, "METHOD_OPTIONS"); }

1 0

git:master: snmpstats: moved declaration of vars in .c file
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: 8c26d7221cabe3c7c5b2f218b842c5886d830966 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c26d72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 16:46:47 2011 +0100 snmpstats: moved declaration of vars in .c file --- modules_k/snmpstats/snmpstats.c | 72 ++++++++++++++++++++++++++++++++++++++ modules_k/snmpstats/snmpstats.h | 73 --------------------------------------- 2 files changed, 72 insertions(+), 73 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 831251b..1994876 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -84,6 +84,15 @@ #include <net-snmp/net-snmp-includes.h> #include <net-snmp/agent/net-snmp-agent-includes.h> +#include "../../lib/kcore/statistics.h" +#include "../../sr_module.h" +#include "../../dprint.h" +#include "../../error.h" +#include "../../ut.h" +#include "../../script_cb.h" +#include "../../mem/mem.h" +#include "../../mem/shm_mem.h" + #include "snmpSIPRegUserTable.h" #include "snmpSIPContactTable.h" @@ -97,6 +106,69 @@ /* Required in every Kamailio Module. */ MODULE_VERSION +/*! This is the first function to be called by Kamailio, to initialize the module. + * This call must always return a value as soon as possible. If it were not to + * return, then Kamailio would not be able to initialize any of the other + * modules. */ +static int mod_init(void); + +/*! This function is called when Kamailio has finished creating all instances of + * itself. It is at this point that we want to create our AgentX sub-agent + * process, and register a handler for any state changes of our child. */ +static int mod_child_init(int rank); + + +/*! This function is called when Kamailio is shutting down. When this happens, we + * log a useful message and kill the AgentX Sub-Agent child process */ +static void mod_destroy(void); + + +static proc_export_t mod_procs[] = { + {"SNMP AgentX", 0, 0, agentx_child, 1 }, + {0,0,0,0,0} +}; + + +/*! + * This structure defines the SNMPStats parameters that can be configured + * through the kamailio.cfg configuration file. + */ +static param_export_t mod_params[] = +{ + { "sipEntityType", STR_PARAM|USE_FUNC_PARAM, + (void *)handleSipEntityType }, + { "MsgQueueMinorThreshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_queue_minor_threshold }, + { "MsgQueueMajorThreshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_queue_major_threshold }, + { "dlg_minor_threshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_dlg_minor_threshold }, + { "dlg_major_threshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_dlg_major_threshold }, + { "snmpgetPath", STR_PARAM|USE_FUNC_PARAM, + (void *)set_snmpget_path }, + { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM, + (void *)set_snmp_community }, + { 0,0,0 } +}; + + +struct module_exports exports = +{ + SNMPSTATS_MODULE_NAME, /* module's name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + mod_params, /* param exports */ + 0, /* exported statistics */ + 0, /* MI Functions */ + 0, /* pseudo-variables */ + mod_procs, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* reply processing function */ + mod_destroy, /* Destroy function */ + mod_child_init /* per-child init function */ +}; + /*! * The module will fork off a child process to run an snmp command via execve(). * We need a customized handler to ignore the SIGCHLD when the execve() diff --git a/modules_k/snmpstats/snmpstats.h b/modules_k/snmpstats/snmpstats.h index 75a0160..6b76a2d 100644 --- a/modules_k/snmpstats/snmpstats.h +++ b/modules_k/snmpstats/snmpstats.h @@ -65,81 +65,8 @@ #ifndef _SNMP_STATS_ #define _SNMP_STATS_ -#include "../../lib/kcore/statistics.h" -#include "../../sr_module.h" -#include "../../dprint.h" -#include "../../error.h" -#include "../../ut.h" -#include "../../script_cb.h" -#include "../../mem/mem.h" -#include "../../mem/shm_mem.h" -#include "snmpstats_globals.h" -#include "sub_agent.h" - #define SNMPSTATS_MODULE_NAME "snmpstats" #define SYSUPTIME_OID ".1.3.6.1.2.1.1.3.0" -/*! This is the first function to be called by Kamailio, to initialize the module. - * This call must always return a value as soon as possible. If it were not to - * return, then Kamailio would not be able to initialize any of the other - * modules. */ -static int mod_init(void); - -/*! This function is called when Kamailio has finished creating all instances of - * itself. It is at this point that we want to create our AgentX sub-agent - * process, and register a handler for any state changes of our child. */ -static int mod_child_init(int rank); - - -/*! This function is called when Kamailio is shutting down. When this happens, we - * log a useful message and kill the AgentX Sub-Agent child process */ -static void mod_destroy(void); - - -static proc_export_t mod_procs[] = { - {"SNMP AgentX", 0, 0, agentx_child, 1 }, - {0,0,0,0,0} -}; - - -/*! - * This structure defines the SNMPStats parameters that can be configured - * through the kamailio.cfg configuration file. - */ -static param_export_t mod_params[] = -{ - { "sipEntityType", STR_PARAM|USE_FUNC_PARAM, - (void *)handleSipEntityType }, - { "MsgQueueMinorThreshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_queue_minor_threshold }, - { "MsgQueueMajorThreshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_queue_major_threshold }, - { "dlg_minor_threshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_dlg_minor_threshold }, - { "dlg_major_threshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_dlg_major_threshold }, - { "snmpgetPath", STR_PARAM|USE_FUNC_PARAM, - (void *)set_snmpget_path }, - { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM, - (void *)set_snmp_community }, - { 0,0,0 } -}; - - -struct module_exports exports = -{ - SNMPSTATS_MODULE_NAME, /* module's name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - mod_params, /* param exports */ - 0, /* exported statistics */ - 0, /* MI Functions */ - 0, /* pseudo-variables */ - mod_procs, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* reply processing function */ - mod_destroy, /* Destroy function */ - mod_child_init /* per-child init function */ -}; #endif

1 0

git:master: snmpstats: return from agentx spawning
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: 97a616f1e34ef3e2631f2a67e9c36cf3516a0441 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97a616f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 09:26:10 2011 +0100 snmpstats: return from agentx spawning --- modules_k/snmpstats/snmpstats.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 248e693..831251b 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -285,12 +285,14 @@ static int mod_child_init(int rank) return 0; } + /* Spawn SNMP AgentX process */ pid=fork_process(PROC_NOCHLDINIT, "SNMP AgentX", 1); if (pid<0) return -1; /* error */ if(pid==0){ /* child */ agentx_child(1); + return 0; } /* Spawn a child that will check the system up time. */

1 0

git:master: snmpstats: start the agentx process
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: 41e163ccd7ea6b52886e67928d453f454a239208 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41e163c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 09:16:05 2011 +0100 snmpstats: start the agentx process --- modules_k/snmpstats/snmpstats.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 9e52c03..248e693 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -266,6 +266,9 @@ static int mod_init(void) /* Register the alarm checking function to run periodically */ register_timer(run_alarm_check, 0, ALARM_AGENT_FREQUENCY_IN_SECONDS); + /* add space for one extra process */ + register_procs(1); + return 0; } @@ -275,11 +278,21 @@ static int mod_init(void) * process, and register a handler for any state changes of our child. */ static int mod_child_init(int rank) { + int pid; + /* We only want to setup a single process, under the main attendant. */ if (rank != PROC_MAIN) { return 0; } + pid=fork_process(PROC_NOCHLDINIT, "SNMP AgentX", 1); + if (pid<0) + return -1; /* error */ + if(pid==0){ + /* child */ + agentx_child(1); + } + /* Spawn a child that will check the system up time. */ spawn_sysUpTime_child();

1 0

git:master: core: small spelling fix in log message
by Henning Westerholt 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: 536e5901c83b4c9b8d6aff7dd32e2fe0fefe6d0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=536e590… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jan 28 15:29:45 2011 +0100 core: small spelling fix in log message --- lvalue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lvalue.c b/lvalue.c index bce987f..e13e1a5 100644 --- a/lvalue.c +++ b/lvalue.c @@ -406,7 +406,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, break; } if (unlikely(ret<0)){ - ERR("assignmet failed at pos: (%d,%d-%d,%d)\n", + ERR("assignment failed at pos: (%d,%d-%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011