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

Re-arranged Ethereal's definitions of DLT_RAW et al. since capture.c 

is the only file that uses them. I hope to avoid some compiler warnings
with this.

svn path=/trunk/; revision=512
This commit is contained in:
Gilbert Ramirez 1999-08-18 16:28:22 +00:00
parent 648ffa1435
commit c1adce9762
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
capture.h
View File

@ -1,7 +1,7 @@
/* capture.h
* Definitions for packet capture windows
*
* $Id: capture.h,v 1.12 1999/08/15 22:31:22 guy Exp $
* $Id: capture.h,v 1.13 1999/08/18 16:28:22 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -32,6 +32,23 @@
#include <pcap.h>
#endif
/* The version of pcap.h that comes with some systems is missing these
* #defines.
*/
#ifndef DLT_RAW
#define DLT_RAW 12
#endif
#ifndef DLT_SLIP_BSDOS
#define DLT_SLIP_BSDOS 13
#endif
#ifndef DLT_PPP_BSDOS
#define DLT_PPP_BSDOS 14
#endif
void capture_prep_cb(GtkWidget *, gpointer);
void capture(void);

3
file.h
View File

@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
* $Id: file.h,v 1.37 1999/08/18 04:17:28 guy Exp $
* $Id: file.h,v 1.38 1999/08/18 16:28:22 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -44,6 +44,7 @@
#endif
#endif
#ifndef __DFILTER_H__
#include "dfilter.h"
#endif

18
packet.h
View File

@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
* $Id: packet.h,v 1.84 1999/08/18 00:57:54 guy Exp $
* $Id: packet.h,v 1.85 1999/08/18 16:28:22 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -312,22 +312,6 @@ enum {
NUM_TREE_TYPES /* last item number plus one */
};
/* The version of pcap.h that comes with some systems is missing these
* #defines.
*/
#ifndef DLT_RAW
#define DLT_RAW 12
#endif
#ifndef DLT_SLIP_BSDOS
#define DLT_SLIP_BSDOS 13
#endif
#ifndef DLT_PPP_BSDOS
#define DLT_PPP_BSDOS 14
#endif
/* Utility routines used by packet*.c */
gchar* ether_to_str(const guint8 *);