From 6f1ab30f2fc567048b83be10434037df0fb580c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Sun, 25 Nov 2007 12:15:02 +0000
Subject: [PATCH] From Joe Eykholt: Show content even if the trailer is
 missing.

From me:
Add proto_tree_set_appendix for the checksum and EOF.

svn path=/trunk/; revision=23581
---
 epan/dissectors/packet-fcoe.c | 14 +++++++++-----
 gtk/main.c                    |  5 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c
index 6ce4bc6ffd..c2a9c33ae8 100644
--- a/epan/dissectors/packet-fcoe.c
+++ b/epan/dissectors/packet-fcoe.c
@@ -122,7 +122,7 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint version;
     char *ver;
     guint16  len_sof;
-    gint bytes_remaining = tvb_length(tvb);
+    gint bytes_remaining;
     guint8 sof = 0;
     guint8 eof = 0;
     const char *eof_str;
@@ -156,7 +156,8 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             g_snprintf(ver, ver_buf_len, "pre-T11 ver %d ", version);
         }
     } else {
-        frame_len = bytes_remaining - FCOE_HEADER_LEN - FCOE_TRAILER_LEN;
+        frame_len = tvb_reported_length_remaining(tvb, 0) -
+          FCOE_HEADER_LEN - FCOE_TRAILER_LEN;
         sof = tvb_get_guint8(tvb, FCOE_HEADER_LEN - 1);
 
         /*
@@ -171,13 +172,14 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             g_snprintf(ver, ver_buf_len, "ver %d ", version);
         }
     }
-    if (frame_len < 0)
-        return;
     if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCoE");
     crc_offset = header_len + frame_len;
     eof_offset = crc_offset + 4;
-    next_tvb = tvb_new_subset(tvb, header_len, frame_len, frame_len);
+    bytes_remaining = tvb_length_remaining(tvb, header_len);
+    if (bytes_remaining > frame_len)
+        bytes_remaining = frame_len;        /* backing length */
+    next_tvb = tvb_new_subset(tvb, header_len, bytes_remaining, frame_len);
     
     if (tree) {
 
@@ -241,6 +243,8 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                        "Bad FC CRC %8.8x %8.x",
                                        crc, crc_computed);
             }
+            proto_tree_set_appendix(fcoe_tree, tvb, crc_offset, 
+                                    tvb_length_remaining (tvb, crc_offset));
         }
         crc_tree = proto_item_add_subtree(item, ett_fcoe_crc);
         ti = proto_tree_add_boolean(crc_tree, hf_fcoe_crc_bad, tvb,
diff --git a/gtk/main.c b/gtk/main.c
index 222f9b901f..1c7d0d78ff 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1948,16 +1948,15 @@ main_cf_cb_packet_selected(gpointer data)
 
     /* The user is searching for a string in the data or a hex value,
      * highlight the field that is found in the tree and hex displays. */
-#if GTK_MAJOR_VERSION < 2
     if((cfile.string || cfile.hex) && cfile.search_pos != 0) {
+#if GTK_MAJOR_VERSION < 2
 	    highlight_field(cf->edt->tvb, cfile.search_pos,
         			    (GtkCTree *)tree_view, cf->edt->tree);
 #else
-    if((cfile.string || cfile.hex) && cfile.search_pos != 0) {
 	    highlight_field(cf->edt->tvb, cfile.search_pos,
         			    (GtkTreeView *)tree_view, cf->edt->tree);
 #endif
-		    cfile.search_pos = 0; /* Reset the position */
+	    cfile.search_pos = 0; /* Reset the position */
     }
 
     /* A packet is selected. */