osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More capture_options -> capture_session fixes. 

svn path=/trunk/; revision=49510
This commit is contained in:
Guy Harris 2013-05-22 11:49:36 +00:00
parent 8af092c98f
commit 5bc8bdc40e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/qt/main_window.h
View File

@ -36,6 +36,7 @@
#ifdef HAVE_LIBPCAP
#include "capture_opts.h"
#include "capture_session.h"
#endif
#include <QMainWindow>

5
ui/qt/main_window_slots.cpp
View File

@ -48,6 +48,7 @@
#include "capture.h"
#include "capture-pcap-util.h"
#include "capture_ui_utils.h"
#include "capture_session.h"
#endif
#include "wsutil/file_util.h"
@ -421,11 +422,11 @@ void MainWindow::startCapture() {
// main_auto_scroll_live_changed(auto_scroll_live);
/* XXX - can this ever happen? */
if (global_capture_opts.state != CAPTURE_STOPPED)
if (global_capture_session.state != CAPTURE_STOPPED)
return;
/* close the currently loaded capture file */
cf_close((capture_file *) global_capture_opts.cf);
cf_close((capture_file *) global_capture_session.cf);
/* Copy the selected interfaces to the set of interfaces to use for
this capture. */

16
ui/qt/wireshark_application.h
View File

@ -115,14 +115,14 @@ signals:
#ifdef HAVE_LIBPCAP
// XXX It might make more sense to move these to main.cpp or main_window.cpp or their own class.
void captureCapturePrepared(capture_options *capture_opts);
void captureCaptureUpdateStarted(capture_options *capture_opts);
void captureCaptureUpdateContinue(capture_options *capture_opts);
void captureCaptureUpdateFinished(capture_options *capture_opts);
void captureCaptureFixedStarted(capture_options *capture_opts);
void captureCaptureFixedFinished(capture_options *capture_opts);
void captureCaptureStopping(capture_options *capture_opts);
void captureCaptureFailed(capture_options *capture_opts);
void captureCapturePrepared(capture_session *cap_session);
void captureCaptureUpdateStarted(capture_session *cap_session);
void captureCaptureUpdateContinue(capture_session *cap_session);
void captureCaptureUpdateFinished(capture_session *cap_session);
void captureCaptureFixedStarted(capture_session *cap_session);
void captureCaptureFixedFinished(capture_session *cap_session);
void captureCaptureStopping(capture_session *cap_session);
void captureCaptureFailed(capture_session *cap_session);
#endif
void captureFileOpened(const capture_file *cf);