From 0139ac87d06779ce06c4db8e42f127e698877bb1 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 3 Nov 2014 11:44:05 -0800 Subject: [PATCH] generate an error for the new Pipe type in typedef Pick up change from Samba: commit 5d0d45c9a71f137dc29ca79d49bd558f34bf1ff5 Author: Matthieu Patou 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 Change-Id: I9e6da50b657f774fadf7c3777900d409999d4660 Reviewed-on: https://code.wireshark.org/review/5094 Reviewed-by: Guy Harris --- tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 75f361aa05..06793808a6 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -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); }