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

Sigh, it was a "building without libpcap" issue. 

svn path=/trunk/; revision=49507
This commit is contained in:
Guy Harris 2013-05-22 10:21:52 +00:00
parent d78bbae6a7
commit 107fa2d599
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
capture_session.h
View File

@ -35,7 +35,7 @@ typedef enum {
/*
* State of a capture session.
*/
struct oh_shut_up_already {
typedef struct {
int fork_child; /**< If not -1, in parent, process ID of child */
int fork_child_status; /**< Child exit status */
#ifdef _WIN32
@ -49,9 +49,7 @@ struct oh_shut_up_already {
gboolean session_started;
capture_options *capture_opts; /**< options for this capture */
void *cf; /**< handle to cfile (note: untyped handle) */
};
typedef struct oh_shut_up_already capture_session;
} capture_session;
extern void
capture_session_init(capture_session *cap_session, void *cf);

31
ui/gtk/main.c
View File

@ -126,7 +126,6 @@
#include "capture_ui_utils.h"
#include "capture-pcap-util.h"
#include "capture_ifinfo.h"
#include "capture_session.h"
#include "capture.h"
#include "capture_sync.h"
#endif
@ -210,36 +209,10 @@
*/
#define RC_FILE "gtkrc"
#ifdef HAVE_LIBPCAP
capture_options global_capture_opts;
/* Current state of capture engine. XXX - differentiate states */
typedef enum {
CAPTURE_STOPPED, /**< stopped */
CAPTURE_PREPARING, /**< preparing, but still no response from capture child */
CAPTURE_RUNNING /**< capture child signalled ok, capture is running now */
} capture_state;
/*
* State of a capture session.
*/
struct oh_shut_up_already {
int fork_child; /**< If not -1, in parent, process ID of child */
int fork_child_status; /**< Child exit status */
#ifdef _WIN32
int signal_pipe_write_fd; /**< the pipe to signal the child */
capture_session global_capture_session;
#endif
capture_state state; /**< current state of the capture engine */
#ifndef _WIN32
uid_t owner; /**< owner of the cfile */
gid_t group; /**< group of the cfile */
#endif
gboolean session_started;
capture_options *capture_opts; /**< options for this capture */
void *cf; /**< handle to cfile (note: untyped handle) */
};
typedef struct oh_shut_up_already capture_session;
struct oh_shut_up_already global_capture_session;
capture_file cfile;