diff options
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/main.cpp | 4 | ||||
-rw-r--r-- | ui/qt/main_status_bar.cpp | 4 | ||||
-rw-r--r-- | ui/qt/main_status_bar.h | 2 | ||||
-rw-r--r-- | ui/qt/main_window.cpp | 29 | ||||
-rw-r--r-- | ui/qt/wireshark_application.cpp | 18 | ||||
-rw-r--r-- | ui/qt/wireshark_application.h | 2 |
6 files changed, 30 insertions, 29 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index f3cd0cc948..61d88dd748 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -151,10 +151,10 @@ extern capture_options global_capture_opts; #endif static void -main_capture_callback(gint event, capture_options *capture_opts, gpointer user_data ) +main_capture_callback(gint event, capture_session *cap_session, gpointer user_data ) { Q_UNUSED(user_data); - wsApp->captureCallback(event, capture_opts); + wsApp->captureCallback(event, cap_session); } static void diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 66e0453101..89ba1d6ea6 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -295,12 +295,12 @@ void MainStatusBar::popProfileStatus() { profile_status_.popText(STATUS_CTX_MAIN); } -void MainStatusBar::updateCaptureStatistics(capture_options *capture_opts) +void MainStatusBar::updateCaptureStatistics(capture_session *cap_session) { QString packets_str; /* Do we have any packets? */ - if ((!capture_opts || capture_opts->cf == cap_file_) && cap_file_ && cap_file_->count) { + if ((!cap_session || cap_session->cf == cap_file_) && cap_file_ && cap_file_->count) { packets_str.append(QString(tr("Packets: %1 %4 Displayed: %2 %4 Marked: %3")) .arg(cap_file_->count) .arg(cap_file_->displayed_count) diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h index 5eceb9e889..6c5222e3c3 100644 --- a/ui/qt/main_status_bar.h +++ b/ui/qt/main_status_bar.h @@ -68,7 +68,7 @@ public slots: void pushFilterStatus(QString &message); void popFilterStatus(); void pushProfileName(); - void updateCaptureStatistics(capture_options * capture_opts); + void updateCaptureStatistics(capture_session * cap_session); private slots: void pushPacketStatus(QString &message); diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 33c362d960..0f72bab49b 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -35,6 +35,7 @@ #include "capture.h" #include "capture-pcap-util.h" #include "capture_ui_utils.h" +#include "capture_session.h" #endif #include "ui/alert_box.h" @@ -179,20 +180,20 @@ MainWindow::MainWindow(QWidget *parent) : main_welcome_ = main_ui_->welcomePage; #ifdef HAVE_LIBPCAP - connect(wsApp, SIGNAL(captureCapturePrepared(capture_options *)), - this, SLOT(captureCapturePrepared(capture_options *))); - connect(wsApp, SIGNAL(captureCaptureUpdateStarted(capture_options *)), - this, SLOT(captureCaptureUpdateStarted(capture_options *))); - connect(wsApp, SIGNAL(captureCaptureUpdateFinished(capture_options *)), - this, SLOT(captureCaptureUpdateFinished(capture_options *))); - connect(wsApp, SIGNAL(captureCaptureFixedStarted(capture_options *)), - this, SLOT(captureCaptureFixedStarted(capture_options *))); - connect(wsApp, SIGNAL(captureCaptureFixedFinished(capture_options *)), - this, SLOT(captureCaptureFixedFinished(capture_options *))); - connect(wsApp, SIGNAL(captureCaptureStopping(capture_options *)), - this, SLOT(captureCaptureStopping(capture_options *))); - connect(wsApp, SIGNAL(captureCaptureFailed(capture_options *)), - this, SLOT(captureCaptureFailed(capture_options *))); + connect(wsApp, SIGNAL(captureCapturePrepared(capture_session *)), + this, SLOT(captureCapturePrepared(capture_session *))); + connect(wsApp, SIGNAL(captureCaptureUpdateStarted(capture_session *)), + this, SLOT(captureCaptureUpdateStarted(capture_session *))); + connect(wsApp, SIGNAL(captureCaptureUpdateFinished(capture_session *)), + this, SLOT(captureCaptureUpdateFinished(capture_session *))); + connect(wsApp, SIGNAL(captureCaptureFixedStarted(capture_session *)), + this, SLOT(captureCaptureFixedStarted(capture_session *))); + connect(wsApp, SIGNAL(captureCaptureFixedFinished(capture_session *)), + this, SLOT(captureCaptureFixedFinished(capture_session *))); + connect(wsApp, SIGNAL(captureCaptureStopping(capture_session *)), + this, SLOT(captureCaptureStopping(capture_session *))); + connect(wsApp, SIGNAL(captureCaptureFailed(capture_session *)), + this, SLOT(captureCaptureFailed(capture_session *))); #endif connect(wsApp, SIGNAL(captureFileOpened(const capture_file*)), diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 8d45bc09e3..740aad0606 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -187,45 +187,45 @@ void WiresharkApplication::refreshRecentFiles(void) { } } -void WiresharkApplication::captureCallback(int event, capture_options * capture_opts) +void WiresharkApplication::captureCallback(int event, capture_session * cap_session) { switch(event) { case(capture_cb_capture_prepared): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture prepared"); - emit captureCapturePrepared(capture_opts); + emit captureCapturePrepared(cap_session); break; case(capture_cb_capture_update_started): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update started"); - emit captureCaptureUpdateStarted(capture_opts); + emit captureCaptureUpdateStarted(cap_session); break; case(capture_cb_capture_update_continue): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update continue"); - emit captureCaptureUpdateContinue(capture_opts); + emit captureCaptureUpdateContinue(cap_session); break; case(capture_cb_capture_update_finished): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update finished"); - emit captureCaptureUpdateFinished(capture_opts); + emit captureCaptureUpdateFinished(cap_session); break; case(capture_cb_capture_fixed_started): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture fixed started"); - emit captureCaptureFixedStarted(capture_opts); + emit captureCaptureFixedStarted(cap_session); break; case(capture_cb_capture_fixed_continue): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture fixed continue"); break; case(capture_cb_capture_fixed_finished): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture fixed finished"); - emit captureCaptureFixedFinished(capture_opts); + emit captureCaptureFixedFinished(cap_session); break; case(capture_cb_capture_stopping): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture stopping"); /* Beware: this state won't be called, if the capture child * closes the capturing on it's own! */ - emit captureCaptureStopping(capture_opts); + emit captureCaptureStopping(cap_session); break; case(capture_cb_capture_failed): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture failed"); - emit captureCaptureFailed(capture_opts); + emit captureCaptureFailed(cap_session); break; default: g_warning("main_capture_callback: event %u unknown", event); diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index f8ae3a89e0..82c44dccfe 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -75,7 +75,7 @@ public: QList<recent_item_status *> recentItems() const; void addRecentItem(const QString &filename, qint64 size, bool accessible); #ifdef HAVE_LIBPCAP - void captureCallback(int event, capture_options * capture_opts); + void captureCallback(int event, capture_session * cap_session); #endif void captureFileCallback(int event, void * data); QDir lastOpenDir(); |