sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:4.0: modules/uac: avoid adding double quotes in uac_replace_* functions
by Vicente Hernando 17 May '13

17 May '13

Module: sip-router Branch: 4.0 Commit: 5eced6635b0a2165c9c107fb6031901459159b2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5eced66… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Thu May 16 12:06:55 2013 +0200 modules/uac: avoid adding double quotes in uac_replace_* functions - updated uac doc with a note and examples. (cherry picked from commit 251c0218e7d5e09f43a2b834a5450c20bb4f6d60) --- modules/uac/doc/uac_admin.xml | 14 +++++++++- modules/uac/uac.c | 50 +--------------------------------------- 2 files changed, 14 insertions(+), 50 deletions(-) diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index 3610f12..05dc713 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -484,6 +484,10 @@ modparam("uac", "reg_contact_addr", "192.168.1.2:5080") <para> This function can be used from REQUEST_ROUTE and from BRANCH_ROUTE. </para> + <para>NOTE: Previous versions of this function added double quotes automatically to + display variable. That is no longer the case, if you expect that behavior, you will + have to add the quotes by yourself. + </para> <para> If you set restore_mode to AUTO, the URI will be modified automatically in all subsequent requests and replies in that dialog. @@ -512,7 +516,8 @@ modparam("uac", "reg_contact_addr", "192.168.1.2:5080") # replace both display and uri uac_replace_from("$avp(s:display)","$avp(s:uri)"); # replace only display and do not touch uri -uac_replace_from("batman",""); +uac_replace_from("batman",""); # display is replaced with: batman +uac_replace_from("\"batman\"",""); # display is replaced with: "batman" # remove display and replace uri uac_replace_from("","sip:robin@gotham.org"); # remove display and do not touch uri @@ -580,6 +585,10 @@ uac_restore_from(); <para> This function can be used from REQUEST_ROUTE and from BRANCH_ROUTE. </para> + <para>NOTE: Previous versions of this function added double quotes automatically to + display variable. That is no longer the case, if you expect that behavior, you will + have to add the quotes by yourself. + </para> <example> <title><function>uac_replace_to</function> usage</title> <programlisting format="linespecific"> @@ -587,7 +596,8 @@ uac_restore_from(); # replace both display and uri uac_replace_to("$avp(display)","$avp(uri)"); # replace only display and do not touch uri -uac_replace_to("batman",""); +uac_replace_to("batman",""); # display is replaced with: batman +uac_replace_to("\"batman\"",""); # display is replaced with: "batman" # remove display and replace uri uac_replace_to("","sip:robin@gotham.org"); # remove display and do not touch uri diff --git a/modules/uac/uac.c b/modules/uac/uac.c index a7cd414..5142e03 100644 --- a/modules/uac/uac.c +++ b/modules/uac/uac.c @@ -98,7 +98,6 @@ static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int fixup_replace_uri(void** param, int param_no); -static int fixup_replace_disp_uri(void** param, int param_no); static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); @@ -114,13 +113,13 @@ static pv_export_t mod_pvs[] = { /* Exported functions */ static cmd_export_t cmds[]={ - {"uac_replace_from", (cmd_function)w_replace_from, 2, fixup_replace_disp_uri, 0, + {"uac_replace_from", (cmd_function)w_replace_from, 2, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_replace_from", (cmd_function)w_replace_from, 1, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_restore_from", (cmd_function)w_restore_from, 0, 0, 0, REQUEST_ROUTE }, - {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_replace_disp_uri, 0, + {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, @@ -415,51 +414,6 @@ static int fixup_replace_uri(void** param, int param_no) return 0; } - -static int fixup_replace_disp_uri(void** param, int param_no) -{ - pv_elem_t *model; - char *p; - str s; - - /* convert to str */ - s.s = (char*)*param; - s.len = strlen(s.s); - - model=NULL; - if (param_no==1) - { - if (s.len) - { - /* put " around display name */ - p = (char*)pkg_malloc(s.len+3); - if (p==0) - { - LM_CRIT("no more pkg mem\n"); - return E_OUT_OF_MEM; - } - p[0] = '\"'; - memcpy(p+1, s.s, s.len); - p[s.len+1] = '\"'; - p[s.len+2] = '\0'; - pkg_free(s.s); - s.s = p; - s.len += 2; - } - } - if(pv_parse_format(&s ,&model)<0) - { - LM_ERR("wrong format [%s] for param no %d!\n", s.s, param_no); - pkg_free(s.s); - return E_UNSPEC; - } - *param = (void*)model; - - return 0; -} - - - /************************** wrapper functions ******************************/ static int w_restore_from(struct sip_msg *msg)

