svn commit: samba r4815 - in branches/SAMBA_4_0/source/build/pidl: .

[tpot at samba.org]

Author: tpot
Date: 2005-01-18 05:32:35 +0000 (Tue, 18 Jan 2005)
New Revision: 4815

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4815

Log:
Handle uint8 and uint16 bitmap types.

Break out arguments to proto_register_protocol() so they can be renamed
easily.  Unfortunately the "pidl_" prefix will have to stick around if/when
the old dissectors are removed because the filter and short names clash.

Modified:
   branches/SAMBA_4_0/source/build/pidl/eparser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/eparser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/eparser.pm	2005-01-18 04:06:58 UTC (rev 4814)
+++ branches/SAMBA_4_0/source/build/pidl/eparser.pm	2005-01-18 05:32:35 UTC (rev 4815)
@@ -559,8 +559,8 @@
 
 	# Bitmaps
 
-        s/(^(static\ )?NTSTATUS\ ndr_pull_(.+?),\ uint32\ \*r\))
-	    /NTSTATUS ndr_pull_$3, pidl_tree *tree, int hf, uint32_t *r)/smgx;
+        s/(^(static\ )?NTSTATUS\ ndr_pull_(.+?),\ uint(8|16|32)\ \*r\))
+	    /NTSTATUS ndr_pull_$3, pidl_tree *tree, int hf, uint$4_t *r)/smgx;
 
 	# Call ethereal wrappers for pull of scalar values in
 	# structures and functions, e.g
@@ -698,8 +698,15 @@
     
     if (defined($if_uuid)) {
 
-	pidl "\tproto_dcerpc_pidl_$module = proto_register_protocol(\"pidl_$module\", \"pidl_$module\", \"pidl_$module\");\n\n";
+	# These can be changed to non-pidl names if the old dissectors
+	# in epan/dissctors are deleted.
 
+	my $name = uc($module) . " (pidl)";
+	my $short_name = "pidl_$module";
+	my $filter_name = "pidl_$module";
+
+	pidl "\tproto_dcerpc_pidl_$module = proto_register_protocol(\"$name\", \"$short_name\", \"$filter_name\");\n\n";
+
 	pidl "\tproto_register_field_array(proto_dcerpc_pidl_$module, hf, array_length (hf));\n";
 	pidl "\tproto_register_subtree_array(ett, array_length(ett));\n";