sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:andrei/switch: script parsing: string switch support
by Andrei Pelinescu-Onciul 24 Feb '09

24 Feb '09

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) {

5 17

Compiling sip-router with ser modules
by Jan Janak 24 Feb '09

24 Feb '09

Hello Few days ago Andrei setup another repository called ser_modules on git.sip-router.org, see http://git.sip-router.org/cgi-bin/gitweb.cgi?p=ser_modules;a=summary This is a repository which contains all SER modules except tm. The repository is synchronized with cvs and receives commits from cvs on 'cvs-head' branch. I just created another branch called 'updated' in the repository and commited updates to all the modules (created mostly with ser-to-sh script) to make them compile with the sip-router core. In other words, we just reached another important milestone. We are now able to compile all (well, almost) SER modules with the sip-router core and thus we are almost ready to replace the core of ser with the new and merged sip-router core and start using/testing it. You can try to compile and use it yourself: 1) git clone git://git.sip-router.org/sip-router 2) git remote add ser_modules git://git.sip-router.org/ser_modules 3) git fetch ser_modules 4) git merge ser_modules/updated 5) make config mode=debug exclude_modules="mysql postgres dbtext jabber oracle flatstore lcr ldap osp" 6) make all And if everything goes well, you should have the sip-router core and all ser modules compiled and ready to use in your working directory. Jan.

3 2

dokuwiki update
by Jan Janak 20 Feb '09

20 Feb '09

Hello, I updated dokuwiki version running at http://sip-router.org/wiki to 2009-02-14. While I was at it I also changed the page template and added a siderbar containing the navigation tree consisting of all pages. Jan.

1 0

git:master: Merge branch 'ser_core_cvs'
by Andrei Pelinescu-Onciul 20 Feb '09

20 Feb '09

Module: sip-router Branch: master Commit: a07e7447c3a3c4c51ffbec8b465a623d9728b841 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a07e744… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 20 17:22:16 2009 +0100 Merge branch 'ser_core_cvs' * ser_core_cvs: 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 Conflicts: action.c cfg.y cfg_core.c cfg_core.h dprint.h - updated to the new logging api from ser, while keeping the kamailio compatibility macros and CRIT(). usr_avp.h ---

1 0

commit mail limit changes
by Andrei Pelinescu-Onciul 20 Feb '09

20 Feb '09

I've changed the commit limit for separate mail messages vs. one big mail containing all the commits. Now if you "push" more then 15 commits, only one message will be sent to the mailing list (containing all the commits). If you "push" less then 15, then for each commit a separate mail message will be sent. The previous limit was 100 (which IMHO produced too many separate messages when kamailio or ser modules were merged). Andrei

1 0

New commits on branch ser_core_cvs
by Andrei Pelinescu-Onciul 20 Feb '09

20 Feb '09

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d2d401… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 16 17:20:17 2009 +0000 tcp: fix compilation problem on solaris (FIONREAD) - on solaris include <sys/filio.h> if present, else define BSD_COMP before including ioctl.h. Reported-by: Vance Shipley vances at motivity ca. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f3449b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 16 15:35:56 2009 +0000 core: fix bad level name in new LOG() - the syslog LOG_() used log_level_info[(level)].name (which produced a wrong log level) instead of LOG_LEVEL2NAME(level) - coding style fixes ( lines < 80 chars) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=611a9ba… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Jan 28 14:49:55 2009 +0000 t_check_status() checks also the blind UACs if t_pick_branch() fails to determine the picked branch in failure_route. Closes SER-434. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=259b61e… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Jan 20 12:45:20 2009 +0000 Documenting t_lookup_cancel() script function. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd0668e… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Jan 20 10:38:50 2009 +0000 Removing set_t() from t_lookup_cancel() function, and introducing an optional parameter. See the bug report SER-432. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19e6b61… Author: Michal Matyska <michal.matyska(a)iptel.org> Date: Mon Jan 19 15:47:25 2009 +0000 updated udp_mtu handling code - fixes SER-433 - call apply lumps with the original send_info, so the lumps are generated the same way their length was calculated, so there is no buffer overflow. - this has also the expected and wanted side-effect that the record route is done as the outgoing path would be UDP (do not insert double record-route header) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4043c62… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jan 16 09:47:58 2009 +0000 documenting t_is_expired() function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de4df2a… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jan 16 09:24:49 2009 +0000 t_is_expired() script function is introduced. It returns true if the transaction lifetime timer has already been expired. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf79b58… Author: Ondrej Martinek <ondra(a)iptel.org> Date: Tue Jan 6 17:14:12 2009 +0000 * logging API updated (see doc/logging-api.txt for details) - LOG(LEVEL, FMT, ARGS...) and the short macro corresponding to LEVEL level made eqvivalent (eg. LOG(L_DBG, FMT, ARGS...) and DBG(FMT, ARGS...) prints always the same message) - changed the format of log messages produced by the macros to include the log level, module name, filename, line (if applicable) - added new, internal LOG_(LEVEL, PREFIX, FORMAT, ARGS...) macro - removed DPrint() and DEBUG() macros, L_DEFAULT log level and dprint() function !!! !!! IMPORTANT! READ ME! !!! These changes (mainly the first two) require reformating of the most log messages in SER core and module source files. This step can be done automatically by running "scripts/logging/fix-logs-all" script BUT it was NOT originally performed because it would have generated too many changes in CVS which was discouraged by Andrei. Instead, the developers are expected to run it when ready. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03b7bce… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Mon Jan 5 21:32:26 2009 +0000 - AS support disabled by default. - added forgotten define guards for a mem free specific to AS support code only. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d65cdd3… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Mon Jan 5 21:26:44 2009 +0000 When building the route set of ACKs for local UACs, only the reply is now evaluated; this is insufficient, since replies to in-dialog requests normally miss the route set. The patch fixes that: evals INVITE, if this was in-dialog; otherwise, the reply (since the req. doesn't have yet complete route set). Add support for the SASI if'ace, adding the implemenation for two more TM API functions: - t_get_canceled_ident(): returns the hash coordinates (bucket/index) of the transaction the currently processed CANCEL is targeting - ack_local_uac(): allow generating the ACKs for 2xx'ed locally originated INVITEs - new headers and body can now also be appended to it. Fully closes #SER-346. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5137b02… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 15:34:54 2009 +0000 In case the AVP is a regexp, an allocation is required to build an AVP "ident". The patch adds the functionality to free it. Closes #SER-344. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eddf3e3… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 15:27:39 2009 +0000 Currently, SER matches E2E ACKs only if there is an equality between From HF in INVITE and ACK. While this is pretty safe, there are UAs that do mess small things, like display name, or some bigger ones, like URI, in generated ACK. However, matching over the full URI (or worse, HF) is not needed and was even intended for deprecation (see 1st comment of 3261#Sec. 12.2.1.1). The applied patch should boost a bit the matching flexibility - only compare the tag. Closes #SER-419. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=713d776… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 15:02:11 2009 +0000 The calculate_routeset_length() produces an invalid result in the case dlg_t.hooks.last_route is set (and .first_route not). Applied patch fixes that (and should hopefully be a bit cleaner). Closes #SER-421. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f92150… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 14:58:36 2009 +0000 'memapp' and 'append_mem_block' are now both only used in source t_msgbuilder.c. Applied patch removes the definition of both from .h.: memapp moved to .c, append_mem_block only left in .c. (Interestingly, gcc complained over different definitions, but accepted same definition twice, for same identifier.) Closes #SER-422. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c711622… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 14:52:42 2009 +0000 "Route :" prefix (and separator) is used some more time across the source. It was defined 3 times (with a small variation). Applied patch moves the definition to global config.h. Closes #SER-420. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f62c96d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 18 16:09:16 2008 +0000 script: udp_mtu fallback script config & commands new config variables: - udp_mtu = number - size in bytes after which fallback to another protocol will be attempted. Default 0 (off), recommended 1300. - udp_mtu_try_proto = TCP|TLS|SCTP|UDP - protocol to fallback to. Default: UDP (off). - force_rport = yes|no - global force_rport(). new script commands: - udp_mtu_try_proto(TCP|TLS|SCTP|UDP) - like udp_mtu_try_proto above but works on a per packet basis and not globally. Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf8dfee… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 18 16:06:03 2008 +0000 core: forward: tcp fallback for big udp packets - support for tcp, tls or sctp fallback for udp forwarded requests that end up bigger then udp_mtu (configurable, disabled by default). For such messages only the Via is changed (for example the original built for udp Record-Route is kept untouched so that subsequent messages in the dialog will use udp if smaller then udp_mtu). - udp_mtu and udp_mtu_try_proto (fallback proto) can be changed at runtime via the cfg framework (e.g. sercmd cfg.set_now_int core udp_mtu 1300; cfg.set_now_int core udp_mtu_try_proto 2 ) - force_rport can now be set globally using the config framework (e.g. sercmd cfg.set_now_int core force_rport 1 ) Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>

1 0

Wiki adjustments
by Dmitry Semyonov 20 Feb '09

20 Feb '09

Hi all, I suggest to enable the following configuration options for the SIP-Router wiki: $conf['breadcrumbs'] = 7; //how many recent visited pages to show $conf['rss_content'] = 'diff'; The former one adds 'Trace:' line near 'You are here:' one with links to recently visited pages. The latter one makes RSS feeds more useful (IMHO) -- they start showing what was actually changed. -- ...Bye..Dmitry.

2 1

git:andrei/switch: script engine: string switch execution
by Andrei Pelinescu-Onciul 19 Feb '09

19 Feb '09

Module: sip-router Branch: andrei/switch Commit: cfeefb4a0564d4b08cdbe33477a8a3e8c498f357 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfeefb4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 23:38:37 2009 +0100 script engine: string switch execution - support for matching strings and regular expressions in a string switch (MATCH_T). --- action.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ route_struct.h | 4 +- switch.h | 32 +++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 079bbfe..cf7ac9c 100644 --- a/action.c +++ b/action.c @@ -116,6 +116,11 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct switch_cond_table* sct; struct switch_jmp_table* sjt; struct rval_expr* rve; + struct match_cond_table* mct; + struct rvalue* rv; + struct rvalue* rv1; + struct rval_cache c1; + str s; /* reset the value of error to E_UNSPEC so avoid unknowledgable @@ -907,6 +912,68 @@ sw_jt_def: returns passthrough */ } break; + case MATCH_COND_T: + mct=(struct match_cond_table*)a->val[1].u.data; + rval_cache_init(&c1); + rv=0; + rv1=0; + ret=rval_expr_eval_rvint(h, msg, &rv, &v, + (struct rval_expr*)a->val[0].u.data, &c1); + + if (unlikely( ret<0)){ + /* handle error in expression => use default */ + ret=-1; + goto match_cond_def; + } + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break + in expr */ + if (likely(rv)){ + rv1=rval_convert(h, msg, RV_STR, rv, &c1); + if (unlikely(rv1==0)){ + ret=-1; + goto match_cond_def; + } + s=rv1->v.s; + }else{ + /* int result in v */ + rval_cache_clean(&c1); + s.s=sint2str(v, &s.len); + } + ret=1; /* default is continue */ + for(i=0; i<mct->n; i++) + if (( mct->match[i].type==MATCH_STR && + mct->match[i].l.s.len==s.len && + memcmp(mct->match[i].l.s.s, s.s, s.len) == 0 ) || + ( mct->match[i].type==MATCH_RE && + regexec(mct->match[i].l.regex, s.s, 0, 0, 0) == 0) + ){ + if (likely(mct->jump[i])){ + ret=run_actions(h, mct->jump[i], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + goto match_cleanup; + } +match_cond_def: + if (mct->def){ + ret=run_actions(h, mct->def, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } +match_cleanup: + if (rv1){ + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + }else if (rv){ + rval_destroy(rv); + rval_cache_clean(&c1); + } + break; case WHILE_T: i=0; flags=0; diff --git a/route_struct.h b/route_struct.h index 85242af..888fadf 100644 --- a/route_struct.h +++ b/route_struct.h @@ -71,7 +71,7 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, IF_T, SWITCH_T /* only until fixup*/, - BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, WHILE_T, + BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, MATCH_COND_T, WHILE_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, @@ -99,7 +99,7 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, SELECT_ST, PVAR_ST, LVAL_ST, RVE_ST, RETCODE_ST, CASE_ST, - BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST + BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST }; /* run flags */ diff --git a/switch.h b/switch.h index e92cbad..a598a07 100644 --- a/switch.h +++ b/switch.h @@ -27,15 +27,24 @@ #ifndef __switch_h #define __switch_h +#include <regex.h> + #include "route_struct.h" + struct case_stms{ struct rval_expr* ct_rve; struct action* actions; struct case_stms* next; struct case_stms** append; - int int_label; + int type; /**< type: MATCH_UNKOWN, MATCH_INT, MATCH_STR, MATCH_RE */ + int re_flags; /**< used only for REs */ int is_default; + union { + int match_int; + str match_str; + regex_t* match_re; + } label; /**< fixed case argument */ }; @@ -43,7 +52,7 @@ struct switch_cond_table{ int n; /**< size */ int* cond; /**< int labels array */ struct action** jump; /**< jump points array */ - struct action* def; /**< default jump */ + struct action* def; /**< default jump */ }; @@ -54,6 +63,25 @@ struct switch_jmp_table{ struct switch_cond_table rest; /**< normal cond. table for the rest */ }; + +enum match_str_type { MATCH_UNKNOWN, MATCH_INT, MATCH_STR, MATCH_RE }; + +struct match_str{ + enum match_str_type type;/**< string or RE */ + int flags; /**< flags for re */ + union{ + str s; /* string */ + regex_t* regex; /**< compiled regex */ + }l; +}; + +struct match_cond_table{ + int n; /**< size */ + struct match_str* match; /**< match array */ + struct action** jump; /**< jump points array */ + struct action* def; /**< default jmp */ +}; + int fix_switch(struct action* t); #endif /*__switch_h*/

1 0

git:andrei/switch: core: sint2str check for space before adding the sign
by Andrei Pelinescu-Onciul 19 Feb '09

19 Feb '09

Module: sip-router Branch: andrei/switch Commit: b660455a30f075efae5b0dcb082260d3ae240324 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b660455… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 19:17:13 2009 +0100 core: sint2str check for space before adding the sign --- ut.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ut.h b/ut.h index 013f963..be79f5d 100644 --- a/ut.h +++ b/ut.h @@ -312,7 +312,7 @@ static inline char* sint2str(long l, int* len) l = -l; } p = int2str((unsigned long)l, len); - if(sign) { + if(sign && *len<(INT2STR_MAX_LEN-1)) { *(--p) = '-'; if (len) (*len)++; }

1 0

git:andrei/switch: script engine: string switch optimization and fixup
by Andrei Pelinescu-Onciul 19 Feb '09

19 Feb '09

Module: sip-router Branch: andrei/switch Commit: cd26bc545339bc351f5a1bcec370adbaccc9c331 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd26bc5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 23:47:10 2009 +0100 script engine: string switch optimization and fixup - fixup and optimize (if constant) string switches --- switch.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 337 insertions(+), 4 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cd2…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009