Merge remote-tracking branch 'upstream/master'

THIS-IS-NOT-A-BACKUP · Feb 8, 2025 · fbac5cb · fbac5cb
2 parents bf9c7c7 + 3b7c0e7
commit fbac5cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
@@ -12555,6 +12555,10 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, bool fi
 		if (si->flags & SMB2_FLAGS_RESPONSE) {
 			si->status = tvb_get_letohl(tvb, offset);
 			proto_tree_add_item(header_tree, hf_smb2_nt_status, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+			if (si->status) {
+				proto_item_append_text(item, ", %s",
+					val_to_str_ext(si->status, &NT_errors_ext, "Unknown (0x%08X)"));
+			}
 			offset += 4;
 		} else {
 			si->status = 0;
@@ -12567,6 +12571,9 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, bool fi
 		/* opcode */
 		si->opcode = tvb_get_letohs(tvb, offset);
 		proto_tree_add_item(header_tree, hf_smb2_cmd, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+		proto_item_append_text(item, ", %s %s",
+			smb2_cmd_vals[si->opcode].strptr,
+			si->flags & SMB2_FLAGS_RESPONSE ? "Response" : "Request");
 		offset += 2;
 
 		/* credits */
@@ -12605,6 +12612,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, bool fi
 		si->msg_id = tvb_get_letoh64(tvb, offset);
 		ssi_key.msg_id = si->msg_id;
 		proto_tree_add_item(header_tree, hf_smb2_msg_id, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+		proto_item_append_text(item,  "MessageId %" PRIu64, (uint64_t)si->msg_id);
 		offset += 8;
 
 		/* Tree ID and Session ID */

diff --git a/ui/qt/models/atap_data_model.cpp b/ui/qt/models/atap_data_model.cpp
@@ -502,7 +502,7 @@ QVariant EndpointDataModel::data(const QModelIndex &idx, int role) const
         }
         return Qt::AlignRight;
     } else if (role == ATapDataModel::DISPLAY_FILTER) {
-        return QString(get_endpoint_filter(item));
+        return gchar_free_to_qstring(get_endpoint_filter(item));
     } else if (role == ATapDataModel::ROW_IS_FILTERED) {
         return (bool)item->filtered && showTotalColumn();
     }

diff --git a/ui/qt/widgets/traffic_tree.cpp b/ui/qt/widgets/traffic_tree.cpp
@@ -758,7 +758,7 @@ QMenu * TrafficTree::createActionSubMenu(FilterAction::Action cur_action, QModel
             }
             foreach (FilterAction::ActionDirection ad, FilterAction::actionDirections()) {
                 FilterAction *fa = new FilterAction(subsubmenu, cur_action, at, ad);
-                QString filter = get_conversation_filter(conv_item, (conv_direction_e) fad_to_cd_[fa->actionDirection()]);
+                QString filter = gchar_free_to_qstring(get_conversation_filter(conv_item, (conv_direction_e) fad_to_cd_[fa->actionDirection()]));
                 fa->setProperty("filter", filter);
                 subsubmenu->addAction(fa);
                 connect(fa, &QAction::triggered, this, &TrafficTree::useFilterAction);