[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-788-gec8bd39

Jelmer Vernooij jelmer at samba.org
Wed Feb 13 01:25:45 GMT 2008


The branch, v4-0-test has been updated
       via  ec8bd3991f76cf8746cf77c277c3491725711f9d (commit)
      from  1a8f5ab78ae24607ff66b06e82aef9316f0ae54b (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit ec8bd3991f76cf8746cf77c277c3491725711f9d
Author: Julien Kerihuel <j.kerihuel at openchange.org>
Date:   Wed Feb 13 02:24:11 2008 +0100

    Support ETT_FIELD keyword.

-----------------------------------------------------------------------

Summary of changes:
 .../pidl/lib/Parse/Pidl/Wireshark/Conformance.pm   |   19 +++++++++++++++++++
 source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm        |    4 ++++
 2 files changed, 23 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm b/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
index b53c56e..a240bbf 100644
--- a/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
+++ b/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
@@ -52,6 +52,10 @@ use old_hf_name.
 This can be used in conjunction with HF_FIELD in order to make more than 
 one element use the same filter name.
 
+=item I<ETT_FIELD> ett
+
+Register a custom ett field
+
 =item I<STRIP_PREFIX> prefix
 
 Remove the specified prefix from all function names (if present).
@@ -313,6 +317,20 @@ sub handle_import
 	};
 }
 
+sub handle_ett_field
+{
+	my $pos = shift @_;
+	my $data = shift @_;
+	my $ett = shift @_;
+
+	unless(defined($ett)) {
+		error($pos, "incomplete ETT_FIELD command");
+		return;
+	};
+
+	push (@{$data->{ett}}, $ett);
+}
+
 my %field_handlers = (
 	TYPE => \&handle_type,
 	NOEMIT => \&handle_noemit, 
@@ -320,6 +338,7 @@ my %field_handlers = (
 	PARAM_VALUE => \&handle_param_value, 
 	HF_FIELD => \&handle_hf_field, 
 	HF_RENAME => \&handle_hf_rename, 
+	ETT_FIELD => \&handle_ett_field,
 	TFS => \&handle_tfs,
 	STRIP_PREFIX => \&handle_strip_prefix,
 	PROTOCOL => \&handle_protocol,
diff --git a/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index ffe104c..8846b74 100644
--- a/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -940,6 +940,10 @@ sub Parse($$$$$)
 	$self->{res}->{headers} .= "#include \"$h_basename\"\n";
 	$self->pidl_code("");
 
+	if (defined($self->{conformance}->{ett})) {
+		register_ett($self,$_) foreach(@{$self->{conformance}->{ett}})
+	}
+
 	# Wireshark protocol registration
 
 	foreach (@$ndr) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list