diff options
| author | Tim Potter <tpot@samba.org> | 2005-01-18 05:32:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:58 -0500 |
| commit | b19268ddc539ff88b3a03627b8ee4bbbd48813b9 (patch) | |
| tree | 186066b54950a92896cd0cb6bfc984d41b56dece /source4 | |
| parent | 9582863b7e05581c13d8030a2fc685ca33e614b4 (diff) | |
| download | samba-b19268ddc539ff88b3a03627b8ee4bbbd48813b9.tar.gz samba-b19268ddc539ff88b3a03627b8ee4bbbd48813b9.tar.bz2 samba-b19268ddc539ff88b3a03627b8ee4bbbd48813b9.zip | |
r4815: 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.
(This used to be commit f2ce80e3350337ef795eb32f2478d218c2e382c3)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/pidl/eparser.pm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm index 02cc30c0aa..1c7a06571f 100644 --- a/source4/build/pidl/eparser.pm +++ b/source4/build/pidl/eparser.pm @@ -559,8 +559,8 @@ sub RewriteC($$$) # 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,7 +698,14 @@ sub RewriteC($$$) 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"; |