From f9885687878560c21c569a850cb7023b062b4e33 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 Feb 2007 16:46:59 +0000
Subject: r21431: More tests, work on support in wireshark for tagged types.
 (This used to be commit a91e624af22aae5b460ccf94d2540b8780f90070)

---
 source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Wireshark')

diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 4a890fb630..9ba6f2f3e0 100644
--- a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -25,7 +25,7 @@ use Parse::Pidl qw(error warning);
 use Parse::Pidl::Typelist qw(getType);
 use Parse::Pidl::Util qw(has_property property_matches make_str);
 use Parse::Pidl::NDR qw(ContainsString GetNextLevel);
-use Parse::Pidl::Dump qw(DumpTypedef DumpFunction);
+use Parse::Pidl::Dump qw(DumpType DumpFunction);
 use Parse::Pidl::Wireshark::Conformance qw(ReadConformance);
 use File::Basename;	
 
@@ -127,7 +127,7 @@ sub Interface($)
 {
 	my($interface) = @_;
 	Const($_,$interface->{NAME}) foreach (@{$interface->{CONSTS}});
-	Typedef($_,$interface->{NAME}) foreach (@{$interface->{TYPES}});
+	Type($_, $_->{NAME}, $interface->{NAME}) foreach (@{$interface->{TYPES}});
 	Function($_,$interface->{NAME}) foreach (@{$interface->{FUNCTIONS}});
 }
 
@@ -637,18 +637,26 @@ sub Const($$)
     	}
 }
 
-sub Typedef($$)
+sub Typedef($$$)
 {
-	my ($e,$ifname) = @_;
+	my ($e,$name,$ifname) = @_;
+
+	Type($e->{DATA}, $name, $ifname);
+}
+
+sub Type($$$)
+{
+	my ($e, $name, $ifname) = @_;
 
-	PrintIdl DumpTypedef($e->{ORIGINAL});
+	PrintIdl DumpType($e->{ORIGINAL});
 
 	{
 		ENUM => \&Enum,
 		STRUCT => \&Struct,
 		UNION => \&Union,
-		BITMAP => \&Bitmap
-	}->{$e->{DATA}->{TYPE}}->($e->{DATA}, $e->{NAME}, $ifname);
+		BITMAP => \&Bitmap,
+		TYPEDEF => \&Typedef
+	}->{$e->{TYPE}}->($e, $name, $ifname);
 }
 
 sub RegisterInterface($)
-- 
cgit