sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:master: log/dbg: level is not limited anymore

by Jan Janak

Module: sip-router Branch: master Commit: 43181b6bc1c50b8456c4c4b5bceda5a99ef0c417 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43181b6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 26 23:14:12 2009 +0000 log/dbg: level is not limited anymore The recent changes to LOG() added a new limitation: the log level was restricted to one of the L_ macros. Using another level (e.g. L_DBG+1) would trigger an assert(). Now any level is allowed. If the level is not among the defined range (L_ALERT - L_DBG), the prefix will be skipped (e.g. "DBG") and the syslog level will be set to either the L_ALERT or the L_DBG one. This fixes problems with log() from the script, or when using a very high debug level and something like memdbg=7. --- cfg.y | 3 +- dprint.h | 76 ++++++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 22 deletions(-) diff --git a/cfg.y b/cfg.y index 8408e1d..8d56371 100644 --- a/cfg.y +++ b/cfg.y @@ -2207,7 +2207,8 @@ cmd: | RETURN NUMBER {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$2, NUMBER_ST, (void*)RETURN_R_F);} | RETURN RETCODE {$$=mk_action(DROP_T, 2, RETCODE_ST, 0, NUMBER_ST, (void*)RETURN_R_F);} | BREAK {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)RETURN_R_F); } - | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)4, STRING_ST, $3); } + | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, + (void*)(L_DBG+1), STRING_ST, $3); } | LOG_TOK LPAREN NUMBER COMMA STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)$3, STRING_ST, $5); } | LOG_TOK error { $$=0; yyerror("missing '(' or ')' ?"); } | LOG_TOK LPAREN error RPAREN { $$=0; yyerror("bad log argument"); } diff --git a/dprint.h b/dprint.h index 6a9806d..6b66427 100644 --- a/dprint.h +++ b/dprint.h @@ -32,6 +32,7 @@ #include <syslog.h> #include <stdio.h> /* stderr, fprintf() */ +#include "compiler_opt.h" #include "cfg_core.h" @@ -144,19 +145,36 @@ int log_facility_fixup(void *handle, str *name, void **val); # ifdef __SUNPRO_C # define LOG_(level, prefix, fmt, ...) \ do { \ - if (cfg_get(core, core_cfg, debug) >= (level) && \ - DPRINT_NON_CRIT) { \ + if (unlikely(cfg_get(core, core_cfg, debug) >= (level) && \ + DPRINT_NON_CRIT)) { \ DPRINT_CRIT_ENTER; \ - assert(((level) >= L_ALERT) && ((level) <= L_DBG)); \ - if (log_stderr) { \ - fprintf(stderr, "%2d(%d) %s: %s" fmt, \ - process_no, my_pid(), LOG_LEVEL2NAME(level),\ - (prefix), __VA_ARGS__); \ + if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ + if (unlikely(log_stderr)) { \ + fprintf(stderr, "%2d(%d) %s: %s" fmt, \ + process_no, my_pid(), \ + LOG_LEVEL2NAME(level), (prefix), \ + __VA_ARGS__); \ + } else { \ + syslog(LOG2SYSLOG_LEVEL(level) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s: %s" fmt, LOG_LEVEL2NAME(level),\ + (prefix), __VA_ARGS__); \ + } \ } else { \ - syslog(LOG2SYSLOG_LEVEL(level) | \ - cfg_get(core, core_cfg, log_facility), \ - "%s: %s" fmt, LOG_LEVEL2NAME(level),\ - (prefix), __VA_ARGS__); \ + if (log_stderr) { \ + fprintf(stderr, "%2d(%d) %s" fmt, \ + process_no, my_pid(), \ + (prefix), __VA_ARGS__); \ + } else { \ + if ((level)<L_ALERT) \ + syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), __VA_ARGS__); \ + else \ + syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), __VA_ARGS__); \ + } \ } \ DPRINT_CRIT_EXIT; \ } \ @@ -164,22 +182,38 @@ int log_facility_fixup(void *handle, str *name, void **val); # define LOG(level, fmt, ...) LOG_((level), LOC_INFO, fmt, __VA_ARGS__) -# else +# else /* ! __SUNPRO_C */ # define LOG_(level, prefix, fmt, args...) \ do { \ if (cfg_get(core, core_cfg, debug) >= (level) && \ DPRINT_NON_CRIT) { \ DPRINT_CRIT_ENTER; \ - assert(((level) >= L_ALERT) && ((level) <= L_DBG)); \ - if (log_stderr) { \ - fprintf(stderr, "%2d(%d) %s: %s" fmt, \ - process_no, my_pid(), LOG_LEVEL2NAME(level),\ - (prefix), ## args); \ - } else { \ - syslog(LOG2SYSLOG_LEVEL(level) |\ + if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ + if (unlikely(log_stderr)) { \ + fprintf(stderr, "%2d(%d) %s: %s" fmt, \ + process_no, my_pid(), \ + LOG_LEVEL2NAME(level),(prefix), ## args);\ + } else { \ + syslog(LOG2SYSLOG_LEVEL(level) |\ cfg_get(core, core_cfg, log_facility), \ - "%s: %s" fmt, LOG_LEVEL2NAME(level),\ - (prefix), ## args); \ + "%s: %s" fmt, LOG_LEVEL2NAME(level),\ + (prefix), ## args); \ + } \ + } else { \ + if (log_stderr) { \ + fprintf(stderr, "%2d(%d) %s" fmt, \ + process_no, my_pid(), \ + (prefix), ## args); \ + } else { \ + if ((level)<L_ALERT) \ + syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), ## args); \ + else \ + syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), ## args); \ + } \ } \ DPRINT_CRIT_EXIT; \ } \

