diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-15 20:35:51 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-11-16 13:45:18 +0000 |
| commit | f92ed4df2d4720720080d8013da124a0eb956de7 (patch) | |
| tree | 2b3bf92972a849fe668f121e53e45bfe1b7c6451 /ui/qt/packet_list.cpp | |
| parent | 3b8ed366ddd149f2cc1428a713235c18afc192e7 (diff) | |
| download | wireshark-f92ed4df2d4720720080d8013da124a0eb956de7.tar.gz | |
Remove ipproto member of packet_info.
All situations can be handled with "shimmed" dissector functions.
Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
Reviewed-on: https://code.wireshark.org/review/5327
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui/qt/packet_list.cpp')
| -rw-r--r-- | ui/qt/packet_list.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 1ab73e1152..f55f3a432e 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -491,15 +491,14 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS void PacketList::contextMenuEvent(QContextMenuEvent *event) { QAction *action; - gboolean is_tcp = FALSE, is_udp = FALSE; + gboolean is_tcp = FALSE, is_udp = FALSE, is_sctp = FALSE; /* walk the list of a available protocols in the packet to see what we have */ if (cap_file_ != NULL && cap_file_->edt != NULL) - proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL, NULL); + proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, &is_sctp, NULL); action = window()->findChild<QAction *>("actionSCTP"); - if (cap_file_ != NULL && cap_file_->edt != NULL && - cap_file_->edt->pi.ipproto == IP_PROTO_SCTP) + if (cap_file_ != NULL && cap_file_->edt != NULL && is_sctp) action->setEnabled(TRUE); else action->setEnabled(FALSE); |