diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2013-05-29 06:50:28 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2013-05-29 06:50:28 +0000 |
| commit | 5c595ef825517c742003f267b03f721d3e51506c (patch) | |
| tree | 35d2a9632eed8fc043d8201110eecbb93d5c91a6 /epan/wslua | |
| parent | f89f4cda6c8d1046dd349e1e4375e976d6756b19 (diff) | |
fix for bug 7465
add a wiretap file type table to init.lua
svn path=/trunk/; revision=49608
Diffstat (limited to 'epan/wslua')
| -rwxr-xr-x | epan/wslua/make-init-lua.pl | 11 | ||||
| -rw-r--r-- | epan/wslua/template-init.lua | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl index 241916652e..80fdf8d7b5 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -33,6 +33,7 @@ my $WSROOT = shift; die "'$WSROOT' is not a directory" unless -d $WSROOT; my $wtap_encaps_table = ''; +my $wtap_filetypes_table = ''; my $ft_types_table = ''; my $bases_table = ''; my $encodings = ''; @@ -41,6 +42,7 @@ my $menu_groups = ''; my %replacements = %{{ WTAP_ENCAPS => \$wtap_encaps_table, + WTAP_FILETYPES => \$wtap_filetypes_table, FT_TYPES => \$ft_types_table, BASES => \$bases_table, ENCODINGS => \$encodings, @@ -62,10 +64,12 @@ close TEMPLATE; # # Extract values from wiretap/wtap.h: # +# WTAP_FILE_ values # WTAP_ENCAP_ values # -$wtap_encaps_table = "-- Wiretap encapsulations\nwtap = {\n"; +$wtap_encaps_table = "-- Wiretap encapsulations XXX\nwtap = wtap_encaps = {\n"; +$wtap_filetypes_table = "-- Wiretap file types\nwtap_filetypes = {\n"; open WTAP_H, "< $WSROOT/wiretap/wtap.h" or die "cannot open '$WSROOT/wiretap/wtap.h': $!"; @@ -73,9 +77,14 @@ while(<WTAP_H>) { if ( /^#define WTAP_ENCAP_([A-Z0-9_]+)\s+(\d+)/ ) { $wtap_encaps_table .= "\t[\"$1\"] = $2,\n"; } + + if ( /^#define WTAP_FILE_([A-Z0-9_]+)\s+(\d+)/ ) { + $wtap_filetypes_table .= "\t[\"$1\"] = $2,\n"; + } } $wtap_encaps_table =~ s/,\n$/\n}\n/msi; +$wtap_filetypes_table =~ s/,\n$/\n}\n/msi; # # Extract values from epan/ftypes/ftypes.h: diff --git a/epan/wslua/template-init.lua b/epan/wslua/template-init.lua index e15bc863ee..e6ec4ae9ae 100644 --- a/epan/wslua/template-init.lua +++ b/epan/wslua/template-init.lua @@ -66,6 +66,8 @@ end -- %WTAP_ENCAPS% +-- %WTAP_FILETYPES% + -- %FT_TYPES% -- %BASES% |