15 years, 10 months

Annotated git configuration file

by Jan Janak

Hello, There is a new page in the wiki which contains my version of the configuration file for git: http://sip-router.org/wiki/git/gitconfig Some of the options were not so easy to figure out, so I decided to share the config file to make your git learning curve less steep than mine was (and is :-). The file is well commented. Save the configuration file in ~/.gitconfig and set your name and email address to your real name and real email address. After that you get your copy of the sip-router repository using: mkdir my_repo cd my_repo git init git fetch sr You have pulled the whole history when the last command finished. "sr" is a shorthand for the sip-router git repository. As the next step you can check out the master branch, this is where the most recent source code is (it is an equivalent of the trunk in svn or HEAD in cvs): git co -b master sr/master "co" is an alias for checkout, this alias is defined in the configuration file. So now you have your very own copy of the sip-router repository, but that's not all, you can also pull the whole kamailio repository into it: g fetch km "km" is a shorthand for the git mirror of the kamailio svn repository. This command will produce a lot of output (don't be scared) and after it finishes you will have the full history of both projects--sip-router and kamailio--in your local git repository. You can, for example, check out kamailio svn trunk using: git co -b kam_trunk km/trunk And now you have the sources from kamailio trunk in your working directory. You can, of course do the same for SER from CVS, to get the latest sources of ser: git fetch cvs "cvs" is a shorthand for the git import of the ser cvs repository. Now you can switch to cvs trunk using: git co -b cvs_trunk cvs/cvs-head And now you have the latest ser sources in your working directory. And the last repository you can fetch from is the opensips git import: git fetch os git co -b opensips_trunk os/trunk And you have the latest sources from opensips trunk. To display all branches from all repositories run: git branch -a The most important branches are: sr/master - Latest version of sip-router core cvs/cvs-head - Latest version of ser from cvs km/trunk - Kamailio svn trunk km/1.4 - Kamailio branch with release 1.4 os/trunk - Opensips svn trunk Jan.

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: master Commit: 90bb3224cc75db8dbaab3c2c21c54dddad544b79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90bb322… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 23 22:58:35 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router * 'master' of ssh://janakj@git.sip-router.org/sip-router: tcp: fix compilation problem on solaris (FIONREAD) core: fix bad level name in new LOG() t_check_status() checks also the blind UACs if t_pick_branch() Documenting t_lookup_cancel() script function. Removing set_t() from t_lookup_cancel() function, and introducing updated udp_mtu handling code - fixes SER-433 documenting t_is_expired() function t_is_expired() script function is introduced. * logging API updated (see doc/logging-api.txt for details) - AS support disabled by default. When building the route set of ACKs for local UACs, only the reply is now In case the AVP is a regexp, an allocation is required to build an AVP Currently, SER matches E2E ACKs only if there is an equality between From HF The calculate_routeset_length() produces an invalid result in the case 'memapp' and 'append_mem_block' are now both only used in source "Route :" prefix (and separator) is used some more time across the script: udp_mtu fallback script config & commands core: forward: tcp fallback for big udp packets ---

