Qt: Select matching tree item and bytes in Find Packet

Highlight the matching tree item and matching packet bytes when
doing a Find Packet.  Added cf->search_len to correctly highlight
the matching bytes when doing a regex search.

Bug: 12157
Change-Id: I84fbdb9b43be4355e24aff3cf5f8850f1119e2bf
Reviewed-on: https://code.wireshark.org/review/14086
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

1 files changed, 4 insertions, 14 deletions

diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 128cc68523..cf405081a4 100644
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -267,20 +267,10 @@ void ByteViewTab::protoTreeItemChanged(QTreeWidgetItem *current) {
                 }
 
                 if (cap_file_->search_in_progress && (cap_file_->hex || (cap_file_->string && cap_file_->packet_data))) {
-                    /* In the hex view, only highlight the target bytes or string. The entire
-                       field can then be displayed by clicking on any of the bytes in the field. */
-                    if (cap_file_->hex) {
-                        const char *p = cap_file_->sfilter;
-                        f_len = 0;
-                        while (*p) {
-                            if (g_ascii_isxdigit(*p++))
-                                f_len++;
-                        }
-                        f_len = (f_len + 1) / 2;
-                    } else {
-                        f_len = (int)strlen(cap_file_->sfilter);
-                    }
-                    f_start = cap_file_->search_pos - (f_len-1);
+                    // In the hex view, only highlight the target bytes or string. The entire
+                    // field can then be displayed by clicking on any of the bytes in the field.
+                    f_start = cap_file_->search_pos - cap_file_->search_len + 1;
+                    f_len = cap_file_->search_len;
                 } else {
                     f_start = fi->start;
                     f_len = fi->length;