diff --git a/cfg.lex b/cfg.lex index 95edfdb80e3..147f597c88b 100644 --- a/cfg.lex +++ b/cfg.lex @@ -605,23 +605,23 @@ IMPORTFILE "import_file" {ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } {AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } {MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +{ROUTE} { count(); routename=NULL; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +{ROUTE_REQUEST} { count(); routename=NULL; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +{ROUTE_ONREPLY} { count(); routename=NULL; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +{ROUTE_REPLY} { count(); routename=NULL; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +{ROUTE_FAILURE} { count(); routename=NULL; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +{ROUTE_BRANCH} { count(); routename=NULL; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +{ROUTE_SEND} { count(); routename=NULL; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +{ROUTE_EVENT} { count(); routename=NULL; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; } @@ -630,6 +630,7 @@ IMPORTFILE "import_file" {EVENT_RT_NAME} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; + routename=s_buf.s; memset(&s_buf, 0, sizeof(s_buf)); return EVENT_RT_NAME; } {RBRACK} { count();