r21431: More tests, work on support in wireshark for tagged types.

(This used to be commit a91e624af22aae5b460ccf94d2540b8780f90070)

2 files changed, 27 insertions, 17 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Dump.pm b/source4/pidl/lib/Parse/Pidl/Dump.pm
index 88f18de322..bf5811c116 100644
--- a/source4/pidl/lib/Parse/Pidl/Dump.pm
+++ b/source4/pidl/lib/Parse/Pidl/Dump.pm
@@ -24,7 +24,7 @@ use Exporter;
 use vars qw($VERSION);
 $VERSION = '0.01';
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(DumpTypedef DumpStruct DumpEnum DumpBitmap DumpUnion DumpFunction);
+@EXPORT_OK = qw(DumpType DumpTypedef DumpStruct DumpEnum DumpBitmap DumpUnion DumpFunction);
 
 use strict;
 use Parse::Pidl::Util qw(has_property);
@@ -87,7 +87,12 @@ sub DumpStruct($)
     my($struct) = shift;
     my($res);
 
-    $res .= "struct {\n";
+    $res .= "struct ";
+	if ($struct->{NAME}) {
+		$res.="$struct->{NAME} ";
+	}
+	
+	$res.="{\n";
     if (defined $struct->{ELEMENTS}) {
 		foreach (@{$struct->{ELEMENTS}}) {
 		    $res .= "\t" . DumpElement($_) . ";\n";
@@ -185,18 +190,15 @@ sub DumpUnion($)
 sub DumpType($)
 {
     my($data) = shift;
-    my($res);
 
     if (ref($data) eq "HASH") {
-	($data->{TYPE} eq "STRUCT") && ($res .= DumpStruct($data));
-	($data->{TYPE} eq "UNION") && ($res .= DumpUnion($data));
-	($data->{TYPE} eq "ENUM") && ($res .= DumpEnum($data));
-	($data->{TYPE} eq "BITMAP") && ($res .= DumpBitmap($data));
+		return DumpStruct($data) if ($data->{TYPE} eq "STRUCT");
+		return DumpUnion($data) if ($data->{TYPE} eq "UNION");
+		return DumpEnum($data) if ($data->{TYPE} eq "ENUM");
+		return DumpBitmap($data) if ($data->{TYPE} eq "BITMAP");
     } else {
-	$res .= "$data";
+		return $data;
     }
-
-    return $res;
 }
 
 #####################################################################
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($)