sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

git:master: kex: added implementation of core stats and mi stats

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4568924a49062d998cad865ce92b223df3e1f58a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4568924… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 22 17:14:00 2009 +0200 kex: added implementation of core stats and mi stats - code for specific implementations of statistics API moved here from libkcore - k statistics API use now atomic ops for SR core --- modules_k/kex/core_stats.c | 247 ++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/core_stats.h | 82 +++++++++++++++ modules_k/kex/kex_mod.c | 10 ++ 3 files changed, 339 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c new file mode 100644 index 0000000..b72fa0e --- /dev/null +++ b/modules_k/kex/core_stats.c @@ -0,0 +1,247 @@ +/* + * $Id$ + * + * Copyright (C) 2006 Voice Sistem SRL + * + * 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. + * + * History: + * --------- + * 2006-01-23 first version (bogdan) + * 2006-11-28 Added statistics for the number of bad URI's, methods, and + * proxy requests (Jeffrey Magder - SOMA Networks) + */ + +/*! + * \file + * \brief Kamailio Core statistics + */ + + +#include <string.h> + +#include "../../lib/kcore/statistics.h" +#include "../../lib/kmi/mi.h" +#include "../../dprint.h" + + +#ifdef STATISTICS + +stat_var* rcv_reqs; /*!< received requests */ +stat_var* rcv_rpls; /*!< received replies */ +stat_var* fwd_reqs; /*!< forwarded requests */ +stat_var* fwd_rpls; /*!< forwarded replies */ +stat_var* drp_reqs; /*!< dropped requests */ +stat_var* drp_rpls; /*!< dropped replies */ +stat_var* err_reqs; /*!< error requests */ +stat_var* err_rpls; /*!< error replies */ +stat_var* bad_URIs; /*!< number of bad URIs */ +stat_var* unsupported_methods; /*!< unsupported methods */ +stat_var* bad_msg_hdr; /*!< messages with bad header */ + + +/*! exported core statistics */ +stat_export_t core_stats[] = { + {"rcv_requests" , 0, &rcv_reqs }, + {"rcv_replies" , 0, &rcv_rpls }, + {"fwd_requests" , 0, &fwd_reqs }, + {"fwd_replies" , 0, &fwd_rpls }, + {"drop_requests" , 0, &drp_reqs }, + {"drop_replies" , 0, &drp_rpls }, + {"err_requests" , 0, &err_reqs }, + {"err_replies" , 0, &err_rpls }, + {"bad_URIs_rcvd", 0, &bad_URIs }, + {"unsupported_methods", 0, &unsupported_methods }, + {"bad_msg_hdr", 0, &bad_msg_hdr }, + {0,0,0} +}; + +static struct mi_root *mi_get_stats(struct mi_root *cmd, void *param); +static struct mi_root *mi_reset_stats(struct mi_root *cmd, void *param); + +static mi_export_t mi_stat_cmds[] = { + { "get_statistics", mi_get_stats, 0 , 0, 0 }, + { "reset_statistics", mi_reset_stats, 0 , 0, 0 }, + { 0, 0, 0, 0, 0} +}; + +int register_mi_stats(void) +{ + /* register MI commands */ + if (register_mi_mod( "statistics", mi_stat_cmds)<0) { + LM_ERR("unable to register MI cmds\n"); + return -1; + } + return 0; +} +int register_core_stats(void) +{ + /* register core statistics */ + if (register_module_stats( "core", core_stats)!=0 ) { + LM_ERR("failed to register core statistics\n"); + return -1; + } +#if 0 + /* register sh_mem statistics */ + if (register_module_stats( "shmem", shm_stats)!=0 ) { + LM_ERR("failed to register sh_mem statistics\n"); + return -1; + } +#endif + return 0; +} + +/***************************** MI STUFF ********************************/ + +inline static int mi_add_stat(struct mi_node *rpl, stat_var *stat) +{ + struct mi_node *node; + stats_collector *sc; + + if((sc = get_stats_collector())==NULL) return -1; + + node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", + sc->amodules[stat->mod_idx].name.len, + sc->amodules[stat->mod_idx].name.s, + stat->name.len, stat->name.s, + get_stat_val(stat) ); + + if (node==0) + return -1; + return 0; +} + +inline static int mi_add_module_stats(struct mi_node *rpl, + module_stats *mods) +{ + struct mi_node *node; + stat_var *stat; + + for( stat=mods->head ; stat ; stat=stat->lnext) { + node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", + mods->name.len, mods->name.s, + stat->name.len, stat->name.s, + get_stat_val(stat) ); + if (node==0) + return -1; + } + return 0; +} + + +static struct mi_root *mi_get_stats(struct mi_root *cmd, void *param) +{ + struct mi_root *rpl_tree; + struct mi_node *rpl; + struct mi_node *arg; + module_stats *mods; + stat_var *stat; + str val; + int i; + + stats_collector *sc; + + if((sc = get_stats_collector())==NULL) + return init_mi_tree( 404, "Statistics Not Found", 20); + + if (cmd->node.kids==NULL) + return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + + rpl_tree = init_mi_tree( 200, MI_OK_S, MI_OK_LEN); + if (rpl_tree==0) + return 0; + rpl = &rpl_tree->node; + + for( arg=cmd->node.kids ; arg ; arg=arg->next) { + if (arg->value.len==0) + continue; + + val = arg->value; + + if ( val.len==3 && memcmp(val.s,"all",3)==0) { + /* add all statistic variables */ + for( i=0 ; i<sc->mod_no ;i++ ) { + if (mi_add_module_stats( rpl, &sc->amodules[i] )!=0) + goto error; + } + } else if ( val.len>1 && val.s[val.len-1]==':') { + /* add module statistics */ + val.len--; + mods = get_stat_module( &val ); + if (mods==0) + continue; + if (mi_add_module_stats( rpl, mods )!=0) + goto error; + } else { + /* add only one statistic */ + stat = get_stat( &val ); + if (stat==0) + continue; + if (mi_add_stat(rpl,stat)!=0) + goto error; + } + } + + if (rpl->kids==0) { + free_mi_tree(rpl_tree); + return init_mi_tree( 404, "Statistics Not Found", 20); + } + + return rpl_tree; +error: + free_mi_tree(rpl_tree); + return 0; +} + + + +static struct mi_root *mi_reset_stats(struct mi_root *cmd, void *param) +{ + struct mi_root *rpl_tree; + struct mi_node *arg; + stat_var *stat; + int found; + + if (cmd->node.kids==NULL) + return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + + rpl_tree = init_mi_tree( 200, MI_OK_S, MI_OK_LEN); + if (rpl_tree==0) + return 0; + found = 0; + + for( arg=cmd->node.kids ; arg ; arg=arg->next) { + if (arg->value.len==0) + continue; + + stat = get_stat( &arg->value ); + if (stat==0) + continue; + + reset_stat( stat ); + found = 1; + } + + if (!found) { + free_mi_tree(rpl_tree); + return init_mi_tree( 404, "Statistics Not Found", 20); + } + + return rpl_tree; +} + +#endif diff --git a/modules_k/kex/core_stats.h b/modules_k/kex/core_stats.h new file mode 100644 index 0000000..fabbee1 --- /dev/null +++ b/modules_k/kex/core_stats.h @@ -0,0 +1,82 @@ +/* + * $Id$ + * + * Copyright (C) 2006 Voice Sistem SRL + * + * 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. + * + * History: + * --------- + * 2006-01-23 first version (bogdan) + * 2006-11-28 Added statistics for the number of bad URI's, methods, and + * proxy requests (Jeffrey Magder - SOMA Networks) + */ + +/*! + * \file + * \brief Kamailio statistics + */ + + +#ifndef _CORE_STATS_H_ +#define _CORE_STATS_H_ + +#include "../../lib/kcore/statistics.h" + +#ifdef STATISTICS +/*! exported core statistics */ +extern stat_export_t core_stats[]; + +/*! \brief received requests */ +extern stat_var* rcv_reqs; + +/*! \brief received replies */ +extern stat_var* rcv_rpls; + +/*! \brief forwarded requests */ +extern stat_var* fwd_reqs; + +/*! \brief forwarded replies */ +extern stat_var* fwd_rpls; + +/*! \brief dropped requests */ +extern stat_var* drp_reqs; + +/*! \brief dropped replies */ +extern stat_var* drp_rpls; + +/*! \brief error requests */ +extern stat_var* err_reqs; + +/*! \brief error replies */ +extern stat_var* err_rpls; + +/*! \brief Set in parse_uri() */ +extern stat_var* bad_URIs; + +/*! \brief Set in parse_method() */ +extern stat_var* unsupported_methods; + +/*! \brief Set in get_hdr_field(). */ +extern stat_var* bad_msg_hdr; + +int register_mi_stats(void); +int register_core_stats(void); + +#endif /*STATISTICS*/ + +#endif /*_CORE_STATS_H_*/ diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index e99b6dc..c9c3ae3 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -28,6 +28,7 @@ #include "../../dprint.h" #include "mi_core.h" +#include "core_stats.h" MODULE_VERSION @@ -72,6 +73,12 @@ static int mod_init(void) { if(init_mi_core()<0) return -1; +#ifdef STATISTICS + if(register_core_stats()<0) + return -1; + if(register_mi_stats()<0) + return -1; +#endif return 0; } @@ -80,6 +87,9 @@ static int mod_init(void) */ void destroy(void) { +#ifdef STATISTICS + destroy_stats_collector(); +#endif return; }

