sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

Does shm_free() make the pointer NULL?
by Iñaki Baz Castillo 29 Feb '12

29 Feb '12

Hi, I'm realizing that a doble freeing occurs in regex module when it fails to start due to module params errors. But I'm sure it didn't occur in Kamailio 1.5. My question is the following: static int *number; number = shm_malloc(sizeof(int)); shm_free(number); Should now number be NULL? I confirm that it's NOT, so I get a double freeing since the function free_shared_memory() is executed twice and I check "if (number)" before doing "shm_free(number)". So is it a change in 3.X? should I write: shm_free(number); number = NULL; ? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

4 7

git:master: [regex_mod] Fix a double freeing in free_shared_memory() function.
by Inaki Baz Castillo 28 Feb '12

28 Feb '12

Module: sip-router Branch: master Commit: 2e96a72c3b16ccf7a1854eb83be3c779474bee3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e96a72… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Tue Feb 28 20:26:18 2012 +0100 [regex_mod] Fix a double freeing in free_shared_memory() function. --- modules_k/regex/regex_mod.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index bb0241b..d5b2ab0 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -177,8 +177,6 @@ struct module_exports exports = { */ static int mod_init(void) { - LM_INFO("initializing module...\n"); - if(register_mi_mod(exports.name, mi_cmds)!=0) { LM_ERR("failed to register MI commands\n"); @@ -233,9 +231,9 @@ static int mod_init(void) } /* Load the pcres */ - LM_NOTICE("loading pcres...\n"); + LM_DBG("loading pcres...\n"); if (load_pcres(START)) { - LM_CRIT("failed to load pcres\n"); + LM_ERR("failed to load pcres\n"); goto err; } } @@ -384,9 +382,9 @@ static int load_pcres(int action) } /* Log the group patterns */ - LM_NOTICE("num groups = %d\n", num_pcres_tmp); + LM_INFO("num groups = %d\n", num_pcres_tmp); for (i=0; i < num_pcres_tmp; i++) { - LM_NOTICE("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], i, (int)strlen(patterns[i])); + LM_INFO("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], i, (int)strlen(patterns[i])); } /* Temporal pointer of pcres */ @@ -498,19 +496,23 @@ static void free_shared_memory(void) } } shm_free(pcres); + pcres = NULL; } if (num_pcres) { shm_free(num_pcres); + num_pcres = NULL; } if (pcres_addr) { shm_free(pcres_addr); + pcres_addr = NULL; } if (reload_lock) { lock_destroy(reload_lock); lock_dealloc(reload_lock); + reload_lock = NULL; } } @@ -672,11 +674,11 @@ static struct mi_root* mi_pcres_reload(struct mi_root* cmd, void* param) return init_mi_tree(403, MI_SSTR("Group matching not enabled")); } - LM_NOTICE("reloading pcres...\n"); + LM_INFO("reloading pcres...\n"); if (load_pcres(RELOAD)) { LM_ERR("failed to reload pcres\n"); return init_mi_tree(500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); } - LM_NOTICE("reload success\n"); + LM_INFO("reload success\n"); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); }

1 0

git:3.2: xmlops: fixed internal module name
by Daniel-Constantin Mierla 27 Feb '12

27 Feb '12

