diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-19 20:00:55 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-19 20:00:55 +0000 |
commit | 8c5155ecda086b64d6c58cd93af28a1e6bd4c33c (patch) | |
tree | 5635cceb3a8f198c28f08bc1b0ec860b91904e22 | |
parent | 73c599f3cee45b3225ecf5ab92dc05307c84d2de (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8288 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | ast_expr2.fl | 29 | ||||
-rw-r--r-- | ast_expr2.y | 40 | ||||
-rw-r--r-- | channels/chan_sip.c | 2 |
3 files changed, 53 insertions, 18 deletions
diff --git a/ast_expr2.fl b/ast_expr2.fl index 9e198e7b2..af9bdf4eb 100644 --- a/ast_expr2.fl +++ b/ast_expr2.fl @@ -1,4 +1,9 @@ %{ +/*! \file + * + * \brief Dialplan Expression Parser + */ + #include <sys/types.h> #include <stdio.h> #include <stdlib.h> @@ -44,7 +49,7 @@ struct parse_io void ast_yyset_column(int column_no, yyscan_t yyscanner); int ast_yyget_column(yyscan_t yyscanner); - +static int curlycount = 0; %} %option prefix="ast_yy" @@ -54,6 +59,7 @@ int ast_yyget_column(yyscan_t yyscanner); %option bison-bridge %option bison-locations %option noyywrap +%x var trail %% @@ -75,6 +81,8 @@ int ast_yyget_column(yyscan_t yyscanner); \:\: { SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;} \( { SET_COLUMNS; SET_STRING; return TOK_LP;} \) { SET_COLUMNS; SET_STRING; return TOK_RP;} +\$\{ {/* gather the contents of ${} expressions, with trailing stuff, into a single TOKEN. They are much more complex now than they used to be */ + curlycount = 0; BEGIN(var); yymore();} [ \r] {} \"[^"]*\" {SET_COLUMNS; SET_STRING; return TOKEN;} @@ -83,7 +91,14 @@ int ast_yyget_column(yyscan_t yyscanner); [0-9]+ { SET_COLUMNS; /* the original behavior of the expression parser was to bring in numbers as a numeric string */ SET_NUMERIC_STRING; return TOKEN;} -[a-zA-Z0-9,.';{}\\_^%$#@!]+ {SET_COLUMNS; SET_STRING; return TOKEN;} +[a-zA-Z0-9,.';\\_^%$#@!]+ {SET_COLUMNS; SET_STRING; return TOKEN;} + +<var>[^{}]*\} {curlycount--; if(curlycount < 0){ BEGIN(trail); yymore();} else { yymore();}} +<var>[^{}]*\{ {curlycount++; yymore(); } +<trail>[^-\t\r \n$():?%/+=*<>!|&]* {BEGIN(0); SET_COLUMNS; SET_STRING; return TOKEN;} +<trail>[-\t\r \n$():?%/+=*<>!|&] {char c = yytext[yyleng-1]; BEGIN(0); unput(c); SET_COLUMNS; SET_STRING; return TOKEN;} +<trail>\$\{ {curlycount = 0; BEGIN(var); yymore(); } +<trail><<EOF>> {BEGIN(0); SET_COLUMNS; SET_STRING; return TOKEN; /* actually, if an expr is only a variable ref, this could happen a LOT */} %% @@ -130,6 +145,7 @@ int ast_expr(char *expr, char *buf, int length) ast_copy_string(buf, io.val->u.s, length); #endif /* STANDALONE */ return_value = strlen(buf); + free(io.val->u.s); } free(io.val); } @@ -144,15 +160,6 @@ int ast_yyerror (const char *s, yyltype *loc, struct parse_io *parseio ) int i=0; spacebuf[0] = 0; -#ifdef WHEN_LOC_MEANS_SOMETHING - if( loc->first_column > 7990 ) /* if things get out of whack, why crash? */ - loc->first_column = 7990; - if( loc->last_column > 7990 ) - loc->last_column = 7990; - for(i=0;i<loc->first_column;i++) spacebuf[i] = ' '; - for( ;i<loc->last_column;i++) spacebuf[i] = '^'; - spacebuf[i] = 0; -#endif for(i=0;i< (int)(yytext - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);i++) spacebuf2[i] = ' '; /* uh... assuming yyg is defined, then I can use the yycolumn macro, which is the same thing as... get this: yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]->yy_bs_column diff --git a/ast_expr2.y b/ast_expr2.y index 15da7ecb8..ef3289bc1 100644 --- a/ast_expr2.y +++ b/ast_expr2.y @@ -124,7 +124,12 @@ int ast_yyerror(const char *,YYLTYPE *, struct parse_io *); some useful info about the error. Not as easy as it looks, but it is possible. */ #define ast_yyerror(x) ast_yyerror(x,&yyloc,parseio) - +#define DESTROY(x) { \ +if ((x)->type == AST_EXPR_numeric_string || (x)->type == AST_EXPR_string) \ + free((x)->u.s); \ + (x)->u.s = 0; \ + free(x); \ +} %} %pure-parser @@ -158,69 +163,91 @@ extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t)); %% start: expr { ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); - ((struct parse_io *)parseio)->val->type = $$->type; - if( $$->type == AST_EXPR_integer ) - ((struct parse_io *)parseio)->val->u.i = $$->u.i; + ((struct parse_io *)parseio)->val->type = $1->type; + if( $1->type == AST_EXPR_integer ) + ((struct parse_io *)parseio)->val->u.i = $1->u.i; else - ((struct parse_io *)parseio)->val->u.s = $$->u.s; } + ((struct parse_io *)parseio)->val->u.s = $1->u.s; + free($1); + } ; expr: TOKEN { $$= $1;} | TOK_LP expr TOK_RP { $$ = $2; @$.first_column = @1.first_column; @$.last_column = @3.last_column; - @$.first_line=0; @$.last_line=0;} + @$.first_line=0; @$.last_line=0; + DESTROY($1); DESTROY($3); } | expr TOK_OR expr { $$ = op_or ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_AND expr { $$ = op_and ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_EQ expr { $$ = op_eq ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_GT expr { $$ = op_gt ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_LT expr { $$ = op_lt ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_GE expr { $$ = op_ge ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_LE expr { $$ = op_le ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_NE expr { $$ = op_ne ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_PLUS expr { $$ = op_plus ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_MINUS expr { $$ = op_minus ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | TOK_MINUS expr %prec TOK_COMPL { $$ = op_negate ($2); + DESTROY($1); @$.first_column = @1.first_column; @$.last_column = @2.last_column; @$.first_line=0; @$.last_line=0;} | TOK_COMPL expr { $$ = op_compl ($2); + DESTROY($1); @$.first_column = @1.first_column; @$.last_column = @2.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_MULT expr { $$ = op_times ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_DIV expr { $$ = op_div ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_MOD expr { $$ = op_rem ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_COLON expr { $$ = op_colon ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_EQTILDE expr { $$ = op_eqtilde ($1, $3); + DESTROY($2); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} | expr TOK_COND expr TOK_COLONCOLON expr { $$ = op_cond ($1, $3, $5); + DESTROY($2); + DESTROY($4); @$.first_column = @1.first_column; @$.last_column = @3.last_column; @$.first_line=0; @$.last_line=0;} ; @@ -281,6 +308,7 @@ free_value (struct val *vp) } if (vp->type == AST_EXPR_string || vp->type == AST_EXPR_numeric_string) free (vp->u.s); + free(vp); } diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b5b5ae148..eb54fd97d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12282,7 +12282,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int } } else if (!strcasecmp(v->name, "accountcode")) { ast_copy_string(peer->accountcode, v->value, sizeof(peer->accountcode)); - } else if (!strcasecmp(v->name, "musiconhold")) { + } else if (!strcasecmp(v->name, "musicclass") || !strcasecmp(v->name, "musiconhold")) { ast_copy_string(peer->musicclass, v->value, sizeof(peer->musicclass)); } else if (!strcasecmp(v->name, "mailbox")) { ast_copy_string(peer->mailbox, v->value, sizeof(peer->mailbox)); |