osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

generate an error for the new Pipe type in typedef 

Pick up change from Samba:

    commit 5d0d45c9a71f137dc29ca79d49bd558f34bf1ff5
    Author: Matthieu Patou <mat@matws.net>
    Date:   Sun Sep 29 00:42:36 2013 -0700

    pidl-wireshark: generate an error for the new Pipe type in typedef

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Change-Id: I9e6da50b657f774fadf7c3777900d409999d4660
Reviewed-on: https://code.wireshark.org/review/5094
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-11-03 11:44:05 -08:00
parent 08a85b85ec
commit 0139ac87d0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
View File

@ -189,6 +189,13 @@ sub Enum($$$$)
$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);", "FT_UINT$enum_size", "BASE_DEC", "0", "VALS($valsstring)", $enum_size / 8);
}
sub Pipe($$$$)
{
my ($self,$e,$name,$ifname) = @_;
error($e->{ORIGINAL}, "Pipe not yet supported");
return;
}
sub Bitmap($$$$)
{
my ($self,$e,$name,$ifname) = @_;
@ -398,6 +405,8 @@ sub ElementLevel($$$$$$$$)
$self->pidl_code("di->call_data->flags = saved_flags;");
$self->deindent;
$self->pidl_code("}");
} elsif ($_->{TYPE} eq "PIPE") {
error($e->{ORIGINAL}, "Type PIPE not yet supported");
} else {
die("Unknown type `$_->{TYPE}'");
}
@ -812,13 +821,13 @@ sub Type($$$$)
my ($self, $e, $name, $ifname) = @_;
$self->PrintIdl(DumpType($e->{ORIGINAL}));
{
ENUM => \&Enum,
STRUCT => \&Struct,
UNION => \&Union,
BITMAP => \&Bitmap,
TYPEDEF => \&Typedef
TYPEDEF => \&Typedef,
PIPE => \&Pipe
}->{$e->{TYPE}}->($self, $e, $name, $ifname);
}