15 years, 8 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Henning Westerholt

Module: sip-router Branch: master Commit: 1279cdf4c01baade62fc01e030cb1b0d2b82c6bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1279cdf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Apr 22 15:00:41 2009 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: * Modules: presence ---

15 years, 8 months

git:master: fix parameter name and doxygen comments for the description AVP

by Henning Westerholt

Module: sip-router Branch: master Commit: a99baf2b9aad42d01b2bdef0dca8365d7b31c627 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a99baf2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Apr 22 14:59:59 2009 +0200 fix parameter name and doxygen comments for the description AVP --- modules/carrierroute/cr_func.c | 24 ++++++++++++------------ modules/carrierroute/cr_func.h | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 325c20b..6e69ad2 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -351,13 +351,13 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, * @param user the localpart of the uri to be rewritten * @param hash_source the SIP header used for hashing * @param alg the algorithm used for hashing - * @param dstavp the name of the destination AVP where the used host name is stored + * @param descavp the name of the AVP where the description is stored * * @return 0 on success, -1 on failure, 1 on empty rule list */ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest, struct sip_msg * msg, const str * user, const enum hash_source hash_source, - const enum hash_algorithm alg, gparam_t *dstavp) { + const enum hash_algorithm alg, gparam_t *descavp) { struct route_flags * rf; struct route_rule * rr; int prob; @@ -426,7 +426,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest LM_ERR("invalid hash algorithm\n"); return -1; } - return actually_rewrite(rr, dest, msg, user, dstavp); + return actually_rewrite(rr, dest, msg, user, descavp); } @@ -443,14 +443,14 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest * @param user the localpart of the uri to be rewritten * @param hash_source the SIP header used for hashing * @param alg the algorithm used for hashing - * @param dstavp the name of the destination AVP where the used host name is stored + * @param descavp the name of the AVP where the description is stored * * @return 0 on success, -1 on failure, 1 on no more matching child node and no rule list */ static int rewrite_uri_recursor(struct dtrie_node_t * node, const str * pm, flag_t flags, str * dest, struct sip_msg * msg, const str * user, const enum hash_source hash_source, const enum hash_algorithm alg, - gparam_t *dstavp) { + gparam_t *descavp) { str re_pm = *pm; void **ret; @@ -465,7 +465,7 @@ static int rewrite_uri_recursor(struct dtrie_node_t * node, LM_INFO("URI or prefix tree nodes empty, empty rule list\n"); return 1; } - else return rewrite_on_rule(*ret, flags, dest, msg, user, hash_source, alg, dstavp); + else return rewrite_on_rule(*ret, flags, dest, msg, user, hash_source, alg, descavp); } @@ -633,17 +633,17 @@ int cr_load_user_carrier(struct sip_msg * _msg, gparam_t *_user, gparam_t *_doma * @param _prefix_matching the user to be used for prefix matching * @param _rewrite_user the localpart of the URI to be rewritten * @param _hsrc the SIP header used for hashing - * @param _dstavp the name of the destination AVP where the used host name is stored + * @param _descavp the name of the AVP where the description is stored * * @return 1 on success, -1 on failure */ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, - gparam_t *_dstavp) + gparam_t *_descavp) { return cr_do_route(_msg, _carrier, _domain, _prefix_matching, - _rewrite_user, _hsrc, alg_crc32, _dstavp); + _rewrite_user, _hsrc, alg_crc32, _descavp); } @@ -657,17 +657,17 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, * @param _prefix_matching the user to be used for prefix matching * @param _rewrite_user the localpart of the URI to be rewritten * @param _hsrc the SIP header used for hashing - * @param _dstavp the name of the destination AVP where the used host name is stored + * @param _descavp the name of the AVP where the description is stored * * @return 1 on success, -1 on failure */ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, - gparam_t *_dstavp) + gparam_t *_descavp) { return cr_do_route(_msg, _carrier, _domain, _prefix_matching, - _rewrite_user, _hsrc, alg_prime, _dstavp); + _rewrite_user, _hsrc, alg_prime, _descavp); } diff --git a/modules/carrierroute/cr_func.h b/modules/carrierroute/cr_func.h index 79ec230..226adfc 100644 --- a/modules/carrierroute/cr_func.h +++ b/modules/carrierroute/cr_func.h @@ -61,14 +61,14 @@ int cr_load_user_carrier(struct sip_msg * _msg, gparam_t *_user, * @param _prefix_matching the user to be used for prefix matching * @param _rewrite_user the localpart of the URI to be rewritten * @param _hsrc the SIP header used for hashing - * @param _dstavp the name of the destination AVP where the used host name is stored + * @param _descavp the name of the AVP where the description is stored * * @return 1 on success, -1 on failure */ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, - gparam_t *_dstavp); + gparam_t *_descavp); /** @@ -81,14 +81,14 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, * @param _prefix_matching the user to be used for prefix matching * @param _rewrite_user the localpart of the URI to be rewritten * @param _hsrc the SIP header used for hashing - * @param _dstavp the name of the destination AVP where the used host name is stored + * @param _descavp the name of the AVP where the description is stored * * @return 1 on success, -1 on failure */ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, - gparam_t *_dstavp); + gparam_t *_descavp); /**

15 years, 8 months

git:master: * Modules: auth_radius, misc_radius

by Juha Heinanen

Module: sip-router Branch: master Commit: 456c3c137e9abcf687413f9675fe0f1761ce820d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=456c3c1… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 20 08:47:28 2009 +0300 * Modules: auth_radius, misc_radius Moved modules_k/auth_radius and modules_k/misc_radius to modules and removed modules_s/auth_radius, modules_s/avp_radius, and modules_s/uri_radius. --- {modules_k => modules}/auth_radius/Makefile | 0 {modules_k => modules}/auth_radius/README | 0 {modules_k => modules}/auth_radius/authorize.c | 0 {modules_k => modules}/auth_radius/authorize.h | 0 {modules_k => modules}/auth_radius/authrad_mod.c | 0 {modules_k => modules}/auth_radius/authrad_mod.h | 0 .../auth_radius/doc/auth_radius.xml | 0 .../auth_radius/doc/auth_radius_admin.xml | 0 {modules_k => modules}/auth_radius/extra.c | 0 {modules_k => modules}/auth_radius/extra.h | 0 {modules_k => modules}/auth_radius/sterman.c | 0 {modules_k => modules}/auth_radius/sterman.h | 0 {modules_k => modules}/misc_radius/Makefile | 0 {modules_k => modules}/misc_radius/README | 0 .../misc_radius/doc/misc_radius.xml | 0 .../misc_radius/doc/misc_radius_admin.xml | 0 {modules_k => modules}/misc_radius/extra.c | 0 {modules_k => modules}/misc_radius/extra.h | 0 {modules_k => modules}/misc_radius/functions.c | 0 {modules_k => modules}/misc_radius/functions.h | 0 {modules_k => modules}/misc_radius/misc_radius.c | 0 {modules_k => modules}/misc_radius/misc_radius.h | 0 modules_s/auth_radius/Makefile | 17 - modules_s/auth_radius/README | 189 --------- modules_s/auth_radius/authorize.c | 302 -------------- modules_s/auth_radius/authorize.h | 52 --- modules_s/auth_radius/authrad_mod.c | 204 ---------- modules_s/auth_radius/authrad_mod.h | 50 --- modules_s/auth_radius/doc/Makefile | 29 -- modules_s/auth_radius/doc/auth_radius.xml | 80 ---- modules_s/auth_radius/doc/functions.xml | 110 ------ modules_s/auth_radius/doc/params.xml | 76 ---- modules_s/auth_radius/sterman.c | 283 -------------- modules_s/auth_radius/sterman.h | 56 --- modules_s/avp_radius/Makefile | 18 - modules_s/avp_radius/README | 115 ------ modules_s/avp_radius/avp_radius.c | 413 -------------------- modules_s/avp_radius/doc/Makefile | 29 -- modules_s/avp_radius/doc/avp_radius.xml | 53 --- modules_s/avp_radius/doc/functions.xml | 53 --- modules_s/avp_radius/doc/params.xml | 52 --- modules_s/uri_radius/Makefile | 16 - modules_s/uri_radius/README | 142 ------- modules_s/uri_radius/checks.c | 168 -------- modules_s/uri_radius/checks.h | 43 -- modules_s/uri_radius/doc/Makefile | 29 -- modules_s/uri_radius/doc/functions.xml | 38 -- modules_s/uri_radius/doc/params.xml | 53 --- modules_s/uri_radius/doc/uri_radius.xml | 57 --- modules_s/uri_radius/urirad_mod.c | 126 ------ modules_s/uri_radius/urirad_mod.h | 43 -- 51 files changed, 0 insertions(+), 2896 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=456…

15 years, 8 months

$T_reply_code, any equivalent in sr tm?

by Henning Westerholt

Hi, i'd like to use the PV $T_reply_code [1] to test my carrierroute configs. This variable holds in k the numerical result code of the last reply. Is there any equivalent available in the sr tm as well? I read in the module README, there is something like 'status'. I've tried to use this in the module, this obviously not work. Even assigning this to a temporary AVP does not work. Apr 22 11:08:00 ca ser: BUG: <core> [cfg.y:2798]: parse error in config file, line 41, column 19: syntax error Apr 22 11:08:00 ca ser: BUG: <core> [cfg.y:2798]: parse error in config file, line 41, column 19: invalid operator, == , != or =~ expected Is there any other variable available (in sr tm) that holds something like this? Thanks, Henning [1] http://www.kamailio.org/dokuwiki/doku.php/pseudovariables:devel#t_reply_code

15 years, 8 months

git:master: fix overlapping symbols of libconfuse and sr core cfg parser

by Henning Westerholt

Module: sip-router Branch: master Commit: 50ca02e5e68d7ea44609d50e8e3fb38babe77424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50ca02e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Apr 22 10:41:55 2009 +0200 fix overlapping symbols of libconfuse and sr core cfg parser - fix overlapping symbols for the libconfuse library used from carrierroute, added 'sr_' prefix to cfg_init and cfg_parse core functions - fix all modules that called this functions --- cfg/cfg_struct.c | 16 ++++++++-------- cfg/cfg_struct.h | 2 +- cfg_parser.c | 4 ++-- cfg_parser.h | 2 +- main.c | 2 +- modules/tls/tls_config.c | 2 +- modules_s/ldap/ld_cfg.c | 2 +- modules_s/tls/tls_config.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index fe7d8d6..533228b 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -266,15 +266,15 @@ static void cfg_destory_groups(unsigned char *block) } /* initiate the cfg framework */ -int cfg_init(void) +int sr_cfg_init(void) { cfg_global_lock = lock_alloc(); if (!cfg_global_lock) { - LOG(L_ERR, "ERROR: cfg_init(): not enough shm memory\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): not enough shm memory\n"); goto error; } if (lock_init(cfg_global_lock) == 0) { - LOG(L_ERR, "ERROR: cfg_init(): failed to init lock\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): failed to init lock\n"); lock_dealloc(cfg_global_lock); cfg_global_lock = 0; goto error; @@ -282,11 +282,11 @@ int cfg_init(void) cfg_writer_lock = lock_alloc(); if (!cfg_writer_lock) { - LOG(L_ERR, "ERROR: cfg_init(): not enough shm memory\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): not enough shm memory\n"); goto error; } if (lock_init(cfg_writer_lock) == 0) { - LOG(L_ERR, "ERROR: cfg_init(): failed to init lock\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): failed to init lock\n"); lock_dealloc(cfg_writer_lock); cfg_writer_lock = 0; goto error; @@ -294,21 +294,21 @@ int cfg_init(void) cfg_global = (cfg_block_t **)shm_malloc(sizeof(cfg_block_t *)); if (!cfg_global) { - LOG(L_ERR, "ERROR: cfg_init(): not enough shm memory\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): not enough shm memory\n"); goto error; } *cfg_global = NULL; cfg_child_cb_first = (cfg_child_cb_t **)shm_malloc(sizeof(cfg_child_cb_t *)); if (!cfg_child_cb_first) { - LOG(L_ERR, "ERROR: cfg_init(): not enough shm memory\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): not enough shm memory\n"); goto error; } *cfg_child_cb_first = NULL; cfg_child_cb_last = (cfg_child_cb_t **)shm_malloc(sizeof(cfg_child_cb_t *)); if (!cfg_child_cb_last) { - LOG(L_ERR, "ERROR: cfg_init(): not enough shm memory\n"); + LOG(L_ERR, "ERROR: sr_cfg_init(): not enough shm memory\n"); goto error; } *cfg_child_cb_last = NULL; diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 682afc2..975e3aa 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -119,7 +119,7 @@ extern cfg_child_cb_t *cfg_child_cb; #define CFG_INPUT_TYPE(var) CFG_INPUT_MASK((var)->def->type) /* initiate the cfg framework */ -int cfg_init(void); +int sr_cfg_init(void); /* destroy the memory allocated for the cfg framework */ void cfg_destroy(void); diff --git a/cfg_parser.c b/cfg_parser.c index db8781a..690230d 100644 --- a/cfg_parser.c +++ b/cfg_parser.c @@ -42,7 +42,7 @@ * * cfg_set_options(parser, options); * - * if (cfg_parse(parser) < 0) { + * if (sr_cfg_parse(parser) < 0) { * ERR("Error while parsing configuration file\n"); * cfg_parser_close(parser); * return -1; @@ -668,7 +668,7 @@ static int process_option(cfg_parser_t* st, cfg_option_t* opt) } -int cfg_parse(cfg_parser_t* st) +int sr_cfg_parse(cfg_parser_t* st) { int ret; cfg_token_t t; diff --git a/cfg_parser.h b/cfg_parser.h index ade0471..648b438 100644 --- a/cfg_parser.h +++ b/cfg_parser.h @@ -145,7 +145,7 @@ void cfg_section_parser(struct cfg_parser* st, cfg_func_f parser, void* param); void cfg_set_options(struct cfg_parser* st, struct cfg_option* options); -int cfg_parse(struct cfg_parser* st); +int sr_cfg_parse(struct cfg_parser* st); void cfg_parser_close(struct cfg_parser* st); diff --git a/main.c b/main.c index 228e6f3..9befadd 100644 --- a/main.c +++ b/main.c @@ -1934,7 +1934,7 @@ try_again: LOG(L_CRIT, "could not initialize base* framework\n"); goto error; } - if (cfg_init() < 0) { + if (sr_cfg_init() < 0) { LOG(L_CRIT, "could not initialize configuration framework\n"); goto error; } diff --git a/modules/tls/tls_config.c b/modules/tls/tls_config.c index f32cc4d..ad40d85 100644 --- a/modules/tls/tls_config.c +++ b/modules/tls/tls_config.c @@ -344,7 +344,7 @@ tls_cfg_t* tls_load_config(str* filename) cfg_section_parser(parser, parse_domain, NULL); - if (cfg_parse(parser)) goto error; + if (sr_cfg_parse(parser)) goto error; cfg_parser_close(parser); return cfg; diff --git a/modules_s/ldap/ld_cfg.c b/modules_s/ldap/ld_cfg.c index 82a7af5..e442758 100644 --- a/modules_s/ldap/ld_cfg.c +++ b/modules_s/ldap/ld_cfg.c @@ -491,7 +491,7 @@ int ld_load_cfg(str* filename) cfg_section_parser(parser, parse_section, NULL); - if (cfg_parse(parser)) { + if (sr_cfg_parse(parser)) { if (cfg == NULL) { ERR("ldap: A table name (i.e. [table_name]) is missing in the " "configuration file.\n"); diff --git a/modules_s/tls/tls_config.c b/modules_s/tls/tls_config.c index f32cc4d..ad40d85 100644 --- a/modules_s/tls/tls_config.c +++ b/modules_s/tls/tls_config.c @@ -344,7 +344,7 @@ tls_cfg_t* tls_load_config(str* filename) cfg_section_parser(parser, parse_domain, NULL); - if (cfg_parse(parser)) goto error; + if (sr_cfg_parse(parser)) goto error; cfg_parser_close(parser); return cfg;

15 years, 8 months

if condition syntax

by jh＠tutpro.com

according to wiki page, sip-router has improved while and switch syntax, but how about if condition syntax? can i write, for example, if (script_function() == 2) ... of do i still need to do script_function(); if ($retcode == 2) ... by the way, i didn't quite understand the case example (first case expression): switch($var(x)){ case / "^[abc]" : what is the meaning of /? -- juha

15 years, 8 months

git:master: dispatcher: added doc/Makefile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bd7a3be954280b0f580063cc43f10c7dd3330bc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd7a3be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:53:06 2009 +0200 dispatcher: added doc/Makefile - makefile rules to generate documentation - entities.xml => kam_entities.xml - module_faq.xml => kam_module_faq.xml --- modules_k/dispatcher/README | 276 ++++++++++++++----------------- modules_k/dispatcher/doc/Makefile | 40 +++++ modules_k/dispatcher/doc/dispatcher.xml | 2 +- 3 files changed, 168 insertions(+), 150 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd7…

15 years, 8 months

git:master: acc: added doc/Makefile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 54bbef24c78c8ac3359bc174d8d3e0786bd53160 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54bbef2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:55:04 2009 +0200 acc: added doc/Makefile - makefile rules to generate documentation - entities.xml => kam_entities.xml - module_faq.xml => kam_module_faq.xml --- modules_k/acc/doc/Makefile | 40 ++++++++++++++++++++++++++++++++++++++++ modules_k/acc/doc/acc.xml | 2 +- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/modules_k/acc/doc/Makefile b/modules_k/acc/doc/Makefile new file mode 100644 index 0000000..7b1f69a --- /dev/null +++ b/modules_k/acc/doc/Makefile @@ -0,0 +1,40 @@ +# +# The list of documents to build (without extensions) +# +DOCUMENTS = acc + +# +# The root directory containing Makefile.doc +# +ROOT_DIR=../../.. + +# +# Validate docbook documents before generating output +# (may be slow) +# +#VALIDATE=1 + +# +# You can override the CSS used in generated +# HTML documents here +# +#HTML_CSS=/style/docbook.css + +# +# You can override the stylesheet used to generate +# xhtml documents here +# +#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl + +# +# You can override the stylesheet used to generate +# plain text documents here +# +#TXT_XSL=$(XHTML_XSL) + +# +# K documentation style +# +DOCBOOK_MODE=k + +include $(ROOT_DIR)/Makefile.doc diff --git a/modules_k/acc/doc/acc.xml b/modules_k/acc/doc/acc.xml index 96f163b..0c75994 100644 --- a/modules_k/acc/doc/acc.xml +++ b/modules_k/acc/doc/acc.xml @@ -6,7 +6,7 @@ <!ENTITY faq SYSTEM "acc_faq.xml">  -<!ENTITY % docentities SYSTEM "../../../doc/entities.xml"> +<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml"> %docentities; ]>

15 years, 8 months

git:master: docbook: added files used by K modules' docbook files

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 55447c0be3ca1ecefb1e2136904e53f8aac27ab6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55447c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:49:16 2009 +0200 docbook: added files used by K modules' docbook files --- doc/kam-module-docbook.css | 268 ++++++++++++++++++++++++++++++++++++++++++++ doc/kam_entities.xml | 77 +++++++++++++ 2 files changed, 345 insertions(+), 0 deletions(-) diff --git a/doc/kam-module-docbook.css b/doc/kam-module-docbook.css new file mode 100644 index 0000000..dc8d37d --- /dev/null +++ b/doc/kam-module-docbook.css @@ -0,0 +1,268 @@ +BODY { + padding: 20px; + margin: 5px 50px 5px 50px; + background: #ffffff; + color: #000000; + width: 700px; + border: solid 2px #888888; + font-family: Helvetica,Arial; +} + +P { + font-family: Helvetica,Arial; + font-size: 12; + text-align: justify; +} + +P.C2 { + COLOR: #ffffff ; + BACKGROUND-color: #a0a0d0; + BORDER: solid 1px #606090; + PADDING: 1px +} + +A { + color: #041fc5; + text-decoration: none; +} + +A:hover { + color: #990000; + text-decoration: underline; +} + +DIV.ABSTRACT { + border: solid 2px; + padding-left: 10pt; + padding-right: 10pt; +} +PRE.SCREEN { + font-family:monospace; + white-space: pre; + background-color: #fefeee; + border:solid; + color: #000000; + border-color: #99CCCC; + border-left: solid #99CCCC 1px; + border-right: solid #99CCCC 1px; + border-top: solid #99CCCC 1px; + border-bottom: solid #99CCCC 1px; + padding-left: 15pt; +} + +PRE.PROGRAMLISTING { + font-family:monospace; + white-space: pre; + background-color: #fefeee; + border:solid; + color: #000000; + border-color: #99CCCC; + border-left: solid #99CCCC 1px; + border-right: solid #99CCCC 1px; + border-top: solid #99CCCC 1px; + border-bottom: solid #99CCCC 1px; + padding-left: 15pt; +} + +H1 { + color: #000000; + border: solid 2px #a0a0a0; + background-color: #DCDCDC; + font-variant: small-caps; + font-size: 16; + padding-left: 5px; +} + +.TITLE a { + color: #000000; + text-decoration: none; +} + +.TITLE a:active { + color: #000000; + text-decoration: none; +} + +.TITLE a:visited { + color: #000000; + text-decoration: none; +} + +H2 { + COLOR: #000000 ; + font-style: italic; + border: solid 1px #b0b0b0; + background-color: #ECECEC; + padding-left: 5px; + font-family: Helvetica,Arial; + font-weight: bold; + font-size: 14; +} + +H2 a { + color: #000000; + text-decoration: none; +} + +H2 a:active { + color: #000000; + text-decoration: none; +} + +H2 a:visited { + color: #000000; + text-decoration: none; +} + +H2 a:hover { + color: #000000; + text-decoration: none; +} + +H3.SECTION { + COLOR: #000000 ; + font-style: italic; + border: solid 1px #c0c0c0; + background-color: #F2F2F2; + padding-left: 5px; + font-family: Helvetica,Arial; + font-weight: bold; + font-size: 13; +} + +H3 a { + color: #000000; + text-decoration: none; +} + +H3 a:active { + color: #000000; + text-decoration: none; +} + +H3 a:visited { + color: #000000; + text-decoration: none; +} + +H3 a:hover { + color: #000000; + text-decoration: none; +} + +H3.AUTHOR { + font-family: Helvetica,Arial; + font-weight: bold; + font-size: 13; +} + +H3.EDITOR { + font-family: Helvetica,Arial; + font-weight: bold; + font-style: italic; + font-size: 11; +} + +H4 { + font-family: Helvetica,Arial; + font-weight: bold; + font-size: 12; +} + +TABLE.IMPORTANT { + font-style:italic; + border: solid 2px #ff0000; + width: 70%; + margin-left: 15%; +} + +TABLE.CAUTION { + font-style:italic; + border: ridge 2px #ffff00; + width: 70%; + margin-left: 15%; +} + +TABLE.NOTE { + font-style:italic; + border: solid 1px #000000; + width: 70%; + margin-left: 15%; +} + +TABLE.TIP { + font-style:italic; + border: solid 1px #000000; + width: 70%; + margin-left: 15%; +} + +TABLE.WARNING { + font-style:italic; + font-weight: bold; + border: ridge 4px #ff0000; + width: 70%; + margin-left: 15%; +} + +DIV.VARIABLELIST { + font-family: sans-serif; + font-style: normal; + font-weight: normal; + padding-left: 20px; +} + +.VARLISTENTRY { + font-weight: bold; + margin-top: 10px; + COLOR: #ffffff ; + BACKGROUND-color: #a0a0d0; + BORDER: solid 1px #606090; + PADDING: 1px +} + +DIV.NAVFOOTER { + color: #000000; + background-color: #EFEFF8; + padding: 5px; + margin-top: 10px; + width: 100%; + border: thin solid #a0a0d0; +} + +DIV.NUKEFOOTER { + color: #000000; + background-color: #B0E0E6; + padding: 5px; + margin-top: 10px; + width: 100%; + border: thin solid #a0a0d0; +} + +DIV.NAVHEADER { + color: #000000; + background-color: #EFEFF8; + padding: 5px; + margin-bottom: 10px; + width: 100%; + border: thin solid #a0a0d0; +} + +DIV.SECT1,DIV.SECT2,DIV.SECT3 { + margin-left: 20px; +} + +DIV.EXAMPLE,DIV.TOC { + border: thin dotted #70AAE5; + padding-left: 10px; + padding-right: 10px; + color: #000000; + background-color: #EFF8F8; +} + +DIV.TOC { + margin-left: 20px; + margin-right: 20px; +} + + diff --git a/doc/kam_entities.xml b/doc/kam_entities.xml new file mode 100644 index 0000000..733c4cd --- /dev/null +++ b/doc/kam_entities.xml @@ -0,0 +1,77 @@ + + + + +<!ENTITY fhg "FhG FOKUS"> + +<!ENTITY kamailio "Kamailio"> +<!ENTITY kamailioname "Kamailio SIP Server Platform"> +<!ENTITY kamailioconfig "kamailio.cfg"> + +<!ENTITY kamwiki "http://www.kamailio.org/dokuwiki/"> +<!ENTITY kamwikilink "<ulink url='&kamwiki;'>&kamwiki;</ulink>"> + +<!ENTITY kamailiohome "http://www.kamailio.org/"> +<!ENTITY kamailiobugs "http://sourceforge.net/tracker/?group_id=139143"> +<!ENTITY kamailiohelp "http://lists.kamailio.org/cgi-bin/mailman/listinfo/team"> +<!ENTITY kamailiousers "http://lists.kamailio.org/cgi-bin/mailman/listinfo/users"> +<!ENTITY kamailiodev "http://lists.kamailio.org/cgi-bin/mailman/listinfo/devel"> +<!ENTITY kamailiodbdocs "http://www.kamailio.org/docs/db-tables/kamailio-db-devel.html"> + +<!ENTITY kamailiohomelink "<ulink url='&kamailiohome;'>&kamailiohome;</ulink>"> +<!ENTITY kamailiobugslink "<ulink url='&kamailiobugs;'>&kamailiobugs;</ulink>"> +<!ENTITY kamailiohelplink "<ulink url='&kamailiohelp;'>&kamailiohelp;</ulink>"> +<!ENTITY kamailiouserslink "<ulink url='&kamailiousers;'>&kamailiousers;</ulink>"> +<!ENTITY kamailiodevlink "<ulink url='&kamailiodev;'>&kamailiodev;</ulink>"> +<!ENTITY kamailiodbdocslink "<ulink url='&kamailiodbdocs;'>&kamailiodbdocs;</ulink>"> + +<!ENTITY kamailiohelpmail "<email>team(a)lists.kamailio.org</email>"> +<!ENTITY kamailiousersmail "<email>users(a)lists.kamailio.org</email>"> +<!ENTITY kamailiodevmail "<email>devel(a)lists.kamailio.org</email>"> + +<!ENTITY adminguide "Admin Guide"> +<!ENTITY develguide "Developer Guide"> +<!ENTITY faqguide "Frequently Asked Questions"> + +<!ENTITY serhomelink "<ulink url='&serhome;'>&serhome;</ulink>"> +<!ENTITY serbugslink "<ulink url='&serbugs;'>&serbugs;</ulink>"> +<!ENTITY serhelplink "<ulink url='&serhelp;'>&serhelp;</ulink>"> +<!ENTITY seruserslink "<ulink url='&serusers;'>&serusers;</ulink>"> +<!ENTITY serdevlink "<ulink url='&serdev;'>&serdev;</ulink>"> + +<!ENTITY defaultdb "mysql://openser:openserrw@localhost/openser"> +<!ENTITY defaultrodb "mysql://openserro:openserro@localhost/openser"> +<!ENTITY exampledb "dbdriver://username:password@dbhost/dbname"> + + + +<!ENTITY sip "<acronym>SIP</acronym>"> +<!ENTITY sdp "<acronym>SDP</acronym>"> +<!ENTITY rtp "<acronym>RTP</acronym>"> +<!ENTITY pstn "<acronym>PSTN</acronym>"> +<!ENTITY http "<acronym>HTTP</acronym>"> +<!ENTITY uri "<acronym>URI</acronym>"> +<!ENTITY url "<acronym>URL</acronym>"> +<!ENTITY uac "<acronym>UAC</acronym>"> +<!ENTITY uas "<acronym>UAS</acronym>"> +<!ENTITY ua "<acronym>UA</acronym>"> +<!ENTITY nat "<acronym>NAT</acronym>"> +<!ENTITY ip "<acronym>IP</acronym>"> +<!ENTITY udp "<acronym>UDP</acronym>"> +<!ENTITY ietf "<ulink url='http://www.ietf.org'>IETF</ulink>"> +<!ENTITY im "<acronym>IM</acronym>"> +<!ENTITY smtp "<acronym>SMTP</acronym>"> +<!ENTITY tls "<acronym>TLS</acronym>"> +<!ENTITY xmpp "<acronym>XMPP</acronym>"> +<!ENTITY gnu "<ulink url='http://www.gnu.org'>GNU</ulink>"> +<!ENTITY gpl "<ulink url='http://www.gnu.org/licenses/licenses.html#GPL'>GPL</ulink>"> +<!ENTITY openssl "<ulink url='http://www.openssl.org'>OpenSSL</ulink>"> + + + +<!ENTITY rfc3261 "<ulink url='http://www.ietf.org/rfc/rfc3261.txt'>RFC3261</ulink>"> +<!ENTITY rfc822 "<ulink url='http://www.ietf.org/rfc/rfc822.txt'>RFC822</ulink>"> +<!ENTITY rfc2543 "<ulink url='http://www.ietf.org/rfc/rfc2543.txt'>RFC2543</ulink>"> + +<!ENTITY vsname "Voice Sistem SRL"> +<!ENTITY voicesystem "<ulink url='http://www.voice-system.ro'>voice-system.ro</ulink>"> diff --git a/doc/kam_module_faq.xml b/doc/kam_module_faq.xml new file mode 100644 index 0000000..e69de29

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev