NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: s/proto_tree_add_text/proto_tree_add_item/

Browse Source 
In the wireshark commit e2735ecfdd7a96c they dropped
proto_tree_add_text in favor of proto_tree_add_item. Adapt to
this change.

Moreover, the proto_tree_add_item API is around for ages and we
are already using it anyway. Therefore we don't need to change
required version of wireshark.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-12-27 10:43:37 +01:00
parent 0a84286d8f
commit d3ede96d6f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/wireshark/src/packet-libvirt.c
View File

@ -56,7 +56,7 @@ static int hf_libvirt_serial = -1;
static int hf_libvirt_status = -1; static int hf_libvirt_status = -1;
static int hf_libvirt_stream = -1; static int hf_libvirt_stream = -1;
static int hf_libvirt_num_of_fds = -1; static int hf_libvirt_num_of_fds = -1;
static int hf_libvirt_unknown = -1; int hf_libvirt_unknown = -1;
static gint ett_libvirt = -1; static gint ett_libvirt = -1;
#define XDR_PRIMITIVE_DISSECTOR(xtype, ctype, ftype) \ #define XDR_PRIMITIVE_DISSECTOR(xtype, ctype, ftype) \

7
tools/wireshark/util/genxdrstub.pl
View File

@ -57,6 +57,9 @@ for my $proto (@ARGV) {
$c->add_header_file($name, sub { $c->add_header_file($name, sub {
dbg "*** Start parsing $proto\n"; dbg "*** Start parsing $proto\n";
$c->print("extern int hf_libvirt_unknown;\n");
my @lexs = Lexicalizer->parse($source); my @lexs = Lexicalizer->parse($source);
for my $lex (@lexs) { for my $lex (@lexs) {
next if $lex->ident eq "enum $name\_procedure"; next if $lex->ident eq "enum $name\_procedure";
@ -903,7 +906,7 @@ static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *
<% } %> <% } %>
} }
} else { } else {
proto_tree_add_text(tree, tvb, start, -1, "(unknown)"); proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA);
} }
return FALSE; return FALSE;
} }
@ -933,7 +936,7 @@ static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *
<% } %> <% } %>
} }
if (!rc) { if (!rc) {
proto_tree_add_text(tree, tvb, start, -1, "(unknown)"); proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA);
} }
return rc; return rc;
} }