Module: sip-router Branch: 3.2 Commit: 3259ef734158d9cd63ce3fa94565f5cd4260e3f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3259ef7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 27 21:37:24 2012 +0100 xmlops: fixed internal module name - c&p error propagated when the module was split from presence_xml - reported by Olle E. Johansson (cherry picked from commit 1d51ef127bc546cbe7e950dedc135a529e9ed2aa) --- modules/xmlops/xmlops_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xmlops/xmlops_mod.c b/modules/xmlops/xmlops_mod.c index 26e8e41..132c9e1 100644 --- a/modules/xmlops/xmlops_mod.c +++ b/modules/xmlops/xmlops_mod.c @@ -58,7 +58,7 @@ static param_export_t params[]={ /** module exports */ struct module_exports exports= { - "presence_xml", /* module name */ + "xmlops", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ params, /* exported parameters */

1 0

git:master: app_lua: exported cfgutils api to lua
by Daniel-Constantin Mierla 27 Feb '12

27 Feb '12

Module: sip-router Branch: master Commit: 3fd1b776a6e15d49f595d3b2a8eaffc97a963f12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3fd1b77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 26 12:25:12 2012 +0100 app_lua: exported cfgutils api to lua --- modules/app_lua/app_lua_exp.c | 84 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 70dc11d..74d4f66 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -52,6 +52,7 @@ #include "../../modules_k/msilo/api.h" #include "../../modules_k/uac/api.h" #include "../../modules/sanity/api.h" +#include "../../modules_k/cfgutils/api.h" #include "app_lua_api.h" @@ -76,6 +77,7 @@ #define SR_LUA_EXP_MOD_MSILO (1<<18) #define SR_LUA_EXP_MOD_UAC (1<<19) #define SR_LUA_EXP_MOD_SANITY (1<<20) +#define SR_LUA_EXP_MOD_CFGUTILS (1<<21) /** * @@ -188,6 +190,11 @@ static uac_api_t _lua_uacb; */ static sanity_api_t _lua_sanityb; +/** + * cfgutils + */ +static cfgutils_api_t _lua_cfgutilsb; + /** * @@ -2256,6 +2263,68 @@ static const luaL_reg _sr_sanity_Map [] = { /** * */ +static int lua_sr_cfgutils_lock(lua_State *L) +{ + int ret; + str lkey; + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_CFGUTILS)) + { + LM_WARN("weird: cfgutils function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(lua_gettop(L)!=1) + { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_error(L); + } + lkey.s = (char*)lua_tostring(L, -1); + lkey.len = strlen(lkey.s); + ret = _lua_cfgutilsb.mlock(&lkey); + + return app_lua_return_int(L, ret); +} + + +/** + * + */ +static int lua_sr_cfgutils_unlock(lua_State *L) +{ + int ret; + str lkey; + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_CFGUTILS)) + { + LM_WARN("weird: cfgutils function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(lua_gettop(L)!=1) + { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_error(L); + } + lkey.s = (char*)lua_tostring(L, -1); + lkey.len = strlen(lkey.s); + ret = _lua_cfgutilsb.munlock(&lkey); + + return app_lua_return_int(L, ret); +} + + +/** + * + */ +static const luaL_reg _sr_cfgutils_Map [] = { + {"lock", lua_sr_cfgutils_lock}, + {"unlock", lua_sr_cfgutils_unlock}, + {NULL, NULL} +}; + + +/** + * + */ int lua_sr_exp_init_mod(void) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) @@ -2474,6 +2543,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded sanity api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_CFGUTILS) + { + /* bind the CFGUTILS API */ + if (cfgutils_load_api(&_lua_cfgutilsb) < 0) + { + LM_ERR("cannot bind to CFGUTILS API\n"); + return -1; + } + LM_DBG("loaded cfgutils api\n"); + } return 0; } @@ -2550,6 +2629,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==6 && strcmp(mname, "sanity")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_SANITY; return 0; + } else if(len==8 && strcmp(mname, "cfgutils")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_CFGUTILS; + return 0; } return -1; @@ -2602,5 +2684,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.uac", _sr_uac_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SANITY) luaL_openlib(L, "sr.sanity", _sr_sanity_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_CFGUTILS) + luaL_openlib(L, "sr.cfgutils", _sr_cfgutils_Map, 0); }

1 0

git:master: cfgutils: lock/unlock functions exported to inter-module API
by Daniel-Constantin Mierla 27 Feb '12

27 Feb '12

Module: sip-router Branch: master Commit: f7ef19861e2e46eccdace35d8c2656978afd42b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7ef198… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 26 12:02:07 2012 +0100 cfgutils: lock/unlock functions exported to inter-module API --- modules_k/cfgutils/api.h | 62 +++++++++++++++++++++++++++++++++++++++++ modules_k/cfgutils/cfgutils.c | 58 +++++++++++++++++++++++++++++++------ 2 files changed, 110 insertions(+), 10 deletions(-) diff --git a/modules_k/cfgutils/api.h b/modules_k/cfgutils/api.h new file mode 100644 index 0000000..25fae2a --- /dev/null +++ b/modules_k/cfgutils/api.h @@ -0,0 +1,62 @@ +/* + * $Id$ + * + * Copyright (C) 2012 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 + */ + + +#ifndef _CFGUTILS_API_H_ +#define _CFGUTILS_API_H_ + +#include "../../str.h" + +typedef int (*cfgutils_lock_f)(str *lkey); +typedef int (*cfgutils_unlock_f)(str *lkey); + +/** + * @brief CFGUTILS API structure + */ +typedef struct cfgutils_api { + cfgutils_lock_f lock; + cfgutils_unlock_f unlock; +} cfgutils_api_t; + +typedef int (*bind_cfgutils_f)(cfgutils_api_t* api); + +/** + * @brief Load the CFGUTILS API + */ +static inline int cfgutils_load_api(cfgutils_api_t *api) +{ + bind_cfgutils_f bindcfgutils; + + bindcfgutils = (bind_cfgutils_f)find_export("bind_cfgutils", 0, 0); + if(bindcfgutils == 0) { + LM_ERR("cannot find bind_cfgutils\n"); + return -1; + } + if (bindcfgutils(api)<0) + { + LM_ERR("cannot bind cfgutils api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules_k/cfgutils/cfgutils.c b/modules_k/cfgutils/cfgutils.c index c44820d..f74ef6e 100644 --- a/modules_k/cfgutils/cfgutils.c +++ b/modules_k/cfgutils/cfgutils.c @@ -76,6 +76,8 @@ #include <sys/stat.h> #include <unistd.h> +#include "api.h" + MODULE_VERSION static int set_prob(struct sip_msg*, char *, char *); @@ -678,16 +680,10 @@ static int dbg_shm_summary(struct sip_msg* msg, char* foo, char* bar) return 1; } -int cfg_lock_helper(struct sip_msg *msg, gparam_p key, int mode) +int cfg_lock_helper(str *lkey, int mode) { - str s; unsigned int pos; - if(fixup_get_svalue(msg, key, &s)!=0) - { - LM_ERR("cannot get first parameter\n"); - return -1; - } - pos = core_case_hash(&s, 0, _cfg_lock_size); + pos = core_case_hash(lkey, 0, _cfg_lock_size); LM_DBG("cfg_lock mode %d on %u\n", mode, pos); if(mode==0) lock_set_get(_cfg_lock_set, pos); @@ -696,18 +692,29 @@ int cfg_lock_helper(struct sip_msg *msg, gparam_p key, int mode) return 1; } +int cfg_lock_wrapper(struct sip_msg *msg, gparam_p key, int mode) +{ + str s; + if(fixup_get_svalue(msg, key, &s)!=0) + { + LM_ERR("cannot get first parameter\n"); + return -1; + } + return cfg_lock_helper(&s, mode); +} + static int cfg_lock(struct sip_msg *msg, char *key, char *s2) { if(_cfg_lock_set==NULL || key==NULL) return -1; - return cfg_lock_helper(msg, (gparam_p)key, 0); + return cfg_lock_wrapper(msg, (gparam_p)key, 0); } static int cfg_unlock(struct sip_msg *msg, char *key, char *s2) { if(_cfg_lock_set==NULL || key==NULL) return -1; - return cfg_lock_helper(msg, (gparam_p)key, 1); + return cfg_lock_wrapper(msg, (gparam_p)key, 1); } @@ -775,3 +782,34 @@ static void mod_destroy(void) lock_set_dealloc(_cfg_lock_set); } } + +/** + * + */ +int cfgutils_lock(str *lkey) +{ + return cfg_lock_helper(lkey, 0); +} + +/** + * + */ +int cfgutils_unlock(str *lkey) +{ + return cfg_lock_helper(lkey, 1); +} + +/** + * @brief bind functions to CFGUTILS API structure + */ +int bind_cfgutils(cfgutils_api_t *api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->lock = cfgutils_lock; + api->unlock = cfgutils_unlock; + + return 0; +}

1 0

git:master: xmlops: fixed internal module name
by Daniel-Constantin Mierla 27 Feb '12

27 Feb '12

Module: sip-router Branch: master Commit: 1d51ef127bc546cbe7e950dedc135a529e9ed2aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d51ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 27 21:37:24 2012 +0100 xmlops: fixed internal module name - c&p error propagated when the module was split from presence_xml - reported by Olle E. Johansson --- modules/xmlops/xmlops_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xmlops/xmlops_mod.c b/modules/xmlops/xmlops_mod.c index 26e8e41..132c9e1 100644 --- a/modules/xmlops/xmlops_mod.c +++ b/modules/xmlops/xmlops_mod.c @@ -58,7 +58,7 @@ static param_export_t params[]={ /** module exports */ struct module_exports exports= { - "presence_xml", /* module name */ + "xmlops", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ params, /* exported parameters */

1 0

git:master: cfgutls: API members renamed to avoid conflicts with core defines
by Daniel-Constantin Mierla 27 Feb '12

27 Feb '12

Module: sip-router Branch: master Commit: c43cc058f86e0b4396178d980baba78848d9a715 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c43cc05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 26 12:24:26 2012 +0100 cfgutls: API members renamed to avoid conflicts with core defines --- modules_k/cfgutils/api.h | 4 ++-- modules_k/cfgutils/cfgutils.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules_k/cfgutils/api.h b/modules_k/cfgutils/api.h index 25fae2a..673d196 100644 --- a/modules_k/cfgutils/api.h +++ b/modules_k/cfgutils/api.h @@ -33,8 +33,8 @@ typedef int (*cfgutils_unlock_f)(str *lkey); * @brief CFGUTILS API structure */ typedef struct cfgutils_api { - cfgutils_lock_f lock; - cfgutils_unlock_f unlock; + cfgutils_lock_f mlock; + cfgutils_unlock_f munlock; } cfgutils_api_t; typedef int (*bind_cfgutils_f)(cfgutils_api_t* api); diff --git a/modules_k/cfgutils/cfgutils.c b/modules_k/cfgutils/cfgutils.c index f74ef6e..03cd25d 100644 --- a/modules_k/cfgutils/cfgutils.c +++ b/modules_k/cfgutils/cfgutils.c @@ -118,6 +118,7 @@ static int pv_get_random_val(struct sip_msg *msg, pv_param_t *param, static int fixup_prob( void** param, int param_no); static int fixup_gflags( void** param, int param_no); +int bind_cfgutils(cfgutils_api_t *api); static int mod_init(void); static void mod_destroy(void); @@ -171,6 +172,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"unlock", (cmd_function)cfg_unlock, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"bind_cfgutils", (cmd_function)bind_cfgutils, 0, + 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -808,8 +811,8 @@ int bind_cfgutils(cfgutils_api_t *api) ERR("Invalid parameter value\n"); return -1; } - api->lock = cfgutils_lock; - api->unlock = cfgutils_unlock; + api->mlock = cfgutils_lock; + api->munlock = cfgutils_unlock; return 0; }

1 0

git:master: xlog: add xlog function with syslog facility as third parameter
by Klaus Darilion 26 Feb '12

26 Feb '12

Module: sip-router Branch: master Commit: 14f5884af9e9197df1f126dddb5bb68482b15d20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14f5884… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Sun Feb 26 19:17:53 2012 +0100 xlog: add xlog function with syslog facility as third parameter - New xlog function with 3 parameters: xlog([[facility,] level,] format) This allow to specify the syslog facility for every xlog log message. --- modules_k/xlog/doc/xlog_admin.xml | 15 ++++- modules_k/xlog/xlog.c | 121 +++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index ed8704c..2cbd363 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -194,7 +194,7 @@ modparam("xlog", "log_facility", "LOG_DAEMON") <title>Functions</title> <section> <title> - <function moreinfo="none">xlog([level,] format)</function> + <function moreinfo="none">xlog([[facility,] level,] format)</function> </title> <para> Print a formated message using LOG function. @@ -202,6 +202,15 @@ modparam("xlog", "log_facility", "LOG_DAEMON") <para>Meaning of the parameters are as follows:</para> <itemizedlist> <listitem> + <para><emphasis>facility</emphasis> - The log facility that will be used for this single log message. + </para> + <para> + <para> + If this parameter is missing, the implicit facility is either the facility set with + the 'log_facility' module parameter or the core's log facility. + </para> + </listitem> + <listitem> <para><emphasis>level</emphasis> - The level that will be used in LOG function. It can be: </para> <itemizedlist> @@ -281,6 +290,8 @@ xlog("time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); $var(loglevel) = 2; xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); ... +xlog("LOG_LOCAL3", "L_ERR", "this message will be sent to syslog facility LOG_LOCAL3\n"); +... </programlisting> </example> </section> @@ -314,7 +325,7 @@ xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); </section> <section> <title> - <function moreinfo="none">xlogl([level],format)</function> + <function moreinfo="none">xlogl([[facility,] level,] format)</function> </title> <para> Similar to xlog(), in addition is printing cfg line number diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 93cecd7..1d6091b 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -58,15 +58,19 @@ static int mod_init(void); static int xlog_1(struct sip_msg*, char*, char*); static int xlog_2(struct sip_msg*, char*, char*); +static int xlog_3(struct sip_msg*, char*, char*, char*); static int xdbg(struct sip_msg*, char*, char*); static int xlogl_1(struct sip_msg*, char*, char*); static int xlogl_2(struct sip_msg*, char*, char*); +static int xlogl_3(struct sip_msg*, char*, char*, char*); static int xdbgl(struct sip_msg*, char*, char*); static int xlog_fixup(void** param, int param_no); +static int xlog3_fixup(void** param, int param_no); static int xdbg_fixup(void** param, int param_no); static int xlogl_fixup(void** param, int param_no); +static int xlogl3_fixup(void** param, int param_no); static int xdbgl_fixup(void** param, int param_no); static void destroy(void); @@ -100,9 +104,11 @@ static pv_export_t mod_items[] = { static cmd_export_t cmds[]={ {"xlog", (cmd_function)xlog_1, 1, xdbg_fixup, 0, ANY_ROUTE}, {"xlog", (cmd_function)xlog_2, 2, xlog_fixup, 0, ANY_ROUTE}, + {"xlog", (cmd_function)xlog_3, 3, xlog3_fixup, 0, ANY_ROUTE}, {"xdbg", (cmd_function)xdbg, 1, xdbg_fixup, 0, ANY_ROUTE}, {"xlogl", (cmd_function)xlogl_1, 1, xdbgl_fixup, 0, ANY_ROUTE}, {"xlogl", (cmd_function)xlogl_2, 2, xlogl_fixup, 0, ANY_ROUTE}, + {"xlogl", (cmd_function)xlogl_3, 3, xlogl3_fixup,0, ANY_ROUTE}, {"xdbgl", (cmd_function)xdbgl, 1, xdbgl_fixup, 0, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -254,6 +260,52 @@ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) return xlog_2_helper(msg, lev, frm, 1, NOFACILITY); } +static int xlog_3_helper(struct sip_msg* msg, char* fac, char* lev, char* frm, int mode) +{ + long level; + int facility; + xl_level_p xlp; + pv_value_t value; + + xlp = (xl_level_p)lev; + if(xlp->type==1) + { + if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 + || value.flags&PV_VAL_NULL || !(value.flags&PV_VAL_INT)) + { + LM_ERR("invalid log level value [%d]\n", value.flags); + return -1; + } + level = (long)value.ri; + } else { + level = xlp->v.level; + } + facility = *(int*)fac; + + if(!is_printable((int)level)) + return 1; + + return xlog_helper(msg, (xl_msg_t*)frm, (int)level, mode, facility); +} + +/** + * print log message to level given in parameter + * add dedicated logfacility + */ +static int xlog_3(struct sip_msg* msg, char* fac, char* lev, char* frm) +{ + return xlog_3_helper(msg, fac, lev, frm, 0); +} + +/** + * print log message to level given in parameter along with cfg line + * add dedicated logfacility + */ +static int xlogl_3(struct sip_msg* msg, char* fac, char* lev, char* frm) +{ + return xlog_3_helper(msg, fac, lev, frm, 1); +} + static int xdbg_helper(struct sip_msg* msg, char* frm, char* str2, int mode, int facility) { if(!is_printable(L_DBG)) @@ -369,6 +421,37 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) return 0; } +/* + * fixup log facility + */ +static int xlog3_fixup_helper(void** param, int param_no) +{ + int *facility; + str s; + + s.s = (char*)(*param); + if(s.s==NULL) + { + LM_ERR("wrong log facility\n"); + return E_UNSPEC; + } + facility = (int*)pkg_malloc(sizeof(int)); + if(facility == NULL) + { + LM_ERR("no more memory\n"); + return E_UNSPEC; + } + *facility = str2facility(s.s); + if (*facility == -1) { + LM_ERR("invalid syslog facility %s\n", s.s); + return E_UNSPEC; + } + + pkg_free(*param); + *param = (void*)facility; + return 0; +} + static int xlog_fixup(void** param, int param_no) { if(param==NULL || *param==NULL) @@ -379,6 +462,25 @@ static int xlog_fixup(void** param, int param_no) return xlog_fixup_helper(param, param_no, 0); } +static int xlog3_fixup(void** param, int param_no) +{ + if(param==NULL || *param==NULL) + { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + /* fixup loglevel */ + if (param_no == 2) { + return xlog_fixup_helper(param, 1, 0); + } + /* fixup log message */ + if (param_no == 3) { + return xdbg_fixup_helper(param, 3, 0); + } + /* fixup facility */ + return xlog3_fixup_helper(param, param_no); +} + static int xdbg_fixup(void** param, int param_no) { if(param_no!=1 || param==NULL || *param==NULL) @@ -389,6 +491,25 @@ static int xdbg_fixup(void** param, int param_no) return xdbg_fixup_helper(param, param_no, 0); } +static int xlogl3_fixup(void** param, int param_no) +{ + if(param==NULL || *param==NULL) + { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + /* fixup loglevel */ + if (param_no == 2) { + return xlog_fixup_helper(param, 1, 1); + } + /* fixup log message */ + if (param_no == 3) { + return xdbg_fixup_helper(param, 3, 1); + } + /* fixup facility */ + return xlog3_fixup_helper(param, param_no); +} + static int xlogl_fixup(void** param, int param_no) { if(param==NULL || *param==NULL)

1 0

git:master: xlog: remove code duplication between xlog and xlogl functions
by Klaus Darilion 26 Feb '12

26 Feb '12

Module: sip-router Branch: master Commit: 224c6c69817315c56590648ea626d91b6ac225e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=224c6c6… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Sun Feb 26 19:13:22 2012 +0100 xlog: remove code duplication between xlog and xlogl functions - xlog and xlogl functions are more or less duplicates. Use a helper function to remove code duplicates for better readability - preparations for setting the syslog facility per xlog request --- modules_k/xlog/xlog.c | 77 ++++++++++++++++++++++-------------------------- 1 files changed, 35 insertions(+), 42 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 28e6926..93cecd7 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -39,6 +39,7 @@ #include "../../pvar.h" +#define NOFACILITY -1 MODULE_VERSION @@ -159,7 +160,7 @@ static int mod_init(void) } static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, - int level, int line) + int level, int line, int facility) { str txt; @@ -168,17 +169,22 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, if(xl_print_log(msg, xm->m, _xlog_buf, &txt.len)<0) return -1; txt.s = _xlog_buf; + /* if facility is not explicitely defined use the xlog default facility */ + if (facility==NOFACILITY) { + facility = xlog_facility; + } + if(line>0) if(long_format==1) - LOG_(xlog_facility, level, _xlog_prefix, + LOG_(facility, level, _xlog_prefix, "%s:%d:%.*s", (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_(xlog_facility, level, _xlog_prefix, + LOG_(facility, level, _xlog_prefix, "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_(xlog_facility, level, _xlog_prefix, + LOG_(facility, level, _xlog_prefix, "%.*s", txt.len, txt.s); return 1; } @@ -186,12 +192,16 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, /** * print log message to L_ERR level */ -static int xlog_1(struct sip_msg* msg, char* frm, char* str2) +static int xlog_1_helper(struct sip_msg* msg, char* frm, char* str2, int mode, int facility) { if(!is_printable(L_ERR)) return 1; - return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, 0); + return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, mode, facility); +} +static int xlog_1(struct sip_msg* msg, char* frm, char* str2) +{ + return xlog_1_helper(msg, frm, str2, 0, NOFACILITY); } /** @@ -199,16 +209,10 @@ static int xlog_1(struct sip_msg* msg, char* frm, char* str2) */ static int xlogl_1(struct sip_msg* msg, char* frm, char* str2) { - if(!is_printable(L_ERR)) - return 1; - - return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, 1); + return xlog_1_helper(msg, frm, str2, 1, NOFACILITY); } -/** - * print log message to level given in parameter - */ -static int xlog_2(struct sip_msg* msg, char* lev, char* frm) +static int xlog_2_helper(struct sip_msg* msg, char* lev, char* frm, int mode, int facility) { long level; xl_level_p xlp; @@ -231,7 +235,15 @@ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) if(!is_printable((int)level)) return 1; - return xlog_helper(msg, (xl_msg_t*)frm, (int)level, 0); + return xlog_helper(msg, (xl_msg_t*)frm, (int)level, mode, facility); +} + +/** + * print log message to level given in parameter + */ +static int xlog_2(struct sip_msg* msg, char* lev, char* frm) +{ + return xlog_2_helper(msg, lev, frm, 0, NOFACILITY); } /** @@ -239,28 +251,14 @@ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) */ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) { - long level; - xl_level_p xlp; - pv_value_t value; - - xlp = (xl_level_p)lev; - if(xlp->type==1) - { - if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 - || value.flags&PV_VAL_NULL || !(value.flags&PV_VAL_INT)) - { - LM_ERR("invalid log level value [%d]\n", value.flags); - return -1; - } - level = (long)value.ri; - } else { - level = xlp->v.level; - } + return xlog_2_helper(msg, lev, frm, 1, NOFACILITY); +} - if(!is_printable((int)level)) +static int xdbg_helper(struct sip_msg* msg, char* frm, char* str2, int mode, int facility) +{ + if(!is_printable(L_DBG)) return 1; - - return xlog_helper(msg, (xl_msg_t*)frm, (int)level, 1); + return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, mode, facility); } /** @@ -268,9 +266,7 @@ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) */ static int xdbg(struct sip_msg* msg, char* frm, char* str2) { - if(!is_printable(L_DBG)) - return 1; - return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, 0); + return xdbg_helper(msg, frm, str2, 0, NOFACILITY); } /** @@ -278,12 +274,9 @@ static int xdbg(struct sip_msg* msg, char* frm, char* str2) */ static int xdbgl(struct sip_msg* msg, char* frm, char* str2) { - if(!is_printable(L_DBG)) - return 1; - return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, 1); + return xdbg_helper(msg, frm, str2, 1, NOFACILITY); } - /** * module destroy function */

1 0

git:master: xlog: restructure functions
by Klaus Darilion 26 Feb '12

26 Feb '12

Module: sip-router Branch: master Commit: 8831d195c8edfb021f288eb685d8621512dcb3fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8831d19… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: klaus darilion <darilion(a)gucci.labs.nic.at> Date: Sun Feb 26 19:04:56 2012 +0100 xlog: restructure functions - restructure functions for better readability, no code changes --- modules_k/xlog/xlog.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 0412b25..28e6926 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -195,6 +195,17 @@ static int xlog_1(struct sip_msg* msg, char* frm, char* str2) } /** + * print log message to L_ERR level along with cfg line + */ +static int xlogl_1(struct sip_msg* msg, char* frm, char* str2) +{ + if(!is_printable(L_ERR)) + return 1; + + return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, 1); +} + +/** * print log message to level given in parameter */ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) @@ -224,27 +235,6 @@ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) } /** - * print log message to L_DBG level - */ -static int xdbg(struct sip_msg* msg, char* frm, char* str2) -{ - if(!is_printable(L_DBG)) - return 1; - return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, 0); -} - -/** - * print log message to L_ERR level along with cfg line - */ -static int xlogl_1(struct sip_msg* msg, char* frm, char* str2) -{ - if(!is_printable(L_ERR)) - return 1; - - return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, 1); -} - -/** * print log message to level given in parameter along with cfg line */ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) @@ -274,6 +264,16 @@ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) } /** + * print log message to L_DBG level + */ +static int xdbg(struct sip_msg* msg, char* frm, char* str2) +{ + if(!is_printable(L_DBG)) + return 1; + return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, 0); +} + +/** * print log message to L_DBG level along with cfg line */ static int xdbgl(struct sip_msg* msg, char* frm, char* str2)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012