1 0

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures
by sip-router 17 May '13

17 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Juha Heinanen (jh) ---------- currently t_fwd generates "477 sending to next hop failed" immediately, i.e., fr_timer does not apply dead tcp connections. for example, fr_tcp_timer module param would be fine with me. i could then set it to smaller value than fr_timer. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=296#comment873 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures
by sip-router 17 May '13

17 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Daniel-Constantin Mierla (miconda) ---------- Maybe this timeout value should be set via mod param. Otherwise, it should be the fr_timer value. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=296#comment872 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

per module log level
by Daniel-Constantin Mierla 17 May '13

17 May '13

Hello, I just added a framework to enable per module log level. Following IRC devel meeting, I analyzed a bit and come up with a solution that relies on debugger module registering a callback to core for getting the log level per module. See my last commits related to debugger. It still needs some enhancements to make it more flexible, maybe Hugh can jump in and contribute, I won't have time for it in the near future. Here is what I think will be nice to add: - mi/rpc commands to change the log levels at runtime - make log_level_mode accessible via cfg parameter reload framework so it can be enabled/disabled at runtime Of course, enabling this feature will slow down a bit printing the log messages comparing with the case when this feature is disabled, but should be not that much, as modules log level are kept in memory in a hash table. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, San Francisco, USA - June 24-27, 2013 * http://asipto.com/u/katu *

1 0

git:master: Makefile.defs: version set to 4.1.0-dev5
by Daniel-Constantin Mierla 17 May '13

17 May '13

Module: sip-router Branch: master Commit: 257366739a7087953c0ff9e0dff82f3d2cf7c8b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2573667… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 17 10:13:06 2013 +0200 Makefile.defs: version set to 4.1.0-dev5 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 87371f7..49797ec 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -163,7 +163,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master: debugger: documented new parameters related to per module log level
by Daniel-Constantin Mierla 17 May '13

17 May '13

