Wireshark · Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 32633: /trunk/epan/dissectors/ /trunk/epan/dissectors/:

[Jakub Zawadzki <darkjames@xxxxxxxxxxxxxxxx>]

On Sun, May 02, 2010 at 09:17:20PM +0200, Stig Bj?rlykke wrote:
> Where did the tree entry "Flags" go?
> It used to be above "Fragment offset".

Sorry, attaching patch to restore it.

Anyway I'm not so sure about this patch being commited.
(maybe Attachment #4559 was better fix?)

Can it be reverted, and first we discuss how issue with ip flags (and other of these kind)
should be fixed?

Thanks.

diff --git epan/dissectors/packet-ip.c epan/dissectors/packet-ip.c
index 4aa60f9..a22856d 100644
--- epan/dissectors/packet-ip.c
+++ epan/dissectors/packet-ip.c
@@ -1308,7 +1308,7 @@ guint16 ip_checksum(const guint8 *ptr, int len)
 static void
 dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
-  proto_tree *ip_tree = NULL, *field_tree= NULL;
+  proto_tree *ip_tree = NULL, *field_tree;
   proto_item *ti = NULL, *tf;
   guint32    addr;
   int        offset = 0;
@@ -1447,7 +1447,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
   iph->ip_off = tvb_get_ntohs(tvb, offset + 6);
   if (tree) {
     int bit_offset = (offset + 6) * 8;
-    tf = proto_tree_add_bits_item(field_tree, hf_ip_flags, tvb, bit_offset + 0, 3, FALSE);
+    tf = proto_tree_add_bits_item(ip_tree, hf_ip_flags, tvb, bit_offset + 0, 3, FALSE);
     field_tree = proto_item_add_subtree(tf, ett_ip_off);
     if (ip_security_flag) {
       proto_item *sf;