summaryrefslogtreecommitdiff
path: root/source4/pidl/lib/Parse/Pidl/Wireshark
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-06 21:54:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:57 -0500
commitd8ecabe452f36302105c6412ae5ab93cabfe5cf2 (patch)
treed5f8e1c8d246e6a95a5aa91e1776047104f046f0 /source4/pidl/lib/Parse/Pidl/Wireshark
parent6317ba1cf71faa7b77072649d92205a38f800fd1 (diff)
downloadsamba-d8ecabe452f36302105c6412ae5ab93cabfe5cf2.tar.gz
samba-d8ecabe452f36302105c6412ae5ab93cabfe5cf2.tar.bz2
samba-d8ecabe452f36302105c6412ae5ab93cabfe5cf2.zip
r19585: Add support for some more standard IDL instructions:
- `include' (replaces helper()) - `import' (replaces depends()) Add support for parsing importlib() - importlib() is now ignored (with a warning), but no longer causes syntax errors. helper() and depends() are now marked deprecated and will cause warnings. (This used to be commit 1ccab71cb8a9e3db9448b6679d01ad00e1c1e9a3)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/Wireshark')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm33
1 files changed, 26 insertions, 7 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 8c75d590e0..7b8691e044 100644
--- a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -717,6 +717,25 @@ sub RegisterInterfaceHandoff($)
}
}
+sub ProcessInclude
+{
+ my @includes = @_;
+ foreach (@includes) {
+ pidl_hdr "#include \"$_\"\n";
+ }
+}
+
+sub ProcessImport
+{
+ my @imports = @_;
+ foreach (@imports) {
+ next if($_ eq "security");
+ s/\.idl\"$//;
+ s/^\"//;
+ pidl_hdr "#include \"packet-dcerpc-$_\.h\"\n";
+ }
+}
+
sub ProcessInterface($)
{
my ($x) = @_;
@@ -728,12 +747,8 @@ sub ProcessInterface($)
pidl_hdr "#define $define";
pidl_hdr "";
- if (defined $x->{PROPERTIES}->{depends}) {
- foreach (split / /, $x->{PROPERTIES}->{depends}) {
- next if($_ eq "security");
- pidl_hdr "#include \"packet-dcerpc-$_\.h\"\n";
- }
- }
+ ProcessImport(split / /, $x->{PROPERTIES}->{depends}) if
+ (defined $x->{PROPERTIES}->{depends});
pidl_def "static gint proto_dcerpc_$x->{NAME} = -1;";
register_ett("ett_dcerpc_$x->{NAME}");
@@ -897,7 +912,11 @@ sub Parse($$$$)
# Wireshark protocol registration
- ProcessInterface($_) foreach (@$ndr);
+ foreach (@$ndr) {
+ ProcessInterface($_) if ($_->{TYPE} eq "INTERFACE");
+ ProcessImport(@{$_->{PATHS}}) if ($_->{TYPE} eq "IMPORT");
+ ProcessInclude(@{$_->{PATHS}}) if ($_->{TYPE} eq "INCLUDE");
+ }
$res{ett} = DumpEttDeclaration();
$res{hf} = DumpHfDeclaration();