Module: sip-router Branch: master Commit: 86fce4b7b5e8bb56c65d628409ee50ecfb2756c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86fce4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 17 10:12:00 2013 +0200 debugger: documented new parameters related to per module log level --- modules/debugger/README | 60 +++++++++++++++++++++++++++--- modules/debugger/doc/debugger_admin.xml | 58 +++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 6 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index 6ad2e09..ff1b32b 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -32,6 +32,9 @@ Daniel-Constantin Mierla 3.5. log_prefix (str) 3.6. step_usleep (int) 3.7. step_loops (int) + 3.8. mod_hash_size (int) + 3.9. mod_level_mode (int) + 3.10. mod_level (str) 4. Functions @@ -54,7 +57,10 @@ Daniel-Constantin Mierla 1.5. Set log_prefix parameter 1.6. Set step_usleep parameter 1.7. Set step_loops parameter - 1.8. dbg_breakpoint usage + 1.8. Set mod_hash_size parameter + 1.9. Set mod_level_mode parameter + 1.10. Set mod_level parameter + 1.11. dbg_breakpoint usage Chapter 1. Admin Guide @@ -75,6 +81,9 @@ Chapter 1. Admin Guide 3.5. log_prefix (str) 3.6. step_usleep (int) 3.7. step_loops (int) + 3.8. mod_hash_size (int) + 3.9. mod_level_mode (int) + 3.10. mod_level (str) 4. Functions @@ -136,6 +145,9 @@ Chapter 1. Admin Guide 3.5. log_prefix (str) 3.6. step_usleep (int) 3.7. step_loops (int) + 3.8. mod_hash_size (int) + 3.9. mod_level_mode (int) + 3.10. mod_level (str) 3.1. cfgtrace (int) @@ -223,11 +235,47 @@ modparam("debugger", "step_usleep", 500000) modparam("debugger", "step_loops", 100) ... +3.8. mod_hash_size (int) + + Used to compute power of two as size of internal hash table to store + levels per module (e.g., if its set to 4, internal hash table has 16 + slots). + + Default value is "0" - feature disabled. + + Example 1.8. Set mod_hash_size parameter +... +modparam("debugger", "mod_hash_size", 5) +... + +3.9. mod_level_mode (int) + + Enable or disable per module log level (0 - disabled, 1 - enabled). + + Default value is "0". + + Example 1.9. Set mod_level_mode parameter +... +modparam("debugger", "mod_level_mode", 1) +... + +3.10. mod_level (str) + + Specify module log level - the value must be in the format: + modulename=level. The parameter can be set many times. For core log + level, use module name 'core'. + + Example 1.10. Set mod_level parameter +... +modparam("debugger", "mod_level", "core=3") +modparam("debugger", "mod_level", "tm=3") +... + 4. Functions 4.1. dbg_breakpoint(mode) -4.1. dbg_breakpoint(mode) +4.1. dbg_breakpoint(mode) Anchor a breakpoint at the current line of the config (the one on which this function is called). The 'mode' specifies whether the breakpoint @@ -236,7 +284,7 @@ modparam("debugger", "step_loops", 100) Note that this version of the module does not export this anchors to RPC for interactive debugging (temporarily disabled). - Example 1.8. dbg_breakpoint usage + Example 1.11. dbg_breakpoint usage ... if($si=="10.0.0.10") dbg_breakpoint("1"); @@ -248,7 +296,7 @@ if($si=="10.0.0.10") 5.2. dbg.trace 5.3. dbg.bp -5.1. dbg.ls +5.1. dbg.ls List Kamailio processes with info related to interactive debugging. @@ -262,7 +310,7 @@ if($si=="10.0.0.10") dbg.ls dbg.ls 1234 -5.2. dbg.trace +5.2. dbg.trace Control config script running trace. @@ -279,7 +327,7 @@ if($si=="10.0.0.10") dbg.trace off dbg.trace on 1234 -5.3. dbg.bp +5.3. dbg.bp Control breakpoints and config execution. diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index b265724..7df8af1 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -223,6 +223,64 @@ modparam("debugger", "step_loops", 100) </example> </section> + <section> + <title><varname>mod_hash_size</varname> (int)</title> + <para> + Used to compute power of two as size of internal hash table to store levels + per module (e.g., if its set to 4, internal hash table has 16 slots). + </para> + <para> + <emphasis> + Default value is <quote>0</quote> - feature disabled. + </emphasis> + </para> + <example> + <title>Set <varname>mod_hash_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "mod_hash_size", 5) +... +</programlisting> + </example> + </section> + + <section> + <title><varname>mod_level_mode</varname> (int)</title> + <para> + Enable or disable per module log level (0 - disabled, 1 - enabled). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>mod_level_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "mod_level_mode", 1) +... +</programlisting> + </example> + </section> + + <section> + <title><varname>mod_level</varname> (str)</title> + <para> + Specify module log level - the value must be in the format: + modulename=level. The parameter can be set many times. For core + log level, use module name 'core'. + </para> + <example> + <title>Set <varname>mod_level</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "mod_level", "core=3") +modparam("debugger", "mod_level", "tm=3") +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master: core: updated dprint api to enable support for debug level per module
by Daniel-Constantin Mierla 17 May '13

17 May '13

Module: sip-router Branch: master Commit: 34378c35b7cd037051af71081a9fa4d8b188c157 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34378c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 17 09:56:34 2013 +0200 core: updated dprint api to enable support for debug level per module - a callback can be registered to return the log level based on module name --- dprint.c | 19 ++++++++++++++++++- dprint.h | 15 +++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dprint.c b/dprint.c index 12259d4..b99174d 100644 --- a/dprint.c +++ b/dprint.c @@ -115,12 +115,29 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val) /* the local debug log level */ static int _local_debug_level = UNSET_LOCAL_DEBUG_LEVEL; +/* callback to get per module debug level */ +static get_module_debug_level_f _module_debug_level = NULL; + +/** + * @brief set callback function for per module debug level + */ +void set_module_debug_level_cb(get_module_debug_level_f f) +{ + _module_debug_level = f; +} /** * @brief return the log level - the local one if it set, * otherwise the global value */ -int get_debug_level(void) { +int get_debug_level(char *mname, int mnlen) { + int mlevel = L_DBG; + /*important -- no LOGs inside, because it will loop */ + if(unlikely(_module_debug_level!=NULL && mnlen>0)) { + if(_module_debug_level(mname, mnlen, &mlevel)==0) { + return mlevel; + } + } return (_local_debug_level != UNSET_LOCAL_DEBUG_LEVEL) ? _local_debug_level : cfg_get(core, core_cfg, debug); } diff --git a/dprint.h b/dprint.h index 285c9f1..0842988 100644 --- a/dprint.h +++ b/dprint.h @@ -59,8 +59,10 @@ #ifdef NO_DEBUG # ifdef MOD_NAME # define LOC_INFO MOD_NAME ": " +# define LOG_MNAME MOD_NAME # else # define LOC_INFO "<core>: " +# define LOG_MNAME "core" # endif #else # define XCT2STR(i) #i @@ -68,8 +70,10 @@ # # ifdef MOD_NAME # define LOC_INFO MOD_NAME " [" __FILE__ ":" CT2STR(__LINE__) "]: " +# define LOG_MNAME MOD_NAME # else # define LOC_INFO "<core> [" __FILE__ ":" CT2STR(__LINE__) "]: " +# define LOG_MNAME "core" # endif # # ifdef NO_LOG @@ -77,6 +81,7 @@ # endif #endif /* NO_DEBUG */ +#define LOG_MNAME_LEN (sizeof(LOG_MNAME)-1) /* * Log levels @@ -121,11 +126,13 @@ struct log_level_info { }; /** @brief per process debug level handling */ -int get_debug_level(void); +int get_debug_level(char *mname, int mnlen); void set_local_debug_level(int level); void reset_local_debug_level(void); +typedef int (*get_module_debug_level_f)(char *mname, int mnlen, int *mlevel); +void set_module_debug_level_cb(get_module_debug_level_f f); -#define is_printable(level) (get_debug_level()>=(level)) +#define is_printable(level) (get_debug_level(LOG_MNAME, LOG_MNAME_LEN)>=(level)) extern struct log_level_info log_level_info[]; extern char *log_name; @@ -179,7 +186,7 @@ void dprint_term_color(char f, char b, str *obuf); # ifdef __SUNPRO_C # define LOG_(facility, level, prefix, fmt, ...) \ do { \ - if (unlikely(get_debuglevel() >= (level) && \ + if (unlikely(get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ DPRINT_NON_CRIT)) { \ DPRINT_CRIT_ENTER; \ if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ @@ -245,7 +252,7 @@ void dprint_term_color(char f, char b, str *obuf); # else /* ! __SUNPRO_C */ # define LOG_(facility, level, prefix, fmt, args...) \ do { \ - if (get_debug_level() >= (level) && \ + if (get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ DPRINT_NON_CRIT) { \ DPRINT_CRIT_ENTER; \ if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \

1 0

git:master: debugger: option to set debug level per module
by Daniel-Constantin Mierla 17 May '13

17 May '13

Module: sip-router Branch: master Commit: 72f1b495c42933fea96a019e140dc6333fda2eb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72f1b49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 17 09:58:19 2013 +0200 debugger: option to set debug level per module - new parameters: - mod_hash_size - size of internal hash table to store levels per module (used to compute power of two with it) - mod_level_mode - enable/disable per module log level - mod_level - specify module log level modparam("debugger", "mod_hash_size", 5) modparam("debugger", "mod_level_mode", 1) modparam("debugger", "mod_level", "core=3"); modparam("debugger", "mod_level", "usrloc=3"); --- modules/debugger/debugger_api.c | 211 +++++++++++++++++++++++++++++++++++++++ modules/debugger/debugger_api.h | 4 + modules/debugger/debugger_mod.c | 52 ++++++++++- 3 files changed, 266 insertions(+), 1 deletions(-) diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index bbf31a0..7653c95 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -35,6 +35,7 @@ #include "../../rpc_lookup.h" #include "../../route_struct.h" #include "../../mem/shm_mem.h" +#include "../../locking.h" #include "debugger_act.h" #include "debugger_api.h" @@ -867,3 +868,213 @@ int dbg_init_rpc(void) return 0; } + +typedef struct _dbg_mod_level { + str name; + unsigned int hashid; + int level; + struct _dbg_mod_level *next; +} dbg_mod_level_t; + +typedef struct _dbg_mod_slot +{ + dbg_mod_level_t *first; + gen_lock_t lock; +} dbg_mod_slot_t; + +static dbg_mod_slot_t *_dbg_mod_table = NULL; +static unsigned int _dbg_mod_table_size = 0; + +/** + * + */ +int dbg_init_mod_levels(int dbg_mod_level, int dbg_mod_hash_size) +{ + int i; + if(dbg_mod_level==0 || dbg_mod_hash_size<=0) + return 0; + if(_dbg_mod_table!=NULL) + return 0; + _dbg_mod_table_size = 1 << dbg_mod_hash_size; + _dbg_mod_table = (dbg_mod_slot_t*)shm_malloc(_dbg_mod_table_size*sizeof(dbg_mod_slot_t)); + if(_dbg_mod_table==NULL) + { + LM_ERR("no more shm.\n"); + return -1; + } + memset(_dbg_mod_table, 0, _dbg_mod_table_size*sizeof(dbg_mod_slot_t)); + + for(i=0; i<_dbg_mod_table_size; i++) + { + if(lock_init(&_dbg_mod_table[i].lock)==0) + { + LM_ERR("cannot initalize lock[%d]\n", i); + i--; + while(i>=0) + { + lock_destroy(&_dbg_mod_table[i].lock); + i--; + } + shm_free(_dbg_mod_table); + _dbg_mod_table = NULL; + return -1; + } + } + return 0; +} + +/* + * case insensitive hashing - clone here to avoid usage of LOG*() + * - s1 - str to hash + * - s1len - len of s1 + * return computed hash id + */ +#define dbg_ch_h_inc h+=v^(v>>3) +#define dbg_ch_icase(_c) (((_c)>='A'&&(_c)<='Z')?((_c)|0x20):(_c)) +static inline unsigned int dbg_compute_hash(char *s1, int s1len) +{ + char *p, *end; + register unsigned v; + register unsigned h; + + h=0; + + end=s1+s1len; + for ( p=s1 ; p<=(end-4) ; p+=4 ){ + v=(dbg_ch_icase(*p)<<24)+(dbg_ch_icase(p[1])<<16)+(dbg_ch_icase(p[2])<<8) + + dbg_ch_icase(p[3]); + dbg_ch_h_inc; + } + v=0; + for (; p<end ; p++){ v<<=8; v+=dbg_ch_icase(*p);} + dbg_ch_h_inc; + + h=((h)+(h>>11))+((h>>13)+(h>>23)); + return h; +} + +int dbg_set_mod_debug_level(char *mname, int mnlen, int *mlevel) +{ + unsigned int idx; + unsigned int hid; + dbg_mod_level_t *it; + dbg_mod_level_t *itp; + dbg_mod_level_t *itn; + + if(_dbg_mod_table==NULL) + return -1; + + hid = dbg_compute_hash(mname, mnlen); + idx = hid&(_dbg_mod_table_size-1); + + lock_get(&_dbg_mod_table[idx].lock); + it = _dbg_mod_table[idx].first; + itp = NULL; + while(it!=NULL && it->hashid < hid) { + itp = it; + it = it->next; + } + while(it!=NULL && it->hashid==hid) + { + if(mnlen==it->name.len + && strncmp(mname, it->name.s, mnlen)==0) + { + /* found */ + if(mlevel==NULL) { + /* remove */ + if(itp!=NULL) { + itp->next = it->next; + } else { + _dbg_mod_table[idx].first = it->next; + } + shm_free(it); + } else { + /* set */ + it->level = *mlevel; + } + lock_release(&_dbg_mod_table[idx].lock); + return 0; + } + itp = it; + it = it->next; + } + /* not found - add */ + if(mlevel==NULL) { + lock_release(&_dbg_mod_table[idx].lock); + return 0; + } + itn = (dbg_mod_level_t*)shm_malloc(sizeof(dbg_mod_level_t) + (mnlen+1)*sizeof(char)); + if(itn==NULL) { + LM_ERR("no more shm\n"); + lock_release(&_dbg_mod_table[idx].lock); + return -1; + } + memset(itn, 0, sizeof(dbg_mod_level_t) + (mnlen+1)*sizeof(char)); + itn->level = *mlevel; + itn->hashid = hid; + itn->name.s = (char*)(itn) + sizeof(dbg_mod_level_t); + itn->name.len = mnlen; + strncpy(itn->name.s, mname, mnlen); + itn->name.s[itn->name.len] = '\0'; + + if(itp==NULL) { + itn->next = _dbg_mod_table[idx].first; + _dbg_mod_table[idx].first = itn; + } else { + itn->next = itp->next; + itp->next = itn; + } + lock_release(&_dbg_mod_table[idx].lock); + return 0; + +} + +static int _dbg_get_mod_debug_level = 0; +int dbg_get_mod_debug_level(char *mname, int mnlen, int *mlevel) +{ + unsigned int idx; + unsigned int hid; + dbg_mod_level_t *it; + /* no LOG*() usage in this function and those executed insite it + * - use fprintf(stderr, ...) if need for troubleshooting + * - it will loop otherwise */ + if(_dbg_mod_table==NULL) + return -1; + + if(_dbg_get_mod_debug_level!=0) + return -1; + _dbg_get_mod_debug_level = 1; + + hid = dbg_compute_hash(mname, mnlen); + idx = hid&(_dbg_mod_table_size-1); + lock_get(&_dbg_mod_table[idx].lock); + it = _dbg_mod_table[idx].first; + while(it!=NULL && it->hashid < hid) + it = it->next; + while(it!=NULL && it->hashid == hid) + { + if(mnlen==it->name.len + && strncmp(mname, it->name.s, mnlen)==0) + { + /* found */ + *mlevel = it->level; + lock_release(&_dbg_mod_table[idx].lock); + _dbg_get_mod_debug_level = 0; + return 0; + } + it = it->next; + } + lock_release(&_dbg_mod_table[idx].lock); + _dbg_get_mod_debug_level = 0; + return -1; +} + +/** + * + */ +void dbg_enable_mod_levels(void) +{ + if(_dbg_mod_table==NULL) + return; + set_module_debug_level_cb(dbg_get_mod_debug_level); +} diff --git a/modules/debugger/debugger_api.h b/modules/debugger/debugger_api.h index e5a5ca2..9af8cf6 100644 --- a/modules/debugger/debugger_api.h +++ b/modules/debugger/debugger_api.h @@ -33,5 +33,9 @@ int dbg_init_pid_list(void); int dbg_init_mypid(void); int dbg_init_rpc(void); +int dbg_init_mod_levels(int _dbg_mod_level, int _dbg_mod_hash_size); +int dbg_set_mod_debug_level(char *mname, int mnlen, int *mlevel); +void dbg_enable_mod_levels(void); + #endif diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index 8b85afb..98d317b 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -44,6 +44,7 @@ static void mod_destroy(void); static int w_dbg_breakpoint(struct sip_msg* msg, char* point, char* str2); static int fixup_dbg_breakpoint(void** param, int param_no); +static int dbg_mod_level_param(modparam_t type, void *val); /* parameters */ extern int _dbg_cfgtrace; @@ -56,6 +57,9 @@ extern int _dbg_step_loops; static char * _dbg_cfgtrace_facility_str = 0; +static int _dbg_mod_hash_size = 0; +static int _dbg_mod_level = 0; + static cmd_export_t cmds[]={ {"dbg_breakpoint", (cmd_function)w_dbg_breakpoint, 1, fixup_dbg_breakpoint, 0, ANY_ROUTE}, @@ -70,6 +74,9 @@ static param_export_t params[]={ {"log_prefix", STR_PARAM, &_dbg_cfgtrace_prefix}, {"step_usleep", INT_PARAM, &_dbg_step_usleep}, {"step_loops", INT_PARAM, &_dbg_step_loops}, + {"mod_hash_size", INT_PARAM, &_dbg_mod_hash_size}, + {"mod_level_mode", INT_PARAM, &_dbg_mod_level}, + {"mod_level", STR_PARAM|USE_FUNC_PARAM, (void*)dbg_mod_level_param}, {0, 0, 0} }; @@ -113,6 +120,12 @@ static int mod_init(void) return -1; } + if(dbg_init_mod_levels(_dbg_mod_level, _dbg_mod_hash_size)<0) + { + LM_ERR("failed to init per module log level\n"); + return -1; + } + return dbg_init_bp_list(); } @@ -122,8 +135,10 @@ static int mod_init(void) static int child_init(int rank) { LM_DBG("rank is (%d)\n", rank); - if (rank==PROC_INIT) + if (rank==PROC_INIT) { + dbg_enable_mod_levels(); return dbg_init_pid_list(); + } return dbg_init_mypid(); } @@ -173,4 +188,39 @@ static int fixup_dbg_breakpoint(void** param, int param_no) return dbg_add_breakpoint(a, (*p=='0')?0:1); } +static int dbg_mod_level_param(modparam_t type, void *val) +{ + char *p; + str s; + int l; + if(val==NULL) + return -1; + + p = strchr((char*)val, '='); + if(p==NULL) { + LM_ERR("invalid parameter value: %s\n", (char*)val); + return -1; + } + s.s = p + 1; + s.len = strlen(s.s); + + if(str2sint(&s, &l)<0) { + LM_ERR("invalid parameter - level value: %s\n", (char*)val); + return -1; + } + s.s = (char*)val; + s.len = p - s.s; + if(dbg_init_mod_levels(_dbg_mod_level, _dbg_mod_hash_size)<0) + { + LM_ERR("failed to init per module log level\n"); + return -1; + } + if(dbg_set_mod_debug_level(s.s, s.len, &l)<0) + { + LM_ERR("cannot store parameter: %s\n", (char*)val); + return -1; + } + return 0; + +}

1 0

git:master: core: fixed printing function name in log message
by Daniel-Constantin Mierla 17 May '13

17 May '13

Module: sip-router Branch: master Commit: e081c2880b46174ad836ab1f56e3062bb17b4332 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e081c28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 17 00:46:42 2013 +0200 core: fixed printing function name in log message - based on http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html --- dprint.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dprint.h b/dprint.h index 4a9fdbf..285c9f1 100644 --- a/dprint.h +++ b/dprint.h @@ -46,7 +46,7 @@ /* C >= 99 has __func__, older gcc versions have __FUNCTION__ */ #if __STDC_VERSION__ < 199901L -# if __GNUC__ >= 2 && defined __FUNCTION__ +# if __GNUC__ >= 2 # define _FUNC_NAME_ __FUNCTION__ # else # define _FUNC_NAME_ ""

1 0

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures
by sip-router 17 May '13

17 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Juha Heinanen (jh) ---------- the second alternative sounds better to me, because it unifies the behavior of tcp and udp failures and also triggers failure route if all branches fail. the timer should trigger as soon as the implementation allows it to happen in order to avoid the long re-transmission wait that we currently have in case of udp failures. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=296#comment871 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013