15 years, 10 months

git:master: Rename cfg_size to cfg_sizeof

by Jan Janak

Module: sip-router Branch: master Commit: a5ecca6386388a8bf465c1c0cc623db18b120936 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5ecca6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 26 12:52:17 2009 +0100 Rename cfg_size to cfg_sizeof One of kamailio modules uses libconfuse library which happens to contain a function with the same name, and this causes a conflict. We can rename cfg_size to cfg_sizeof to solve the problem. Signed-off-by: Jan Janak <jan(a)iptel.org> Acked-by: Miklos Tirpak <miklos(a)iptel.org> --- cfg/cfg.h | 2 +- doc/cfg.txt | 2 +- main.c | 2 +- modules/tm/tm.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/cfg.h b/cfg/cfg.h index 21be1aa..f2bd85b 100644 --- a/cfg/cfg.h +++ b/cfg/cfg.h @@ -77,7 +77,7 @@ typedef struct _cfg_def { int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, void **handler); -#define cfg_size(gname) \ +#define cfg_sizeof(gname) \ sizeof(struct cfg_group_##gname) #define cfg_get(gname, handle, var) \ diff --git a/doc/cfg.txt b/doc/cfg.txt index 730f1bf..ddfbec6 100644 --- a/doc/cfg.txt +++ b/doc/cfg.txt @@ -147,7 +147,7 @@ Each row consists of the following items: static int mod_init(void) { - if (cfg_declare("foo", cfg_def, &default_cfg, cfg_size(foo), + if (cfg_declare("foo", cfg_def, &default_cfg, cfg_sizeof(foo), &cfg_handle) ) { /* error */ diff --git a/main.c b/main.c index 453f578..b3f567f 100644 --- a/main.c +++ b/main.c @@ -1998,7 +1998,7 @@ try_again: goto error; } /* declare the core cfg before the module configs */ - if (cfg_declare("core", core_cfg_def, &default_core_cfg, cfg_size(core), + if (cfg_declare("core", core_cfg_def, &default_core_cfg, cfg_sizeof(core), &core_cfg) ) { LOG(L_CRIT, "could not declare the core configuration\n"); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index ef8c9af..9a4fea1 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -707,7 +707,7 @@ static int mod_init(void) #endif /* declare the configuration */ - if (cfg_declare("tm", tm_cfg_def, &default_tm_cfg, cfg_size(tm), + if (cfg_declare("tm", tm_cfg_def, &default_tm_cfg, cfg_sizeof(tm), &tm_cfg)) { LOG(L_ERR, "ERROR: mod_init: failed to declare the configuration\n"); return -1;

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: master Commit: 665489993dcb8b55970505d07cb7b46e383401ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6654899… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 26 12:46:27 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router * 'master' of ssh://janakj@git.sip-router.org/sip-router: makefiles: fix auto lib re-building script parsing: string switch support script engine: string switch optimization and fixup script engine: string switch execution rvalues: fix rval_new( empty string ) core: sint2str check for space before adding the sign ---

