summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Kerihuel <j.kerihuel@openchange.org>2008-02-19 01:55:01 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-19 01:55:01 +0100
commitc455774d9330fc1903a701a2042e29f68b8227f8 (patch)
treea0a78c41ffc204c98820f138af0275350fac1e39
parent0f3836238e34f96426ed88cd7dc85a9c0d216188 (diff)
downloadsamba-c455774d9330fc1903a701a2042e29f68b8227f8.tar.gz
samba-c455774d9330fc1903a701a2042e29f68b8227f8.tar.bz2
samba-c455774d9330fc1903a701a2042e29f68b8227f8.zip
Add INCLUDE command to pidl.
(This used to be commit 8a8ed4fae849a2cc565a1ff77b2208a4cd6b1edb)
-rw-r--r--source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm21
1 files changed, 20 insertions, 1 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm b/source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
index a240bbf9cd..43604cb51a 100644
--- a/source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
+++ b/source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
@@ -74,6 +74,10 @@ Change description for the specified header field. `field' is the hf name of the
Code to insert when generating the specified dissector. @HF@ and
@PARAM@ will be substituted.
+=item I<INCLUDE> filename
+
+Include conformance data from the specified filename in the dissector.
+
=item I<TFS> hf_name "true string" "false string"
Override the text shown when a bitmap boolean value is enabled or disabled.
@@ -331,6 +335,20 @@ sub handle_ett_field
push (@{$data->{ett}}, $ett);
}
+sub handle_include
+{
+ my $pos = shift @_;
+ my $data = shift @_;
+ my $fn = shift @_;
+
+ unless(defined($fn)) {
+ error($pos, "incomplete INCLUDE command");
+ return;
+ };
+
+ ReadConformance($fn, $data);
+}
+
my %field_handlers = (
TYPE => \&handle_type,
NOEMIT => \&handle_noemit,
@@ -343,7 +361,8 @@ my %field_handlers = (
STRIP_PREFIX => \&handle_strip_prefix,
PROTOCOL => \&handle_protocol,
FIELD_DESCRIPTION => \&handle_fielddescription,
- IMPORT => \&handle_import
+ IMPORT => \&handle_import,
+ INCLUDE => \&handle_include
);
sub ReadConformance($$)