Attachment 10297 Details for Bug 10825 – Patch of latest Wireshark developments

[patch] Patch of latest Wireshark developments

wireshark.patch (text/plain), 38.19 KB, created by Michael Mann on 2014-09-19 22:29:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Mann

Created: 2014-09-19 22:29:52 UTC

Size: 38.19 KB

patch

obsolete

> pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 350 ++++++++++++++++++-----------------
> 1 file changed, 185 insertions(+), 165 deletions(-)
>
>diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
>index 91ef118..dd05851 100644
>--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
>+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
>@@ -57,12 +57,13 @@ sub StripPrefixes($$)
> 
> sub field2name($)
> {
>-    my($field) = shift;
>+	my($field) = shift;
> 
>-    $field =~ s/_/ /g;		# Replace underscores with spaces
>-    $field =~ s/(\w+)/\u\L$1/g;	# Capitalise each word
>-    
>-    return $field;
>+	$field =~ s/^(_)*//g;		# Remove any starting underscores
>+	$field =~ s/_/ /g;		# Replace underscores with spaces
>+	$field =~ s/(\w+)/\u\L$1/g;	# Capitalise each word
>+
>+	return $field;
> }
> 
> sub new($)
>@@ -91,7 +92,7 @@ sub pidl_code($$)
> {
> 	my ($self, $d) = @_;
> 	return if (defined($self->{cur_fn}) and defined($self->{conformance}->{manual}->{$self->{cur_fn}}));
>- 
>+
> 	if ($d) {
> 		$self->{res}->{code} .= $self->{tabs};
> 		$self->{res}->{code} .= $d;
>@@ -143,17 +144,17 @@ sub Enum($$$$)
> 
> 	return if (defined($self->{conformance}->{noemit}->{StripPrefixes($name, $self->{conformance}->{strip_prefixes})}));
> 
>-   	foreach (@{$e->{ELEMENTS}}) {
>+	foreach (@{$e->{ELEMENTS}}) {
> 		if (/([^=]*)=(.*)/) {
> 			$self->pidl_hdr("#define $1 ($2)");
> 		}
> 	}
>-	
>+
> 	$self->pidl_hdr("extern const value_string $valsstring\[];");
>-	$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_);");
>+	$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, g$e->{BASE_TYPE} *param _U_);");
> 
> 	$self->pidl_def("const value_string ".$valsstring."[] = {");
>-    	foreach (@{$e->{ELEMENTS}}) {
>+		foreach (@{$e->{ELEMENTS}}) {
> 		next unless (/([^=]*)=(.*)/);
> 		$self->pidl_def("\t{ $1, \"$1\" },");
> 	}
>@@ -163,7 +164,7 @@ sub Enum($$$$)
> 
> 	$self->pidl_fn_start($dissectorname);
> 	$self->pidl_code("int");
>-	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)");
>+	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, g$e->{BASE_TYPE} *param _U_)");
> 	$self->pidl_code("{");
> 	$self->indent;
> 	$self->pidl_code("g$e->{BASE_TYPE} parameter=0;");
>@@ -172,7 +173,7 @@ sub Enum($$$$)
> 	$self->pidl_code("parameter=(g$e->{BASE_TYPE})*param;");
> 	$self->deindent;
> 	$self->pidl_code("}");
>-	$self->pidl_code("offset = dissect_ndr_$e->{BASE_TYPE}(tvb, offset, pinfo, tree, drep, hf_index, &parameter);");
>+	$self->pidl_code("offset = dissect_ndr_$e->{BASE_TYPE}(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);");
> 	$self->pidl_code("if(param){");
> 	$self->indent;
> 	$self->pidl_code("*param=(guint32)parameter;");
>@@ -185,7 +186,7 @@ sub Enum($$$$)
> 
> 	my $enum_size = $e->{BASE_TYPE};
> 	$enum_size =~ s/uint//g;
>-	$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_UINT$enum_size", "BASE_DEC", "0", "VALS($valsstring)", $enum_size / 8);
>+	$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 Bitmap($$$$)
>@@ -195,17 +196,17 @@ sub Bitmap($$$$)
> 
> 	$self->register_ett("ett_$ifname\_$name");
> 
>-	$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_);");
>+	$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_);");
> 
> 	$self->pidl_fn_start($dissectorname);
> 	$self->pidl_code("int");
>-	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
>+	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
> 	$self->pidl_code("{");
> 	$self->indent;
> 	$self->pidl_code("proto_item *item = NULL;");
> 	$self->pidl_code("proto_tree *tree = NULL;");
> 	$self->pidl_code("");
>-		
>+
> 	$self->pidl_code("g$e->{BASE_TYPE} flags;");
> 	if ($e->{ALIGN} > 1) {
> 		$self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
>@@ -220,7 +221,7 @@ sub Bitmap($$$$)
> 	$self->deindent;
> 	$self->pidl_code("}\n");
> 
>-	$self->pidl_code("offset = dissect_ndr_$e->{BASE_TYPE}(tvb, offset, pinfo, NULL, drep, -1, &flags);");
>+	$self->pidl_code("offset = dissect_ndr_$e->{BASE_TYPE}(tvb, offset, pinfo, NULL, di, drep, -1, &flags);");
> 
> 	$self->pidl_code("proto_item_append_text(item, \": \");\n");
> 	$self->pidl_code("if (!flags)");
>@@ -246,7 +247,7 @@ sub Bitmap($$$$)
> 			$self->pidl_def("   \"$en is NOT SET\",");
> 		}
> 		$self->pidl_def("};");
>-		
>+
> 		$self->pidl_code("proto_tree_add_boolean(tree, $hf_bitname, tvb, offset-$e->{ALIGN}, $e->{ALIGN}, flags);");
> 		$self->pidl_code("if (flags&$ev){");
> 		$self->pidl_code("\tproto_item_append_text(item, \"$en\");");
>@@ -267,7 +268,7 @@ sub Bitmap($$$$)
> 
> 	my $size = $e->{BASE_TYPE};
> 	$size =~ s/uint//g;
>-	$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_UINT$size", "BASE_HEX", "0", "NULL", $size/8);
>+	$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);", "FT_UINT$size", "BASE_HEX", "0", "NULL", $size/8);
> }
> 
> sub ElementLevel($$$$$$$$)
>@@ -285,26 +286,26 @@ sub ElementLevel($$$$$$$$)
> 		} elsif ($l->{LEVEL} eq "EMBEDDED") {
> 			$type = "embedded";
> 		}
>-		$self->pidl_code("offset = dissect_ndr_$type\_pointer(tvb, offset, pinfo, tree, drep, $myname\_, $ptrtype_mappings{$l->{POINTER_TYPE}}, \"Pointer to ".field2name(StripPrefixes($e->{NAME}, $self->{conformance}->{strip_prefixes})) . " ($e->{TYPE})\",$hf);");
>+		$self->pidl_code("offset = dissect_ndr_$type\_pointer(tvb, offset, pinfo, tree, di, drep, $myname\_, $ptrtype_mappings{$l->{POINTER_TYPE}}, \"Pointer to ".field2name(StripPrefixes($e->{NAME}, $self->{conformance}->{strip_prefixes})) . " ($e->{TYPE})\",$hf);");
> 	} elsif ($l->{TYPE} eq "ARRAY") {
> 		if ($l->{IS_INLINE}) {
> 			error($e->{ORIGINAL}, "Inline arrays not supported");
> 		} elsif ($l->{IS_FIXED}) {
> 			$self->pidl_code("int i;");
> 			$self->pidl_code("for (i = 0; i < $l->{SIZE_IS}; i++)");
>-			$self->pidl_code("\toffset = $myname\_(tvb, offset, pinfo, tree, drep);");
>+			$self->pidl_code("\toffset = $myname\_(tvb, offset, pinfo, tree, di, drep);");
> 		} else {
> 			my $type = "";
> 			$type .= "c" if ($l->{IS_CONFORMANT});
> 			$type .= "v" if ($l->{IS_VARYING});
> 
> 			unless ($l->{IS_ZERO_TERMINATED}) {
>-				$self->pidl_code("offset = dissect_ndr_u" . $type . "array(tvb, offset, pinfo, tree, drep, $myname\_);");
>+				$self->pidl_code("offset = dissect_ndr_u" . $type . "array(tvb, offset, pinfo, tree, di, drep, $myname\_);");
> 			} else {
> 				my $nl = GetNextLevel($e,$l);
> 				$self->pidl_code("char *data;");
> 				$self->pidl_code("");
>-				$self->pidl_code("offset = dissect_ndr_$type" . "string(tvb, offset, pinfo, tree, drep, sizeof(g$nl->{DATA_TYPE}), $hf, FALSE, &data);");
>+				$self->pidl_code("offset = dissect_ndr_$type" . "string(tvb, offset, pinfo, tree, di, drep, sizeof(g$nl->{DATA_TYPE}), $hf, FALSE, &data);");
> 				$self->pidl_code("proto_item_append_text(tree, \": %s\", data);");
> 			}
> 		}
>@@ -317,10 +318,10 @@ sub ElementLevel($$$$$$$$)
> 			
> 			if (property_matches($e, "flag", ".*LIBNDR_FLAG_STR_SIZE4.*") and property_matches($e, "flag", ".*LIBNDR_FLAG_STR_LEN4.*")) {
> 				$self->pidl_code("char *data;\n");
>-				$self->pidl_code("offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, $bs, $hf, FALSE, &data);");
>+				$self->pidl_code("offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, di, drep, $bs, $hf, FALSE, &data);");
> 				$self->pidl_code("proto_item_append_text(tree, \": %s\", data);");
> 			} elsif (property_matches($e, "flag", ".*LIBNDR_FLAG_STR_SIZE4.*")) {
>-				$self->pidl_code("offset = dissect_ndr_vstring(tvb, offset, pinfo, tree, drep, $bs, $hf, FALSE, NULL);");
>+				$self->pidl_code("offset = dissect_ndr_vstring(tvb, offset, pinfo, tree, di, drep, $bs, $hf, FALSE, NULL);");
> 			} elsif (property_matches($e, "flag", ".*STR_NULLTERM.*")) {
> 				if ($bs == 2) {
> 					$self->pidl_code("offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, $hf , 0);")
>@@ -333,22 +334,22 @@ sub ElementLevel($$$$$$$$)
> 		} elsif ($l->{DATA_TYPE} eq "DATA_BLOB") {
> 			my $remain = 0;
> 			$remain = 1 if (property_matches($e->{ORIGINAL}, "flag", ".*LIBNDR_FLAG_REMAINING.*"));
>-			$self->pidl_code("offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, $hf, $remain);");
>+			$self->pidl_code("offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, di, drep, $hf, $remain);");
> 		} else {
> 			my $call;
> 
> 			if ($self->{conformance}->{imports}->{$l->{DATA_TYPE}}) {
> 				$call = $self->{conformance}->{imports}->{$l->{DATA_TYPE}}->{DATA};	
> 				$self->{conformance}->{imports}->{$l->{DATA_TYPE}}->{USED} = 1;
>- 		        } elsif (defined($self->{conformance}->{imports}->{"$pn.$e->{NAME}"})) {
>- 			        $call = $self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{DATA};
>+				} elsif (defined($self->{conformance}->{imports}->{"$pn.$e->{NAME}"})) {
>+					$call = $self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{DATA};
> 				$self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{USED} = 1;
>-			    
>+
> 			} elsif (defined($self->{conformance}->{types}->{$l->{DATA_TYPE}})) {
> 				$call= $self->{conformance}->{types}->{$l->{DATA_TYPE}}->{DISSECTOR_NAME};
> 				$self->{conformance}->{types}->{$l->{DATA_TYPE}}->{USED} = 1;
> 			} else {
>-				$self->pidl_code("offset = $ifname\_dissect_struct_" . $l->{DATA_TYPE} . "(tvb,offset,pinfo,tree,drep,$hf,$param);");
>+				$self->pidl_code("offset = $ifname\_dissect_struct_" . $l->{DATA_TYPE} . "(tvb,offset,pinfo,tree,di,drep,$hf,$param);");
> 
> 				return;
> 			}
>@@ -366,7 +367,6 @@ sub ElementLevel($$$$$$$$)
> 		my $hf2 = $self->register_hf_field($hf."_", "Subcontext length", "$ifname.$pn.$_->{NAME}subcontext", "FT_UINT$num_bits", "BASE_HEX", "NULL", 0, "");
> 		$num_bits = 3264 if ($num_bits == 32);
> 		$self->{hf_used}->{$hf2} = 1;
>-		$self->pidl_code("dcerpc_info *di = (dcerpc_info*)pinfo->private_data;");
> 		$self->pidl_code("guint$num_bits size;");
> 		$self->pidl_code("int conformant = di->conformant_run;");
> 		$self->pidl_code("tvbuff_t *subtvb;");
>@@ -376,19 +376,19 @@ sub ElementLevel($$$$$$$$)
> 		$self->pidl_code("if (!conformant) {");
> 		$self->indent;
> 		$self->pidl_code("guint32 saved_flags = di->call_data->flags;");
>-		$self->pidl_code("offset = dissect_ndr_uint$num_bits(tvb, offset, pinfo, tree, drep, $hf2, &size);");
>+		$self->pidl_code("offset = dissect_ndr_uint$num_bits(tvb, offset, pinfo, tree, di, drep, $hf2, &size);");
> 		# This is a subcontext, there is normally no such thing as
> 		# 64 bit NDR is subcontext so we clear the flag so that we can
> 		# continue to dissect handmarshalled stuff with pidl
> 		$self->pidl_code("di->call_data->flags &= ~DCERPC_IS_NDR64;");
> 
>-		$self->pidl_code("subtvb = tvb_new_subset(tvb, offset, size, -1);");
>+		$self->pidl_code("subtvb = tvb_new_subset(tvb, offset, (const gint)size, -1);");
> 		if ($param ne 0) {
>-			$self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, drep, $param);");
>+			$self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, di, drep, $param);");
> 		} else {
>-			$self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, drep);");
>+			$self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, di, drep);");
> 		}
>-		$self->pidl_code("offset += size;");
>+		$self->pidl_code("offset += (int)size;");
> 		$self->pidl_code("di->call_data->flags = saved_flags;");
> 		$self->deindent;
> 		$self->pidl_code("}");
>@@ -397,9 +397,9 @@ sub ElementLevel($$$$$$$$)
> 	}
> }
> 
>-sub Element($$$$$)
>+sub Element($$$$$$)
> {
>-	my ($self,$e,$pn,$ifname,$isoruseswitch) = @_;
>+	my ($self,$e,$pn,$ifname,$isoruseswitch,%switchvars) = @_;
> 
> 	my $dissectorname = "$ifname\_dissect\_element\_".StripPrefixes($pn, $self->{conformance}->{strip_prefixes})."\_".StripPrefixes($e->{NAME}, $self->{conformance}->{strip_prefixes});
> 
>@@ -414,14 +414,33 @@ sub Element($$$$$)
> 		if ($switch_dt->{DATA}->{TYPE} eq "ENUM") {
> 			$switch_type = "g".Parse::Pidl::Typelist::enum_type_fn($switch_dt->{DATA});
> 		} elsif ($switch_dt->{DATA}->{TYPE} eq "SCALAR") {
>-			$switch_type = "g$e->{SWITCH_TYPE}";
>+			$switch_type = "g$type";
>+		}
>+
>+		if ($switch_type ne "") {
>+			$moreparam = ", $switch_type *".$name;
>+
>+			if (($e->{PROPERTIES}->{switch_is} eq "") && ($switchvars{$name}) &&
>+				#not a "native" type
>+				(!($type =~ /^uint(8|16|1632|32|3264|64)/))) {
>+				$param = $name;
>+			} elsif ( $switch_dt->{DATA}->{TYPE} eq "ENUM") {
>+				$param = $name;
>+			} else {
>+				$param = "*".$name;
>+			}
>+		} else {
>+			$moreparam = "";
>+		}
>+
>+		if ($name ne "") {
>+			$call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, di, drep, &$name);";
>+		} else {
>+			$call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, di, drep);";
> 		}
>-		$moreparam = ", $switch_type *".$name;
>-		$param = $name;
>-		$call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, drep, &$name);";
> 	} else {
> 		$moreparam = "";
>-		$call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, drep);";
>+		$call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, di, drep);";
> 	}
> 
> 
>@@ -460,13 +479,15 @@ sub Element($$$$$)
> 	foreach (@{$e->{LEVELS}}) {
> 		if (defined $_->{SWITCH_IS}) {
> 			$oldparam = $param;
>-			$param = "*$param";
>+			if (($param ne "0") && (!($param =~ /\*/))) {
>+				$param = "*$param";
>+			}
> 		}
> 		next if ($_->{TYPE} eq "SWITCH");
>-		$self->pidl_def("static int $dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_$moreparam);");
>+		$self->pidl_def("static int $dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_$moreparam);");
> 		$self->pidl_fn_start("$dissectorname$add");
> 		$self->pidl_code("static int");
>-		$self->pidl_code("$dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_$moreparam)");
>+		$self->pidl_code("$dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_$moreparam)");
> 		$self->pidl_code("{");
> 		$self->indent;
> 
>@@ -494,7 +515,7 @@ sub Function($$$)
> 	my %dissectornames;
> 
> 	foreach (@{$fn->{ELEMENTS}}) {
>-	    $dissectornames{$_->{NAME}} = $self->Element($_, $fn->{NAME}, $ifname, undef) if not defined($dissectornames{$_->{NAME}});
>+	    $dissectornames{$_->{NAME}} = $self->Element($_, $fn->{NAME}, $ifname, undef, undef) if not defined($dissectornames{$_->{NAME}});
> 	}
> 	
> 	my $fn_name = $_->{NAME};
>@@ -503,7 +524,7 @@ sub Function($$$)
> 	$self->PrintIdl(DumpFunction($fn->{ORIGINAL}));
> 	$self->pidl_fn_start("$ifname\_dissect\_$fn_name\_response");
> 	$self->pidl_code("static int");
>-	$self->pidl_code("$ifname\_dissect\_${fn_name}_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)");
>+	$self->pidl_code("$ifname\_dissect\_${fn_name}_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)");
> 	$self->pidl_code("{");
> 	$self->indent;
> 	if ( not defined($fn->{RETURN_TYPE})) {
>@@ -516,44 +537,44 @@ sub Function($$$)
> 		} elsif ($type->{DATA}->{TYPE} eq "SCALAR") {
> 			$self->pidl_code("g$fn->{RETURN_TYPE} status;\n");
> 		} else {
>-	    	error($fn, "return type `$fn->{RETURN_TYPE}' not yet supported");
>+			error($fn, "return type `$fn->{RETURN_TYPE}' not yet supported");
> 		}
> 	} else {
> 		error($fn, "unknown return type `$fn->{RETURN_TYPE}'");
> 	}
> 
>-	$self->pidl_code("pinfo->dcerpc_procedure_name=\"${fn_name}\";");
>+	$self->pidl_code("di->dcerpc_procedure_name=\"${fn_name}\";");
> 	foreach (@{$fn->{ELEMENTS}}) {
> 		if (grep(/out/,@{$_->{DIRECTION}})) {
> 			$self->pidl_code("$dissectornames{$_->{NAME}}");
>-			$self->pidl_code("offset = dissect_deferred_pointers(pinfo, tvb, offset, drep);");
>+			$self->pidl_code("offset = dissect_deferred_pointers(pinfo, tvb, offset, di, drep);");
> 			$self->pidl_code("");
> 		}
> 	}
> 
> 	if (not defined($fn->{RETURN_TYPE})) {
> 	} elsif ($fn->{RETURN_TYPE} eq "NTSTATUS") {
>-		$self->pidl_code("offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf\_$ifname\_status, &status);\n");
>+		$self->pidl_code("offset = dissect_ntstatus(tvb, offset, pinfo, tree, di, drep, hf\_$ifname\_status, &status);\n");
> 		$self->pidl_code("if (status != 0)");
> 		$self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Error: %s\", val_to_str(status, NT_errors, \"Unknown NT status 0x%08x\"));\n");
> 		$return_types{$ifname}->{"status"} = ["NTSTATUS", "NT Error"];
> 	} elsif ($fn->{RETURN_TYPE} eq "WERROR") {
>-		$self->pidl_code("offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf\_$ifname\_werror, &status);\n");
>+		$self->pidl_code("offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf\_$ifname\_werror, &status);\n");
> 		$self->pidl_code("if (status != 0)");
> 		$self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Error: %s\", val_to_str(status, WERR_errors, \"Unknown DOS error 0x%08x\"));\n");
>-		
>+
> 		$return_types{$ifname}->{"werror"} = ["WERROR", "Windows Error"];
> 	} elsif (my $type = getType($fn->{RETURN_TYPE})) {
> 		if ($type->{DATA}->{TYPE} eq "ENUM") {
> 			my $return_type = "g".Parse::Pidl::Typelist::enum_type_fn($type->{DATA});
> 			my $return_dissect = "dissect_ndr_" .Parse::Pidl::Typelist::enum_type_fn($type->{DATA});
> 
>-			$self->pidl_code("offset = $return_dissect(tvb, offset, pinfo, tree, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);");
>+			$self->pidl_code("offset = $return_dissect(tvb, offset, pinfo, tree, di, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);");
> 			$self->pidl_code("if (status != 0)");
> 			$self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Status: %s\", val_to_str(status, $ifname\_$fn->{RETURN_TYPE}\_vals, \"Unknown " . $fn->{RETURN_TYPE} . " error 0x%08x\"));\n");
> 			$return_types{$ifname}->{$fn->{RETURN_TYPE}."_status"} = [$fn->{RETURN_TYPE}, $fn->{RETURN_TYPE}];
> 		} elsif ($type->{DATA}->{TYPE} eq "SCALAR") {
>-			$self->pidl_code("offset = dissect_ndr_$fn->{RETURN_TYPE}(tvb, offset, pinfo, tree, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);");
>+			$self->pidl_code("offset = dissect_ndr_$fn->{RETURN_TYPE}(tvb, offset, pinfo, tree, di, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);");
> 			$self->pidl_code("if (status != 0)");
> 			$self->pidl_code("\tcol_append_fstr(pinfo->cinfo, COL_INFO, \", Status: %d\", status);\n");
> 			$return_types{$ifname}->{$fn->{RETURN_TYPE}."_status"} = [$fn->{RETURN_TYPE}, $fn->{RETURN_TYPE}];
>@@ -567,14 +588,14 @@ sub Function($$$)
> 
> 	$self->pidl_fn_start("$ifname\_dissect\_$fn_name\_request");
> 	$self->pidl_code("static int");
>-	$self->pidl_code("$ifname\_dissect\_${fn_name}_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)");
>+	$self->pidl_code("$ifname\_dissect\_${fn_name}_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)");
> 	$self->pidl_code("{");
> 	$self->indent;
>-	$self->pidl_code("pinfo->dcerpc_procedure_name=\"${fn_name}\";");
>+	$self->pidl_code("di->dcerpc_procedure_name=\"${fn_name}\";");
> 	foreach (@{$fn->{ELEMENTS}}) {
> 		if (grep(/in/,@{$_->{DIRECTION}})) {
> 			$self->pidl_code("$dissectornames{$_->{NAME}}");
>-			$self->pidl_code("offset = dissect_deferred_pointers(pinfo, tvb, offset, drep);");
>+			$self->pidl_code("offset = dissect_deferred_pointers(pinfo, tvb, offset, di, drep);");
> 		}
> 
> 	}
>@@ -598,9 +619,11 @@ sub Struct($$$$)
> 	my $varswitchs = {};
> 	# will contain the switch var declaration;
> 	my $vars = [];
>+	my %switch_hash;
> 	foreach (@{$e->{ELEMENTS}}) {
> 		if (has_property($_, "switch_is")) {
> 			$varswitchs->{$_->{PROPERTIES}->{switch_is}} = [];
>+			$switch_hash{ $_->{PROPERTIES}->{switch_is}} =  $_->{PROPERTIES}->{switch_is};
> 		}
> 	}
> 	foreach (@{$e->{ELEMENTS}}) {
>@@ -614,10 +637,12 @@ sub Struct($$$$)
> 			if ($switch_dt->{DATA}->{TYPE} eq "ENUM") {
> 				$switch_type = "g".Parse::Pidl::Typelist::enum_type_fn($switch_dt->{DATA});
> 			} elsif ($switch_dt->{DATA}->{TYPE} eq "SCALAR") {
>-				$switch_type = "g$e->{SWITCH_TYPE}";
>+				$switch_type = "g$_->{TYPE}";
> 			}
> 
>-			push @$vars, "$switch_type $v;";
>+			if ($switch_type ne "") {
>+				push @$vars, "$switch_type $v;";
>+			}
> 			$switch_info = [ $_->{TYPE}, $v ];
> 			$varswitchs->{$v} = $switch_info;
> 		}
>@@ -627,22 +652,19 @@ sub Struct($$$$)
> 			$switch_info = $varswitchs->{$varswitch};
> 		}
> 
>-		$res.="\t".$self->Element($_, $name, $ifname, $switch_info)."\n\n";
>+		$res.="\t".$self->Element($_, $name, $ifname, $switch_info, %switch_hash)."\n\n";
> 	}
> 
>-	$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_);");
>+	$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_);");
> 
> 	$self->pidl_fn_start($dissectorname);
> 	$self->pidl_code("int");
>-	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
>+	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
> 	$self->pidl_code("{");
> 	$self->indent;
> 	$self->pidl_code($_) foreach (@$vars);
> 	$self->pidl_code("proto_item *item = NULL;");
> 	$self->pidl_code("proto_tree *tree = NULL;");
>-	if ($e->{ALIGN} > 1) {
>-		$self->pidl_code("dcerpc_info *di = (dcerpc_info *)pinfo->private_data;");
>-	}
> 	$self->pidl_code("int old_offset;");
> 	$self->pidl_code("");
> 
>@@ -677,7 +699,7 @@ sub Struct($$$$)
> 	$self->pidl_code("}\n");
> 	$self->pidl_fn_end($dissectorname);
> 
>-	$self->register_type($name, "offset = $dissectorname(tvb,offset,pinfo,tree,drep,\@HF\@,\@PARAM\@);", "FT_NONE", "BASE_NONE", 0, "NULL", 0);
>+	$self->register_type($name, "offset = $dissectorname(tvb,offset,pinfo,tree,di,drep,\@HF\@,\@PARAM\@);", "FT_NONE", "BASE_NONE", 0, "NULL", 0);
> }
> 
> sub Union($$$$)
>@@ -694,7 +716,7 @@ sub Union($$$$)
> 	foreach (@{$e->{ELEMENTS}}) {
> 		$res.="\n\t\t$_->{CASE}:\n";
> 		if ($_->{TYPE} ne "EMPTY") {
>-			$res.="\t\t\t".$self->Element($_, $name, $ifname, undef)."\n";
>+			$res.="\t\t\t".$self->Element($_, $name, $ifname, undef, undef)."\n";
> 		}
> 		$res.="\t\tbreak;\n";
> 	}
>@@ -712,7 +734,7 @@ sub Union($$$$)
> 
> 	$self->pidl_fn_start($dissectorname);
> 	$self->pidl_code("static int");
>-	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
>+	$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
> 	$self->pidl_code("{");
> 	$self->indent;
> 	$self->pidl_code("proto_item *item = NULL;");
>@@ -736,7 +758,7 @@ sub Union($$$$)
> 	$self->pidl_code("");
> 
> 	if (defined $switch_type) {
>-		$self->pidl_code("offset = $switch_dissect(tvb, offset, pinfo, tree, drep, hf_index, &level);");
>+		$self->pidl_code("offset = $switch_dissect(tvb, offset, pinfo, tree, di, drep, hf_index, &level);");
> 
> 		if ($e->{ALIGN} > 1) {
> 			$self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
>@@ -754,7 +776,7 @@ sub Union($$$$)
> 	$self->pidl_code("}");
> 	$self->pidl_fn_end($dissectorname);
> 
>-	$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_NONE", "BASE_NONE", 0, "NULL", 0);
>+	$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);", "FT_NONE", "BASE_NONE", 0, "NULL", 0);
> }
> 
> sub Const($$$)
>@@ -762,10 +784,10 @@ sub Const($$$)
> 	my ($self,$const,$ifname) = @_;
> 	
> 	if (!defined($const->{ARRAY_LEN}[0])) {
>-    		$self->pidl_hdr("#define $const->{NAME}\t( $const->{VALUE} )\n");
>-    	} else {
>-    		$self->pidl_hdr("#define $const->{NAME}\t $const->{VALUE}\n");
>-    	}
>+		$self->pidl_hdr("#define $const->{NAME}\t( $const->{VALUE} )\n");
>+	} else {
>+		$self->pidl_hdr("#define $const->{NAME}\t $const->{VALUE}\n");
>+	}
> }
> 
> sub Typedef($$$$)
>@@ -803,33 +825,33 @@ sub RegisterInterface($$)
> 	$self->{res}->{code}.="\n".DumpEttList($self->{ett})."\n";
> 	
> 	if (defined($x->{UUID})) {
>-	    # These can be changed to non-pidl_code names if the old dissectors
>-	    # in epan/dissctors are deleted.
>-    
>-	    my $name = uc($x->{NAME}) . " (pidl)";
>-	    my $short_name = uc($x->{NAME});
>-	    my $filter_name = $x->{NAME};
>-
>-	    if (has_property($x, "helpstring")) {
>-	    	$name = $x->{PROPERTIES}->{helpstring};
>-	    }
>-
>-	    if (defined($self->{conformance}->{protocols}->{$x->{NAME}})) {
>+		# These can be changed to non-pidl_code names if the old dissectors
>+		# in epan/dissctors are deleted.
>+
>+		my $name = uc($x->{NAME}) . " (pidl)";
>+		my $short_name = uc($x->{NAME});
>+		my $filter_name = $x->{NAME};
>+
>+		if (has_property($x, "helpstring")) {
>+			$name = $x->{PROPERTIES}->{helpstring};
>+		}
>+
>+		if (defined($self->{conformance}->{protocols}->{$x->{NAME}})) {
> 		$short_name = $self->{conformance}->{protocols}->{$x->{NAME}}->{SHORTNAME};
> 		$name = $self->{conformance}->{protocols}->{$x->{NAME}}->{LONGNAME};
> 		$filter_name = $self->{conformance}->{protocols}->{$x->{NAME}}->{FILTERNAME};
>-	    }
>+		}
>+
>+		$self->pidl_code("proto_dcerpc_$x->{NAME} = proto_register_protocol(".make_str($name).", ".make_str($short_name).", ".make_str($filter_name).");");
> 
>-	    $self->pidl_code("proto_dcerpc_$x->{NAME} = proto_register_protocol(".make_str($name).", ".make_str($short_name).", ".make_str($filter_name).");");
>-	    
>-	    $self->pidl_code("proto_register_field_array(proto_dcerpc_$x->{NAME}, hf, array_length (hf));");
>-	    $self->pidl_code("proto_register_subtree_array(ett, array_length(ett));");
>+		$self->pidl_code("proto_register_field_array(proto_dcerpc_$x->{NAME}, hf, array_length (hf));");
>+		$self->pidl_code("proto_register_subtree_array(ett, array_length(ett));");
> 	} else {
>-	    $self->pidl_code("proto_dcerpc = proto_get_id_by_filter_name(\"dcerpc\");");
>-	    $self->pidl_code("proto_register_field_array(proto_dcerpc, hf, array_length(hf));");
>-	    $self->pidl_code("proto_register_subtree_array(ett, array_length(ett));");
>+		$self->pidl_code("proto_dcerpc = proto_get_id_by_filter_name(\"dcerpc\");");
>+		$self->pidl_code("proto_register_field_array(proto_dcerpc, hf, array_length(hf));");
>+		$self->pidl_code("proto_register_subtree_array(ett, array_length(ett));");
> 	}
>-	    
>+
> 	$self->deindent;
> 	$self->pidl_code("}\n");
> 	$self->pidl_fn_end("proto_register_dcerpc_$x->{NAME}");
>@@ -841,14 +863,14 @@ sub RegisterInterfaceHandoff($$)
> 
> 	if (defined($x->{UUID})) {
> 		$self->pidl_fn_start("proto_reg_handoff_dcerpc_$x->{NAME}");
>-	    $self->pidl_code("void proto_reg_handoff_dcerpc_$x->{NAME}(void)");
>-	    $self->pidl_code("{");
>-	    $self->indent;
>-	    $self->pidl_code("dcerpc_init_uuid(proto_dcerpc_$x->{NAME}, ett_dcerpc_$x->{NAME},");
>-	    $self->pidl_code("\t&uuid_dcerpc_$x->{NAME}, ver_dcerpc_$x->{NAME},");
>-	    $self->pidl_code("\t$x->{NAME}_dissectors, hf_$x->{NAME}_opnum);");
>-	    $self->deindent;
>-	    $self->pidl_code("}");
>+		$self->pidl_code("void proto_reg_handoff_dcerpc_$x->{NAME}(void)");
>+		$self->pidl_code("{");
>+		$self->indent;
>+		$self->pidl_code("dcerpc_init_uuid(proto_dcerpc_$x->{NAME}, ett_dcerpc_$x->{NAME},");
>+		$self->pidl_code("\t&uuid_dcerpc_$x->{NAME}, ver_dcerpc_$x->{NAME},");
>+		$self->pidl_code("\t$x->{NAME}_dissectors, hf_$x->{NAME}_opnum);");
>+		$self->deindent;
>+		$self->pidl_code("}");
> 		$self->pidl_fn_end("proto_reg_handoff_dcerpc_$x->{NAME}");
> 
> 		$self->{hf_used}->{"hf_$x->{NAME}_opnum"} = 1;
>@@ -896,26 +918,26 @@ sub ProcessInterface($$)
> 	if (defined($x->{UUID})) {
> 		my $if_uuid = $x->{UUID};
> 
>-	    $self->pidl_def("/* Version information */\n\n");
>-	    
>-	    $self->pidl_def("static e_uuid_t uuid_dcerpc_$x->{NAME} = {");
>-	    $self->pidl_def("\t0x" . substr($if_uuid, 1, 8) 
>-  		. ", 0x" . substr($if_uuid, 10, 4)
>-	    . ", 0x" . substr($if_uuid, 15, 4) . ",");
>-	    $self->pidl_def("\t{ 0x" . substr($if_uuid, 20, 2) 
>+		$self->pidl_def("/* Version information */\n\n");
>+
>+		$self->pidl_def("static e_uuid_t uuid_dcerpc_$x->{NAME} = {");
>+		$self->pidl_def("\t0x" . substr($if_uuid, 1, 8)
>+		. ", 0x" . substr($if_uuid, 10, 4)
>+		. ", 0x" . substr($if_uuid, 15, 4) . ",");
>+		$self->pidl_def("\t{ 0x" . substr($if_uuid, 20, 2)
> 		. ", 0x" . substr($if_uuid, 22, 2)
>-	    . ", 0x" . substr($if_uuid, 25, 2)
>-	    . ", 0x" . substr($if_uuid, 27, 2)
>-	    . ", 0x" . substr($if_uuid, 29, 2)
>-	    . ", 0x" . substr($if_uuid, 31, 2)
>-	    . ", 0x" . substr($if_uuid, 33, 2)
>-	    . ", 0x" . substr($if_uuid, 35, 2) . " }");
>-	    $self->pidl_def("};");
>-	
>-	    my $maj = 0x0000FFFF & $x->{VERSION};
>-	    $maj =~ s/\.(.*)$//g;
>-	    $self->pidl_def("static guint16 ver_dcerpc_$x->{NAME} = $maj;");
>-	    $self->pidl_def("");
>+		. ", 0x" . substr($if_uuid, 25, 2)
>+		. ", 0x" . substr($if_uuid, 27, 2)
>+		. ", 0x" . substr($if_uuid, 29, 2)
>+		. ", 0x" . substr($if_uuid, 31, 2)
>+		. ", 0x" . substr($if_uuid, 33, 2)
>+		. ", 0x" . substr($if_uuid, 35, 2) . " }");
>+		$self->pidl_def("};");
>+
>+		my $maj = 0x0000FFFF & $x->{VERSION};
>+		$maj =~ s/\.(.*)$//g;
>+		$self->pidl_def("static guint16 ver_dcerpc_$x->{NAME} = $maj;");
>+		$self->pidl_def("");
> 	}
> 
> 	$return_types{$x->{NAME}} = {};
>@@ -934,6 +956,10 @@ sub ProcessInterface($$)
> 	$self->RegisterInterface($x);
> 	$self->RegisterInterfaceHandoff($x);
> 
>+	if (exists ($self->{conformance}->{header})) {
>+		$self->pidl_hdr($self->{conformance}->{header});
>+	}
>+
> 	$self->pidl_hdr("#endif /* $define */");
> }
> 
>@@ -975,34 +1001,32 @@ sub Initialize($$)
> 	
> 	foreach my $bytes (qw(1 2 4 8)) {
> 		my $bits = $bytes * 8;
>-		$self->register_type("uint$bits", "offset = PIDL_dissect_uint$bits(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_UINT$bits", "BASE_DEC", 0, "NULL", $bytes);
>-		$self->register_type("int$bits", "offset = PIDL_dissect_uint$bits(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_INT$bits", "BASE_DEC", 0, "NULL", $bytes);
>+		$self->register_type("uint$bits", "offset = PIDL_dissect_uint$bits(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);", "FT_UINT$bits", "BASE_DEC", 0, "NULL", $bytes);
>+		$self->register_type("int$bits", "offset = PIDL_dissect_uint$bits(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);", "FT_INT$bits", "BASE_DEC", 0, "NULL", $bytes);
> 	}
>-		
>-	$self->register_type("uint3264", "offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);", "FT_UINT32", "BASE_DEC", 0, "NULL", 8);
>-	$self->register_type("hyper", "offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);", "FT_UINT64", "BASE_DEC", 0, "NULL", 8);
>-	$self->register_type("udlong", "offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);", "FT_UINT64", "BASE_DEC", 0, "NULL", 4);
>-	$self->register_type("bool8", "offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_INT8", "BASE_DEC", 0, "NULL", 1);
>+
>+	$self->register_type("uint3264", "offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, di, drep, \@HF\@, NULL);", "FT_UINT32", "BASE_DEC", 0, "NULL", 8);
>+	$self->register_type("hyper", "offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, di, drep, \@HF\@, NULL);", "FT_UINT64", "BASE_DEC", 0, "NULL", 8);
>+	$self->register_type("udlong", "offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, di, drep, \@HF\@, NULL);", "FT_UINT64", "BASE_DEC", 0, "NULL", 4);
>+	$self->register_type("bool8", "offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);","FT_INT8", "BASE_DEC", 0, "NULL", 1);
> 	$self->register_type("char", "offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_INT8", "BASE_DEC", 0, "NULL", 1);
>-	$self->register_type("long", "offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_INT32", "BASE_DEC", 0, "NULL", 4);
>-	$self->register_type("dlong", "offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);","FT_INT64", "BASE_DEC", 0, "NULL", 8);
>-	$self->register_type("GUID", "offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);","FT_GUID", "BASE_NONE", 0, "NULL", 4);
>-	$self->register_type("policy_handle", "offset = PIDL_dissect_policy_hnd(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_BYTES", "BASE_NONE", 0, "NULL", 4);
>-	$self->register_type("NTTIME", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, \@HF\@);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>-	$self->register_type("NTTIME_hyper", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, \@HF\@);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>-	$self->register_type("time_t", "offset = dissect_ndr_time_t(tvb, offset, pinfo,tree, drep, \@HF\@, NULL);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>-	$self->register_type("NTTIME_1sec", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, \@HF\@);", "FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>+	$self->register_type("long", "offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);","FT_INT32", "BASE_DEC", 0, "NULL", 4);
>+	$self->register_type("dlong", "offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, di, drep, \@HF\@, NULL);","FT_INT64", "BASE_DEC", 0, "NULL", 8);
>+	$self->register_type("GUID", "offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, di, drep, \@HF\@, NULL);","FT_GUID", "BASE_NONE", 0, "NULL", 4);
>+	$self->register_type("policy_handle", "offset = PIDL_dissect_policy_hnd(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);","FT_BYTES", "BASE_NONE", 0, "NULL", 4);
>+	$self->register_type("NTTIME", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, di, drep, \@HF\@);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>+	$self->register_type("NTTIME_hyper", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, di, drep, \@HF\@);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>+	$self->register_type("time_t", "offset = dissect_ndr_time_t(tvb, offset, pinfo,tree, di, drep, \@HF\@, NULL);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
>+	$self->register_type("NTTIME_1sec", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, di, drep, \@HF\@);", "FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
> 	$self->register_type("SID", "
>-		dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
>-
> 		di->hf_index = \@HF\@;
> 
>-		offset = dissect_ndr_nt_SID_with_options(tvb, offset, pinfo, tree, drep, param);
>+		offset = dissect_ndr_nt_SID_with_options(tvb, offset, pinfo, tree, di, drep, param);
> 	","FT_STRING", "BASE_NONE", 0, "NULL", 4);
> 	$self->register_type("WERROR", 
>-		"offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_UINT32", "BASE_DEC", 0, "VALS(WERR_errors)", 4);
>+		"offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);","FT_UINT32", "BASE_DEC", 0, "VALS(WERR_errors)", 4);
> 	$self->register_type("NTSTATUS", 
>-		"offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_UINT32", "BASE_DEC", 0, "VALS(NT_errors)", 4);
>+		"offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);","FT_UINT32", "BASE_DEC", 0, "VALS(NT_errors)", 4);
> 
> }
> 
>@@ -1018,21 +1042,17 @@ sub Parse($$$$$)
> 
> 	my $notice = 
> "/* DO NOT EDIT
>-	This filter was automatically generated
>+	This file was automatically generated by Pidl
> 	from $idl_file and $cnf_file.
>-	
>+
> 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
> 	It is maintained by the Samba team, not the Wireshark team.
> 	Instructions on how to download and install Pidl can be
> 	found at http://wiki.wireshark.org/Pidl
>-
>-	\$Id\$
> */
> 
> ";
> 
>-	$self->pidl_hdr($notice);
>-
> 	$self->{res}->{headers} = "\n";
> 	$self->{res}->{headers} .= "#include \"config.h\"\n";
> 
>@@ -1081,11 +1101,11 @@ sub Parse($$$$$)
> 	}
> 	$parser.=$self->{res}->{code};
> 
>-	my $header = "/* autogenerated by pidl */\n\n";
>+	my $header = $notice;
> 	$header.=$self->{res}->{hdr};
> 
> 	$self->CheckUsed($self->{conformance});
>-    
>+
> 	return ($parser,$header);
> }
> 
>@@ -1097,7 +1117,7 @@ sub register_ett($$)
> {
> 	my ($self, $name) = @_;
> 
>-	push (@{$self->{ett}}, $name);	
>+	push (@{$self->{ett}}, $name);
> }
> 
> sub DumpEttList
>@@ -1173,16 +1193,16 @@ sub DumpHfDeclaration($)
> 
> sub make_str_or_null($)
> {
>-      my $str = shift;
>-      if (substr($str, 0, 1) eq "\"") {
>-              $str = substr($str, 1, length($str)-2);
>-      }
>-      $str =~ s/^\s*//;
>-      $str =~ s/\s*$//;
>-      if ($str eq "") {
>-              return "NULL";
>-      }
>-      return make_str($str);
>+	my $str = shift;
>+	if (substr($str, 0, 1) eq "\"") {
>+		$str = substr($str, 1, length($str)-2);
>+	}
>+	$str =~ s/^\s*//;
>+	$str =~ s/\s*$//;
>+	if ($str eq "") {
>+		return "NULL";
>+	}
>+	return make_str($str);
> }
> 
> sub DumpHfList($)
>@@ -1193,7 +1213,7 @@ sub DumpHfList($)
> 	foreach (values %{$self->{conformance}->{header_fields}}) 
> 	{
> 		$res .= "\t{ &$_->{INDEX},
>-	  { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }},
>+		{ ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }},
> ";
> 	}
> 
>@@ -1211,7 +1231,7 @@ sub DumpFunctionTable($)
> 
> 	my $res = "static dcerpc_sub_dissector $if->{NAME}\_dissectors[] = {\n";
> 	foreach (@{$if->{FUNCTIONS}}) {
>-	        my $fn_name = $_->{NAME};
>+		my $fn_name = $_->{NAME};
> 		$fn_name =~ s/^$if->{NAME}_//;
> 		$res.= "\t{ $_->{OPNUM}, \"$fn_name\",\n";
> 		$res.= "\t   $if->{NAME}_dissect_${fn_name}_request, $if->{NAME}_dissect_${fn_name}_response},\n";

Actions: View

Attachments on bug 10825: 10297