15 years, 10 months

Conversion of kamailio modules

by Jan Janak

Hello, I started converting kamailio modules yesterday, in the first step I'm trying to see if I can make them compile and load. I haven't tried to verify if they really work. Currently I can compile the following kamailio modules: acc auth auth_db auth_diameter auth_radius alias_db benchmark db_unixodbc carrierroute cfgutils db_berkeley db_flatstore db_mysql db_oracle db_postgres db_text db_unixodbc diversion exec h350 maxfwd misc_radius mi_xmlrpc pdt peering permissions pike regex rr sanity siputils speeddial sqlops statistics uri_db userblacklist xcap_client xlog There is 93 modules in kamailio repository, that means I can currently compile about 40% of them on the sip-router core. Most of the modules above required some manual changes, but not exteremely complicated. The biggest issue is extra stuff in kamalio core which is missing (or present on other modules) in the sip-router core. I created a new shared library called libkcore and whenever I find that something is missing in sip-router, I take it from kamailio and put it in the library. It's not that nice because there will be duplicated code, but I think we should first try to make everything compile and then we can think about how to organize the code better. Jan.

15 years, 10 months

md5 wrappers

by Jan Janak

Hello, I was wondering what is the purpose of wrappers like this one: /*! * \brief Small wrapper around MD5Update * * Small wrapper around MD5Update, because everybody uses this on 'str' types * \param context MD5 context * \param input input block * \param inputLen length of input block * \note please not use this in new code * \todo review and fix all wrong usage */ static inline void MD5Update (MD5_CTX *context, char *input, unsigned int inputLen) { return U_MD5Update(context, (unsigned char *)input, inputLen); } And this is U_MD5Update: void U_MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen) Jan.

15 years, 10 months

git:master: Merge commit 'origin/andrei/switch'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0c150104190692ce367cebd366f26b9ed25da6ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c15010… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 20 18:20:20 2009 +0100 Merge commit 'origin/andrei/switch' * commit 'origin/andrei/switch': script parsing: string switch support script engine: string switch optimization and fixup script engine: string switch execution rvalues: fix rval_new( empty string ) core: sint2str check for space before adding the sign ---

15 years, 10 months

git:master: makefiles: fix auto lib re-building

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 19c546113aa78e454ec0f995550fde51828fce81 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19c5461… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 24 21:04:21 2009 +0100 makefiles: fix auto lib re-building - libs used by modules where rebuilt too often (more then once during a make all) as a result of different DEFS for different modules (because of the different module interfaces and the new -DMOD_NAME). --- Makefile.rules | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index ea2190a..b03342f 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -27,12 +27,20 @@ # (if not rebuild everything) ifeq (,$(filter $(nodep_targets),$(MAKECMDGOALS))) -include makecfg.lst -ifneq ($(strip $(DEFS)), $(strip $(CFG_DEFS))) +# if trying to build a lib automatically and the lib is already compiled, +# don't rebuild it if the only differences in DEFS or INCLUDES are covered +# by LIB_NOREBUILD_DEFS/LIB_NOREBUILD_INCLUDES +LIB_NOREBUILD_DEFS+= -DMOD_NAME% -D%_MOD_INTERFACE -DMOD_INTERFACE_% -DSR_% + +# don't rebuild if the differences are covered by NOREBUILD_DEFS or +# NOREBUILD_INCLUDES +ifneq ($(filter-out $(NOREBUILD_DEFS),$(strip $(DEFS))), $(strip $(CFG_DEFS))) #$(warning different defs: <$(strip $(DEFS))> != ) #$(warning : <$(strip $(CFG_DEFS))>) $(shell rm -f makecfg.lst) endif -ifneq ($(strip $(INCLUDES)), $(strip $(CFG_INCLUDES))) +ifneq ($(filter-out $(NOREBUILD_INCLUDES), $(strip $(INCLUDES))),\ + $(strip $(CFG_INCLUDES))) $(shell rm -f makecfg.lst) endif endif @@ -95,7 +103,9 @@ ALL_LIBS+=$(foreach l, $(SER_LIBS), -L$(dir $l) -l$(notdir $l)) $(NAME): librpath.lst $(SER_LIBS_DEPS) $(SER_LIBS_DEPS): FORCE - $(MAKE) -wC $(dir $@) compile_for_install=$(lib_compile_for_install) + @$(MAKE) -wC $(dir $@) compile_for_install=$(lib_compile_for_install) \ + NOREBUILD_DEFS="$(NOREBUILD_DEFS) $(LIB_NOREBUILD_DEFS)" \ + NOREBUILD_INCLUDES="$(NOREBUILD_INCLUDES) $(LIB_NOREBUILD_INCLUDES)" .PHONY: FORCE FORCE: @@ -134,8 +144,10 @@ librpath.lst: $(ALLDEP) @echo LIB_RPATH_LST:=$(SER_RPATH_LST) >librpath.lst makecfg.lst: - @echo CFG_DEFS:=$(subst ',\', $(subst ",\", $(strip $(DEFS)))) >>$@ - @echo CFG_INCLUDES:=$(subst ',\', $(subst ",\", $(strip $(INCLUDES)))) >>$@ + @echo CFG_DEFS:=$(subst ',\', $(subst ",\", \ + $(filter-out $(NOREBUILD_DEFS), $(strip $(DEFS))))) >>$@ + @echo CFG_INCLUDES:=$(subst ',\', $(subst ",\", \ + $(filter-out $(NOREBUILD_INCLUDES), $(strip $(INCLUDES))))) >>$@ .PHONY: all all: $(NAME) modules

