osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Fix Follow Stream regression in Conversations dialog 

The "Follow Stream" button did not have any effect due to:

    QObject::connect: No such slot MainWindow::openFollowStreamDialog(follow_type_t, guint) in /tmp/wireshark/ui/qt/main_window_slots.cpp:3034
    QObject::connect:  (sender name:   'TrafficTableDialog')
    QObject::connect:  (receiver name: 'MainWindow')

Change-Id: If9ecae9a971bdc31358d95af33a8245aa5df5911
Fixes: v3.1.1rc0-352-g9fff62e2a8 ("Qt, http2: Add Follow HTTP/2 Stream functionality")
Reviewed-on: https://code.wireshark.org/review/34653
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Peter Wu 2019-09-30 01:49:30 +01:00 committed by Alexis La Goutte
parent 486c6fd07c
commit e768e13479
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/qt/conversation_dialog.cpp
View File

@ -212,7 +212,8 @@ void ConversationDialog::followStream()
}
// Will set the display filter too.
emit openFollowStreamDialog(ftype, conv_item->conv_id);
// TCP and UDP do not have a "sub-stream", so set a dummy value.
emit openFollowStreamDialog(ftype, conv_item->conv_id, 0);
}
void ConversationDialog::graphTcp()

2
ui/qt/conversation_dialog.h
View File

@ -57,7 +57,7 @@ public slots:
signals:
void filterAction(QString filter, FilterAction::Action action, FilterAction::ActionType type);
void openFollowStreamDialog(follow_type_t type, guint stream_num);
void openFollowStreamDialog(follow_type_t type, guint stream_num, guint sub_stream_num);
void openTcpStreamGraph(int graph_type);
private:

4
ui/qt/main_window_slots.cpp
View File

@ -3030,8 +3030,8 @@ void MainWindow::statCommandConversations(const char *arg, void *userdata)
ConversationDialog *conv_dialog = new ConversationDialog(*this, capture_file_, GPOINTER_TO_INT(userdata), arg);
connect(conv_dialog, SIGNAL(filterAction(QString, FilterAction::Action, FilterAction::ActionType)),
this, SIGNAL(filterAction(QString, FilterAction::Action, FilterAction::ActionType)));
connect(conv_dialog, SIGNAL(openFollowStreamDialog(follow_type_t, guint)),
this, SLOT(openFollowStreamDialog(follow_type_t, guint)));
connect(conv_dialog, SIGNAL(openFollowStreamDialog(follow_type_t, guint, guint)),
this, SLOT(openFollowStreamDialog(follow_type_t, guint, guint)));
connect(conv_dialog, SIGNAL(openTcpStreamGraph(int)),
this, SLOT(openTcpStreamDialog(int)));
conv_dialog->show();