diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /ui/qt | |
parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/bluetooth_att_server_attributes_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/bluetooth_devices_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/bluetooth_hci_summary_dialog.cpp | 24 | ||||
-rw-r--r-- | ui/qt/iax2_analysis_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/lbm_lbtrm_transport_dialog.cpp | 8 | ||||
-rw-r--r-- | ui/qt/lbm_lbtru_transport_dialog.cpp | 16 | ||||
-rw-r--r-- | ui/qt/lbm_stream_dialog.cpp | 10 | ||||
-rw-r--r-- | ui/qt/lbm_uimflow_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/packet_list.cpp | 4 | ||||
-rw-r--r-- | ui/qt/packet_list_record.cpp | 2 | ||||
-rw-r--r-- | ui/qt/rtp_analysis_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/rtp_audio_stream.cpp | 2 |
12 files changed, 38 insertions, 38 deletions
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index 2b787552da..ae20f883e5 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -237,7 +237,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet item->setText(column_number_handle, handle); item->setText(column_number_uuid, uuid); item->setText(column_number_uuid_name, uuid_name); - item->setData(0, Qt::UserRole, qVariantFromValue(pinfo->fd->num)); + item->setData(0, Qt::UserRole, qVariantFromValue(pinfo->num)); for (int i = 0; i < dialog->ui->tableTreeWidget->columnCount(); i++) { dialog->ui->tableTreeWidget->resizeColumnToContents(i); diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp index 4991b8e22b..914fbd3d1e 100644 --- a/ui/qt/bluetooth_devices_dialog.cpp +++ b/ui/qt/bluetooth_devices_dialog.cpp @@ -270,7 +270,7 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo item_data_t *item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_device->interface_id; item_data->adapter_id = tap_device->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); } diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 035735837d..c896ac091a 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -406,7 +406,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi break; frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_ogf, QString("").sprintf("0x%02X", tap_hci->ogf)); frame_item->setText(column_number_ocf, QString("").sprintf("0x%04X", tap_hci->ocf)); frame_item->setText(column_number_opcode, QString("").sprintf("0x%04X", tap_hci->ogf << 10 | tap_hci->ocf)); @@ -415,7 +415,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -454,14 +454,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi break; frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_event, QString("").sprintf("0x%02X", tap_hci->event)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -491,14 +491,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_status, QString("").sprintf("0x%02X", tap_hci->status)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -525,14 +525,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_status, QString("").sprintf("%u", tap_hci->status)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -562,14 +562,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_reason, QString("").sprintf("0x%02X", tap_hci->reason)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; @@ -596,14 +596,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1)); frame_item = new QTreeWidgetItem(); - frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num)); + frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num)); frame_item->setText(column_number_hardware_error, QString("").sprintf("0x%02X", tap_hci->hardware_error)); item->addChild(frame_item); item_data = wmem_new(wmem_file_scope(), item_data_t); item_data->interface_id = tap_hci->interface_id; item_data->adapter_id = tap_hci->adapter_id; - item_data->frame_number = pinfo->fd->num; + item_data->frame_number = pinfo->num; frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data)); break; diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index b8cb240a1f..506398b30c 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -81,7 +81,7 @@ public: Iax2AnalysisTreeWidgetItem(QTreeWidget *tree, tap_iax2_stat_t *statinfo, packet_info *pinfo) : QTreeWidgetItem(tree, iax2_analysis_type_) { - frame_num_ = pinfo->fd->num; + frame_num_ = pinfo->num; pkt_len_ = pinfo->fd->pkt_len; flags_ = statinfo->flags; if (flags_ & STAT_FLAG_FIRST) { diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 54f199e640..8bf3553aa3 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -512,7 +512,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons sqn = it.value(); } } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else if (tap_info->type == LBTRM_PACKET_TYPE_NCF) { @@ -535,7 +535,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(tap_info->ncf_reason, pinfo->fd->num); + sqn->processFrame(tap_info->ncf_reason, pinfo->num); } } else if (tap_info->type == LBTRM_PACKET_TYPE_SM) @@ -555,7 +555,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else { @@ -874,7 +874,7 @@ void LBMLBTRMReceiverTransportEntry::processPacket(const packet_info * pinfo, co { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } } else diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 447f1829fa..190ff5ae71 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -657,7 +657,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else { @@ -674,7 +674,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons sqn = it.value(); } } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else if (tap_info->type == LBTRU_PACKET_TYPE_NCF) { @@ -697,7 +697,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(tap_info->ncf_reason, pinfo->fd->num); + sqn->processFrame(tap_info->ncf_reason, pinfo->num); } } else if (tap_info->type == LBTRU_PACKET_TYPE_SM) @@ -717,7 +717,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } else if (tap_info->type == LBTRU_PACKET_TYPE_RST) { @@ -736,7 +736,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { reason = it.value(); } - reason->processFrame(pinfo->fd->num); + reason->processFrame(pinfo->num); } else { @@ -1105,7 +1105,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } } break; @@ -1126,7 +1126,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { sqn = it.value(); } - sqn->processFrame(pinfo->fd->num); + sqn->processFrame(pinfo->num); } break; case LBTRU_PACKET_TYPE_CREQ: @@ -1146,7 +1146,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { req = it.value(); } - req->processFrame(pinfo->fd->num); + req->processFrame(pinfo->num); } break; default: diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index cc0341acac..b687cfc9a5 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -209,13 +209,13 @@ void LBMStreamEntry::processPacket(const packet_info * pinfo, const lbm_uim_stre LBMSubstreamEntry * substream = NULL; LBMSubstreamMapIterator it; - if (m_first_frame > pinfo->fd->num) + if (m_first_frame > pinfo->num) { - m_first_frame = pinfo->fd->num; + m_first_frame = pinfo->num; } - if (m_flast_frame < pinfo->fd->num) + if (m_flast_frame < pinfo->num) { - m_flast_frame = pinfo->fd->num; + m_flast_frame = pinfo->num; } m_bytes += stream_info->bytes; m_messages++; @@ -236,7 +236,7 @@ void LBMStreamEntry::processPacket(const packet_info * pinfo, const lbm_uim_stre substream = it.value(); } fillItem(); - substream->processPacket(pinfo->fd->num, stream_info->bytes); + substream->processPacket(pinfo->num, stream_info->bytes); } void LBMStreamEntry::setItem(QTreeWidgetItem * item) diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index c166a43fb4..f1b74517be 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -125,7 +125,7 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t)); copy_address(&(item->src_addr), &(pinfo->src)); copy_address(&(item->dst_addr), &(pinfo->dst)); - item->frame_number = pinfo->fd->num; + item->frame_number = pinfo->num; item->port_src = pinfo->srcport; item->port_dst = pinfo->destport; item->protocol = g_strdup(port_type_to_str(pinfo->ptype)); diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 11d7e2e585..ae4bb53d18 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -457,9 +457,9 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS if (proto_tree_ && cap_file_->edt->tree) { packet_info *pi = &cap_file_->edt->pi; - related_packet_delegate_.setCurrentFrame(pi->fd->num); + related_packet_delegate_.setCurrentFrame(pi->num); proto_tree_->fillProtocolTree(cap_file_->edt->tree); - conversation_t *conv = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype, + conversation_t *conv = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype, pi->srcport, pi->destport, 0); if (conv) { related_packet_delegate_.setConversation(conv); diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp index bdd17905a6..8fab6f03f9 100644 --- a/ui/qt/packet_list_record.cpp +++ b/ui/qt/packet_list_record.cpp @@ -166,7 +166,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color) data_ver_ = col_data_ver_; packet_info *pi = &edt.pi; - conv_ = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype, + conv_ = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype, pi->srcport, pi->destport, 0); epan_dissect_cleanup(&edt); diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index 04ddece52c..6821ce6af7 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -83,7 +83,7 @@ public: RtpAnalysisTreeWidgetItem(QTreeWidget *tree, tap_rtp_stat_t *statinfo, packet_info *pinfo, const struct _rtp_info *rtpinfo) : QTreeWidgetItem(tree, rtp_analysis_type_) { - frame_num_ = pinfo->fd->num; + frame_num_ = pinfo->num; sequence_num_ = rtpinfo->info_seq_num; pkt_len_ = pinfo->fd->pkt_len; flags_ = statinfo->flags; diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index 7ccaba690c..5cfba191e8 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -141,7 +141,7 @@ void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const struct start_abs_offset_ = nstime_to_sec(&pinfo->abs_ts) - start_rel_time_; start_rel_time_ = stop_rel_time_ = nstime_to_sec(&pinfo->rel_ts); } - rtp_packet->frame_num = pinfo->fd->num; + rtp_packet->frame_num = pinfo->num; rtp_packet->arrive_offset = nstime_to_sec(&pinfo->rel_ts) - start_rel_time_; rtp_packets_ << rtp_packet; |