15 years, 10 months

git:andrei/switch: script parsing: string switch support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: 8c09d09b62681ae4e25709cd291796880dfb91e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c09d09… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 23:48:34 2009 +0100 script parsing: string switch support - switch() modified to work on string if the first case contains a string as the label - switch() support for regular expressions. Regular expression are prefixed by `/`. E.g.: switch("a"){ case / ""+"["+"a"+"bc" +"]" : log(1, "case a:a\n"); break; case "b": log(1, "case a:b\n"); break; } --- cfg.y | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 112 insertions(+), 12 deletions(-) diff --git a/cfg.y b/cfg.y index e1758bf..0ebb3a9 100644 --- a/cfg.y +++ b/cfg.y @@ -215,7 +215,11 @@ static struct socket_id* mk_listen_id2(struct name_lst*, int, int); static void free_name_lst(struct name_lst* lst); static void free_socket_id_lst(struct socket_id* i); -static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); +static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, + struct action* a, int* err); +static int case_check_type(struct case_stms* stms); +static int case_check_default(struct case_stms* stms); + %} @@ -1793,10 +1797,12 @@ ct_rval: rval_expr { $$=0; if (!rve_is_constant($1)){ yyerror("constant expected"); - }else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ + /* + } else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ yyerror("invalid expression (bad type)"); }else if (i_tmp!=RV_INT){ yyerror("invalid expression type, int expected\n"); + */ }else $$=$1; } @@ -1805,28 +1811,38 @@ single_case: CASE ct_rval COLON actions { $$=0; if ($2==0) yyerror ("bad case label"); - else if (($$=mk_case_stm($2, $4))==0){ - yyerror("internal error: memory allocation failure"); + else if ((($$=mk_case_stm($2, 0, $4, &i_tmp))==0) && (i_tmp==-10)){ + YYABORT; + } + } +| CASE SLASH ct_rval COLON actions { + $$=0; + if ($3==0) yyerror ("bad case label"); + else if ((($$=mk_case_stm($3, 1, $5, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } } | CASE ct_rval COLON { $$=0; if ($2==0) yyerror ("bad case label"); - else if (($$=mk_case_stm($2, 0))==0){ - yyerror("internal error: memory allocation failure"); + else if ((($$=mk_case_stm($2, 0, 0, &i_tmp))==0) && (i_tmp==-10)){ + YYABORT; + } + } + | CASE SLASH ct_rval COLON { + $$=0; + if ($3==0) yyerror ("bad case label"); + else if ((($$=mk_case_stm($3, 1, 0, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } } | DEFAULT COLON actions { - if (($$=mk_case_stm(0, $3))==0){ - yyerror("internal error: memory allocation failure"); + if ((($$=mk_case_stm(0, 0, $3, &i_tmp))==0) && (i_tmp=-10)){ YYABORT; } } | DEFAULT COLON { - if (($$=mk_case_stm(0, 0))==0){ - yyerror("internal error: memory allocation failure"); + if ((($$=mk_case_stm(0, 0, 0, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } } @@ -1854,6 +1870,12 @@ switch_cmd: $$=0; if ($2==0) yyerror("bad expression in switch(...)"); else if ($4==0) yyerror ("bad switch body"); + else if (case_check_default($4)!=0) + yyerror_at(&$2->fpos, "bad switch(): too many " + "\"default:\" labels\n"); + else if (case_check_type($4)!=0) + yyerror_at(&$2->fpos, "bad switch(): mixed integer and" + " string/RE cases not allowed\n"); else{ $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, $4); if ($$==0) { @@ -2910,15 +2932,52 @@ static void free_socket_id_lst(struct socket_id* lst) } -static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a) +/** create a temporary case statmenet structure. + * *err will be filled in case of error (return == 0): + * -1 - non constant expression + * -2 - expression error (bad type) + * -10 - memory allocation error + */ +static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, + struct action* a, int* err) { struct case_stms* s; + struct rval_expr* bad_rve; + enum rval_type type, bad_t, exp_t; + enum match_str_type t; + + t=MATCH_UNKNOWN; + if (ct){ + /* if ct!=0 => case, else if ct==0 is a default */ + if (!rve_is_constant(ct)){ + yyerror_at(&ct->fpos, "non constant expression in case"); + *err=-1; + return 0; + } + if (rve_check_type(&type, ct, &bad_rve, &bad_t, &exp_t)!=1){ + yyerror_at(&ct->fpos, "bad expression: type mismatch:" + " %s instead of %s at (%d,%d)", + rval_type_name(bad_t), rval_type_name(exp_t), + bad_rve->fpos.s_line, bad_rve->fpos.s_col); + *err=-2; + return 0; + } + if (is_re) + t=MATCH_RE; + else if (type==RV_STR) + t=MATCH_STR; + else + t=MATCH_INT; + } + s=pkg_malloc(sizeof(*s)); if (s==0) { - LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n"); + yyerror("internal error: memory allocation failure"); + *err=-10; } else { memset(s, 0, sizeof(*s)); s->ct_rve=ct; + s->type=t; s->actions=a; s->next=0; s->append=0; @@ -2926,6 +2985,47 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a) return s; } + +/* + * @return 0 on success, -1 on error. + */ +static int case_check_type(struct case_stms* stms) +{ + struct case_stms* c; + struct case_stms* s; + + for(c=stms; c ; c=c->next){ + if (!c->ct_rve) continue; + for (s=c->next; s; s=s->next){ + if (!s->ct_rve) continue; + if ((s->type!=c->type) && + !( (c->type==MATCH_STR || c->type==MATCH_RE) && + (s->type==MATCH_STR || s->type==MATCH_RE) ) ){ + yyerror_at(&s->ct_rve->fpos, "type mismatch in case"); + return -1; + } + } + } + return 0; +} + + +/* + * @return 0 on success, -1 on error. + */ +static int case_check_default(struct case_stms* stms) +{ + struct case_stms* c; + int default_no; + + default_no=0; + for(c=stms; c ; c=c->next) + if (c->ct_rve==0) default_no++; + return (default_no<=1)?0:-1; +} + + + /* int main(int argc, char ** argv) {

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev