#
# Given a bnf like grammar generate a parser for text based tvbs
#
-# $Id $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
$parser->YYData->{DATA}=\$linenum;
-my $parser_info = $parser->YYParse(yylex => \&next_token, yyerror => \&error_sub); #yydebug => 0x1f
+my $parser_info = $parser->YYParse(yylex => \&next_token, yyerror => \&error_sub);#,yydebug => 0x1f);
die "failed parsing" unless defined $parser_info;
my $proto_name = ${$parser_info}{proto_name};
my $upper_name = $proto_name;
$upper_name =~ tr/a-z/A-Z/;
+my $global_struct = "$proto_name\_tpg_data";
warn "parser_data_type: ${$parser_info}{pdata}\n" if $DEBUG;
my $field_num = 0;
-my $init_function = "void tpg_$proto_name\_init(void) {\n";
+my $tt_type = ${$parser_info}{pdata};
+
+$tt_type =~ s/\n#line.*?\n//ms;
+$tt_type =~ s@\n/\*eocode\*/\n@@ms;
+
+my $init_function_hfs = "\n/* initialize hfids */\n";
+my $init_function_etts = "\n/* initialize etts */\n";
+my $init_function_wanted_decl = "\n/* declare private wanted elements */\n";
+my $init_function_wanted = "\n/* initialize wanted elements */\n";
+my $callback_definitions = "\n/* callback definitions */\n";
+my $datastruct_ett = "\n/* etts */\n";
+my $datastruct_hf = "\n/* hfis */\n";
+my $datastruct_wanted = "\n/* wanted elems */\n";
+
+my $hfarr = "/* field array */\n#define HF_$upper_name\_PARSER \\\n";
+my $ett_arr = "#define ETT_$upper_name\_PARSER \\\n";
for my $fieldname (keys %{${$parser_info}{fields}}) {
my $f = ${${$parser_info}{fields}}{$fieldname};
my $vs = defined ${$f}{vs} ? 'VALS(' . ${$f}{vs}. ')' : "NULL" ;
- ${$f}{vname} = "$proto_name\_hfis.${$f}{name}" unless defined ${$f}{vname};
+ ${$f}{vname} = "$global_struct.hf_${$f}{name}" unless defined ${$f}{vname};
${$f}{base} = 'BASE_NONE' unless defined ${$f}{base};
${$f}{desc} = '""' unless defined ${$f}{desc};
- ${$f}{structname} .= "\tint ${$f}{name};\n";
- $init_function .= "\t${$f}{vname} = -1;\n";
- ${$f}{hfi} .= "{ &${$f}{vname}, { ${$f}{pname}, ${$f}{abbr}, ${$f}{type}, ${$f}{base}, $vs, 0x0, ${$f}{desc}, HFILL }},";
+ $datastruct_hf .= "\tint hf_${$f}{name};\n";
+ $init_function_hfs .= "\t${$f}{vname} = -1;\n";
+ $hfarr .= "{ &${$f}{vname}, { ${$f}{pname}, ${$f}{abbr}, ${$f}{type}, ${$f}{base}, $vs, 0x0, ${$f}{desc}, HFILL }},\\\n";
# warn "\nFIELD:$fieldname " . V2P::var2perl($f);
}
-my $tt_type = ${$parser_info}{pdata};
+$hfarr =~ s/,\\\n$/\n/msi;
-$tt_type =~ s/\n#line.*?\n//ms;
-$tt_type =~ s@\n/\*eocode\*/\n@@ms;
-my $ett_arr = "#define ETT_$upper_name\_PARSER \\\n";
-my $ett_decl = '';
-my $ett_init = '';
for my $rulename ( keys %{${$parser_info}{rules}} ) {
my $r = ${${$parser_info}{rules}}{$rulename};
+# warn "\nRULE BEFORE:$rulename " . V2P::var2perl($r);
+
make_rule($r,0);
-
-# warn "\nRULE:$rulename " . V2P::var2perl($r);
-}
-$ett_arr =~ s/,\\\n$//ms;
+# warn "\nRULE AFTER:$rulename " . V2P::var2perl($r);
-my $hfarr = "/* field array */\n#define HF_$upper_name\_PARSER \\\n";
-my $hfstruct = "struct _$proto_name\_hfis_t {\n";
-for my $fieldname (sort keys %{${$parser_info}{fields}}) {
- my $f = ${${$parser_info}{fields}}{$fieldname};
- $hfarr .= ${$f}{hfi} . "\\\n";
- $hfstruct .= ${$f}{structname} ;
}
-$hfstruct .= $ett_decl . "};";
-$hfarr =~ s/,\\\n$/\n/msi;
-my $c_file = '';
-my $h_file = '';
+$ett_arr =~ s/,\\\n$//ms;
-$c_file .= <<"__C_HEAD";
-/*
- $proto_name-parser.c
- automagically generated by $0 from $ARGV
- DO NOT MODIFY.
-*/
+for my $rulename (sort keys %{${$parser_info}{rules}} ) {
+ my $r = ${${$parser_info}{rules}}{$rulename};
+
+
+ $callback_definitions .= "\n\n/* callback definitions for rule $rulename */\n";
+ $callback_definitions .= ${$r}{before_cb_code} . "\n";
+ $callback_definitions .= ${$r}{after_cb_def} . "\n";
+ $init_function_wanted .= ${$r}{definition_code} . "\n\n";
+}
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "$proto_name-parser.h"
-/* begin %head */
-${$parser_info}{head}
-/* end %head */
-__C_HEAD
-$h_file .= <<"__H_HEAD";
+my $h_file = <<"__H_HEAD";
/*
$proto_name-parser.h
automagically generated by $0 from $ARGV
${$parser_info}{header_head}
/* end %header_head */
-extern void tpg_$proto_name\_init(void);
+extern void tpg_${proto_name}_init(void);
-__H_HEAD
+struct _${proto_name}_tpg_data_t {
+$datastruct_ett
+$datastruct_hf
+$datastruct_wanted
+};
-$h_file .= "\n/* hfids export container */\n$hfstruct\n";
-$h_file .= "\n/* hfids container */\nextern struct _$proto_name\_hfis_t $proto_name\_hfis;\n\n";
-$h_file .= $hfarr . "\n\n" . $ett_arr ."\n\n";
+extern struct _${global_struct}_t $global_struct;
-$c_file .= "\n/* hfids container */\nstruct _$proto_name\_hfis_t $proto_name\_hfis;\n\n";
-$h_file .= "/* parser declarations */\n";
-$c_file .= "/* parser declarations */\n";
+$hfarr
-for my $rulename (sort keys %{${$parser_info}{rules}} ) {
- my $r = ${${$parser_info}{rules}}{$rulename};
-
- if (exists $exports{$rulename}) {
- $h_file .= ${$r}{declaration_code};
- } else {
- $c_file .= ${$r}{declaration_code};
- }
-}
-$c_file .= "\n\n/* parser definitions */\n";
+$ett_arr
-for my $rulename (sort keys %{${$parser_info}{rules}} ) {
- my $r = ${${$parser_info}{rules}}{$rulename};
-
-
- $c_file .= "\n\n/* definitions for rule $rulename */\n";
- $c_file .= ${$r}{before_cb_code} . "\n";
- $c_file .= ${$r}{after_cb_def} . "\n";
- $c_file .= ${$r}{definition_code} . "\n\n";
-}
+#endif
+__H_HEAD
-$h_file .= <<"__H_TAIL";
-/* begin %header_tail */
-${$parser_info}{header_tail}
-/* end %header_tail */
+my $c_file = <<"__C_FILE";
+/*
+ $proto_name-parser.c
+ automagically generated by $0 from $ARGV
+ DO NOT MODIFY.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-#endif /* _H_$upper_name\_PARSER */
-__H_TAIL
+#include "$proto_name-parser.h"
-$c_file .= <<"__C_TAIL";
+/* begin %head */
+${$parser_info}{head}
+/* end %head */
-$init_function
-$ett_init
+/* hfids container */
+
+struct _${proto_name}_tpg_data_t $global_struct;
+
+
+$callback_definitions
+/* end callback definitions */
+
+void tpg_$proto_name\_init(void) {
+ $init_function_wanted_decl
+ $init_function_hfs
+ $init_function_etts
+ $init_function_wanted
}
/* begin %tail */
${$parser_info}{tail}
/* end %tail */
-__C_TAIL
+__C_FILE
my $c_buf = '';
my $c_line = 3;
if ($dd == 0) {
my %VARS = ();
-
- if (exists $exports{${$r}{name}}) {
- ${$r}{definition_code} = 'extern ';
- ${$r}{declaration_code} = '' ;
- } else {
- ${$r}{definition_code} = 'static ';
- ${$r}{declaration_code} = 'static ';
- }
- ${$code} .= "tvbparse_wanted_t* wanted_$proto_name\_${$r}{name}(void) {\n\treturn ";
- ${$r}{declaration_code} .= "tvbparse_wanted_t* wanted_$proto_name\_${$r}{name}(void);\n";
+ if ( exists $exports{${$r}{name}}) {
+ ${$code} = "\t$global_struct.";
+ $datastruct_wanted .= "\ttvbparse_wanted_t* wanted_$proto_name\_${$r}{name};\n"
+ } else {
+ ${$code} = "\t";
+ $init_function_wanted_decl .= "\tstatic tvbparse_wanted_t* wanted_$proto_name\_${$r}{name};\n"
+ }
+
+ ${$code} .= "wanted_$proto_name\_${$r}{name} = ";
$VARS{"TT_DATA"} = "TPG_DATA(tpg,$tt_type)" if defined $tt_type;
if (length $tree_code_body ) {
my $cb_name = ${$r}{before_cb_name} = "${$r}{name}\_before_cb";
- ${$r}{before_cb_code} = "static void $cb_name(void* tpg _U_, const void* wd _U_, struct _tvbparse_elem_t* elem _U_) {\n$tree_code_head\n$tree_code_body\n}";
+ ${$r}{before_cb_code} = "static void $cb_name(void* tpg _U_, const void* wd _U_, struct _tvbparse_elem_t* elem _U_) {\n\tproto_item* pi;\n$tree_code_head\n$tree_code_body\n}";
${$r}{code} .= $tree_code_after;
}
${$code} .= $indent . "tvbparse_casestring($rule_id,$control,$wd_data,$before_fn,$after_fn)";
} elsif (${$r}{type} eq 'named') {
-
- ${$code} .= $indent . "wanted_$proto_name\_$control()";
-
+ if(exists $exports{$control}) {
+ ${$code} .= $indent . "tvbparse_handle(&$global_struct.wanted_$proto_name\_$control)";
+ } else {
+ ${$code} .= $indent . "tvbparse_handle(&wanted_$proto_name\_$control)";
+ }
} elsif (${$r}{type} eq 'seq') {
${$code} .= $indent . "tvbparse_set_seq($rule_id,$wd_data,$before_fn,$after_fn,\n";
${$code} .= $indent . " NULL)"
} elsif (${$r}{type} eq 'until') {
+
+ ${$r}{inc_mode} = 'TP_UNTIL_SPEND' unless defined ${$r}{inc_mode};
+
${$code} .= $indent ."tvbparse_until(0,$wd_data,$before_fn,$after_fn,\n";
$dd++;
- ${$code} .= $indent_more . make_rule(${$r}{subrule},$dd) . ", TRUE)";
+ ${$code} .= $indent_more . make_rule(${$r}{subrule},$dd) . ", ${$r}{inc_mode})";
$dd--;
}
}
if ($dd == 0) {
- ${$code} .= ";\n}\n";
+ ${$code} .= ";\n";
# warn "RULE::${$r}{name} " . V2P::var2perl($r);
}
my $v = shift;
my $r = shift;
my $base = shift;
-
+
if (exists ${$r}{var}) {
${$v}{${$r}{var}} = $base;
}
if (exists ${$r}{tree}) {
$root_var = "root_$fieldname";
- ${$head} .= "\tproto_item* $root_var;\n";
+ ${$head} .= "\tproto_item* $root_var;\n\n";
${$body} .= "\t$root_var = ";
- $ett_arr .= "\t&$proto_name\_hfis.ett_$fieldname,\\\n";
- $ett_decl .= "\tguint ett_$fieldname; \n";
- $ett_init .= "\t$proto_name\_hfis.ett_$fieldname = -1;\n";
- ${$r}{ett} = "$proto_name\_hfis.ett_$fieldname";
+ $ett_arr .= "\t&$global_struct.ett_$fieldname,\\\n";
+ $datastruct_ett .= "\tguint ett_$fieldname; \n";
+ $init_function_etts .= "\t$global_struct.ett_$fieldname = -1;\n";
+ ${$r}{ett} = "$global_struct.ett_$fieldname";
} else {
${$body} .= "\t";
}
+
if (${$f}{type} eq 'FT_STRING') {
- ${$body} .= "TPG_ADD_STRING(tpg,${$f}{vname},$elem);\n";
+ ${$body} .= "\tpi = TPG_ADD_STRING(tpg,${$f}{vname},$elem);\n";
} elsif (${$f}{type} =~ /^FT_UINT/) {
my $fieldvar = "tpg_uint_$fieldname";
${$head} .= "\tguint $fieldvar = TPG_UINT($elem);\n";
- ${$body} .= "TPG_ADD_UINT(tpg,${$f}{vname},$elem,$fieldvar);\n";
+ ${$body} .= "\tpi = TPG_ADD_UINT(tpg,${$f}{vname},$elem,$fieldvar);\n";
} elsif (${$f}{type} =~ /^FT_INT/) {
my $fieldvar = "tpg_int_$fieldname";
${$head} .= "\tgint $fieldvar = TPG_INT($elem);\n";
- ${$body} .= "TPG_ADD_INT(tpg,${$f}{vname},$elem,$fieldvar);\n";
+ ${$body} .= "\tpi = TPG_ADD_INT(tpg,${$f}{vname},$elem,$fieldvar);\n";
} elsif (${$f}{type} eq 'FT_IPV4') {
my $fieldvar = "tpg_ipv4_$fieldname";
${$head} .= "\tguint32 $fieldvar = TPG_IPV4($elem);\n";
- ${$body} .= "TPG_ADD_IPV4(tpg,${$f}{vname},$elem,$fieldvar);\n";
+ ${$body} .= "\tpi = TPG_ADD_IPV4(tpg,${$f}{vname},$elem,$fieldvar);\n";
} elsif (${$f}{type} eq 'FT_IPV6') {
my $fieldvar = "tpg_ipv6_$fieldname";
${$head} .= "\tguint8* $fieldvar = TPG_IPV6($elem);\n";
- ${$body} .= "TPG_ADD_IPV6(tpg,${$f}{vname},$elem,$fieldvar);\n";
+ ${$body} .= "\tpi = TPG_ADD_IPV6(tpg,${$f}{vname},$elem,$fieldvar);\n";
} else {
- ${$body} .= "TPG_ADD_TEXT(tpg,$elem);\n";
+ ${$body} .= "\tpi = TPG_ADD_TEXT(tpg,$elem);\n";
+ }
+
+ if (exists ${$r}{plain_text}) {
+ ${$body} .= "\tTPG_SET_TEXT(pi,$elem);\n"
}
if (exists ${$r}{tree}) {
[ '([A-Z][A-Z0-9_]*)', sub { [ 'UPPERCASE', $_[0] ] }],
[ '([0-9]+|0x[0-9a-fA-F]+)', sub { [ 'NUMBER', $_[0] ] }],
[ '(\%\%[0-9]+\%\%)', \&c_code ],
- [ "('(\\\\'|[^'])*')", sub { [ 'SQUOTED', $_[0] ] }],
+ [ "'((\\\\'|[^'])*)'", sub { [ 'SQUOTED', $_[0] ] }],
[ '\[\^((\\\\\\]|[^\\]])*)\]', sub { [ 'NOTCHARS', $_[0] ] }],
[ '\[((\\\\\\]|[^\\]])*)\]', sub { [ 'CHARS', $_[0] ] }],
- [ '("(\\\\"|[^"])*")', sub { [ 'DQUOTED', $_[0] ] }],
- [ '(\%[a-z_]+|\%[A-Z][A-Z-]*|\=|\.\.\.|\.|\:|\;|\(|\)|\{|\}|\+|\*|\?|\<|\>|\|)', sub { [ $_[0], $_[0] ] }],
+ [ '"((\\\\"|[^"])*)"', sub { [ 'DQUOTED', $_[0] ] }],
+ [ '(\%[a-z_]+|\%[A-Z][A-Z-]*|\&|\=|\.\.\.|\.|\:|\;|\(|\)|\{|\}|\+|\*|\?|\<|\>|\|)', sub { [ $_[0], $_[0] ] }],
]
}
git.samba.org / obnox / wireshark / wip.git / blobdiff