Adjust some spacing ....
svn path=/trunk/; revision=27457
This commit is contained in:
parent
ace4af44fc
commit
6c47f763a3
6
cfile.c
6
cfile.c
@ -44,14 +44,14 @@ init_cap_file(capture_file *cf)
|
|||||||
{
|
{
|
||||||
/* Initialize the capture file struct */
|
/* Initialize the capture file struct */
|
||||||
cf->plist = NULL;
|
cf->plist = NULL;
|
||||||
cf->plist_end = NULL;
|
cf->plist_end = NULL;
|
||||||
cf->wth = NULL;
|
cf->wth = NULL;
|
||||||
cf->filename = NULL;
|
cf->filename = NULL;
|
||||||
cf->user_saved = FALSE;
|
cf->user_saved = FALSE;
|
||||||
cf->is_tempfile = FALSE;
|
cf->is_tempfile = FALSE;
|
||||||
cf->rfcode = NULL;
|
cf->rfcode = NULL;
|
||||||
cf->dfilter = NULL;
|
cf->dfilter = NULL;
|
||||||
cf->has_snap = FALSE;
|
cf->has_snap = FALSE;
|
||||||
cf->snap = WTAP_MAX_PACKET_SIZE;
|
cf->snap = WTAP_MAX_PACKET_SIZE;
|
||||||
cf->count = 0;
|
cf->count = 0;
|
||||||
cf->pstats = NULL;
|
cf->pstats = NULL;
|
||||||
|
90
cfile.h
90
cfile.h
@ -27,65 +27,65 @@
|
|||||||
|
|
||||||
/* Current state of file. */
|
/* Current state of file. */
|
||||||
typedef enum {
|
typedef enum {
|
||||||
FILE_CLOSED, /* No file open */
|
FILE_CLOSED, /* No file open */
|
||||||
FILE_READ_IN_PROGRESS, /* Reading a file we've opened */
|
FILE_READ_IN_PROGRESS, /* Reading a file we've opened */
|
||||||
FILE_READ_ABORTED, /* Read aborted by user */
|
FILE_READ_ABORTED, /* Read aborted by user */
|
||||||
FILE_READ_DONE /* Read completed */
|
FILE_READ_DONE /* Read completed */
|
||||||
} file_state;
|
} file_state;
|
||||||
|
|
||||||
/* Character set for text search. */
|
/* Character set for text search. */
|
||||||
typedef enum {
|
typedef enum {
|
||||||
SCS_ASCII_AND_UNICODE,
|
SCS_ASCII_AND_UNICODE,
|
||||||
SCS_ASCII,
|
SCS_ASCII,
|
||||||
SCS_UNICODE
|
SCS_UNICODE
|
||||||
/* add EBCDIC when it's implemented */
|
/* add EBCDIC when it's implemented */
|
||||||
} search_charset_t;
|
} search_charset_t;
|
||||||
|
|
||||||
typedef struct _capture_file {
|
typedef struct _capture_file {
|
||||||
file_state state; /* Current state of capture file */
|
file_state state; /* Current state of capture file */
|
||||||
gchar *filename; /* Name of capture file */
|
gchar *filename; /* Name of capture file */
|
||||||
gboolean is_tempfile; /* Is capture file a temporary file? */
|
gboolean is_tempfile; /* Is capture file a temporary file? */
|
||||||
gboolean user_saved;/* If capture file is temporary, has it been saved by user yet? */
|
gboolean user_saved; /* If capture file is temporary, has it been saved by user yet? */
|
||||||
gint64 f_datalen; /* Size of capture file data (uncompressed) */
|
gint64 f_datalen; /* Size of capture file data (uncompressed) */
|
||||||
guint16 cd_t; /* File type of capture file */
|
guint16 cd_t; /* File type of capture file */
|
||||||
int lnk_t; /* Link-layer type with which to save capture */
|
int lnk_t; /* Link-layer type with which to save capture */
|
||||||
guint32 vers; /* Version. For tcpdump minor is appended to major */
|
guint32 vers; /* Version. For tcpdump minor is appended to major */
|
||||||
int count; /* Total number of frames */
|
int count; /* Total number of frames */
|
||||||
int displayed_count; /* Number of displayed frames */
|
int displayed_count; /* Number of displayed frames */
|
||||||
int marked_count; /* Number of marked frames */
|
int marked_count; /* Number of marked frames */
|
||||||
gboolean drops_known; /* TRUE if we know how many packets were dropped */
|
gboolean drops_known; /* TRUE if we know how many packets were dropped */
|
||||||
guint32 drops; /* Dropped packets */
|
guint32 drops; /* Dropped packets */
|
||||||
nstime_t elapsed_time;/* Elapsed time */
|
nstime_t elapsed_time; /* Elapsed time */
|
||||||
gboolean has_snap; /* TRUE if maximum capture packet length is known */
|
gboolean has_snap; /* TRUE if maximum capture packet length is known */
|
||||||
int snap; /* Maximum captured packet length */
|
int snap; /* Maximum captured packet length */
|
||||||
wtap *wth; /* Wiretap session */
|
wtap *wth; /* Wiretap session */
|
||||||
dfilter_t *rfcode; /* Compiled read (display) filter program */
|
dfilter_t *rfcode; /* Compiled read (display) filter program */
|
||||||
gchar *dfilter; /* Display filter string */
|
gchar *dfilter; /* Display filter string */
|
||||||
gboolean redissecting; /* TRUE if currently redissecting (cf_redissect_packets) */
|
gboolean redissecting; /* TRUE if currently redissecting (cf_redissect_packets) */
|
||||||
/* search */
|
/* search */
|
||||||
gchar *sfilter; /* Search filter string */
|
gchar *sfilter; /* Search filter string */
|
||||||
gboolean sbackward; /* TRUE if search is backward, FALSE if forward */
|
gboolean sbackward; /* TRUE if search is backward, FALSE if forward */
|
||||||
gboolean hex; /* TRUE is raw data search is being performed */
|
gboolean hex; /* TRUE is raw data search is being performed */
|
||||||
gboolean string; /* TRUE is text search is being performed */
|
gboolean string; /* TRUE is text search is being performed */
|
||||||
guint32 search_pos; /* Position of last character found in search */
|
guint32 search_pos; /* Position of last character found in search */
|
||||||
search_charset_t scs_type; /* Character set for text search */
|
search_charset_t scs_type; /* Character set for text search */
|
||||||
gboolean case_type; /* TRUE if case-insensitive text search */
|
gboolean case_type; /* TRUE if case-insensitive text search */
|
||||||
gboolean decode_data; /* TRUE if searching protocol tree text */
|
gboolean decode_data; /* TRUE if searching protocol tree text */
|
||||||
gboolean summary_data; /* TRUE if searching Info column text */
|
gboolean summary_data; /* TRUE if searching Info column text */
|
||||||
/* packet data */
|
/* packet data */
|
||||||
union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */
|
union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */
|
||||||
guint8 pd[WTAP_MAX_PACKET_SIZE]; /* Packet data */
|
guint8 pd[WTAP_MAX_PACKET_SIZE]; /* Packet data */
|
||||||
GMemChunk *plist_chunk; /* Memory chunk for frame_data structures */
|
GMemChunk *plist_chunk; /* Memory chunk for frame_data structures */
|
||||||
frame_data *plist; /* Packet list */
|
frame_data *plist; /* Packet list */
|
||||||
frame_data *plist_end; /* Last packet in list */
|
frame_data *plist_end; /* Last packet in list */
|
||||||
frame_data *first_displayed; /* First frame displayed */
|
frame_data *first_displayed; /* First frame displayed */
|
||||||
frame_data *last_displayed; /* Last frame displayed */
|
frame_data *last_displayed; /* Last frame displayed */
|
||||||
column_info cinfo; /* Column formatting information */
|
column_info cinfo; /* Column formatting information */
|
||||||
frame_data *current_frame; /* Frame data for current frame */
|
frame_data *current_frame; /* Frame data for current frame */
|
||||||
gint current_row; /* Row number for current frame */
|
gint current_row; /* Row number for current frame */
|
||||||
epan_dissect_t *edt; /* Protocol dissection for currently selected packet */
|
epan_dissect_t *edt; /* Protocol dissection for currently selected packet */
|
||||||
field_info *finfo_selected; /* Field info for currently selected field */
|
field_info *finfo_selected; /* Field info for currently selected field */
|
||||||
struct ph_stats_s* pstats; /* accumulated stats (reset on redisplay in GUI)*/
|
struct ph_stats_s* pstats; /* accumulated stats (reset on redisplay in GUI)*/
|
||||||
} capture_file;
|
} capture_file;
|
||||||
|
|
||||||
void init_cap_file(capture_file *);
|
void init_cap_file(capture_file *);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user