Give "globals.h" an RCS ID and copyright/GPL notice.
Move some defines that would be used even by a non-GTK+-based Ethereal from "gtk/main.h" to "globals.h". Remove the byte-order #defines from "packet.h", as they're now in "globals.h" (having been moved there from "gtk/main.h"). Fix up some files that use those #defines to include "globals.h". "resolv.c" doesn't use any GTK stuff, so it needn't include <gtk/gtk.h> nor "gtk/main.h" - it only did so to get the byte-order #defines for the benefit of "packet-ipv6.h", and "packet-ipv6.h" now includes them itself. svn path=/trunk/; revision=649
This commit is contained in:
parent
f9f2bf9a28
commit
dc298db578
57
globals.h
57
globals.h
|
@ -1,3 +1,28 @@
|
|||
/* globals.h
|
||||
* Global defines, etc.
|
||||
*
|
||||
* $Id: globals.h,v 1.3 1999/09/10 07:19:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GLOBALS_H__
|
||||
#define __GLOBALS_H__
|
||||
|
||||
|
@ -21,6 +46,38 @@
|
|||
#include "timestamp.h"
|
||||
#endif
|
||||
|
||||
#define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */
|
||||
|
||||
/* Byte swapping routines */
|
||||
#define SWAP16(x) \
|
||||
( (((x) & 0x00ff) << 8) | \
|
||||
(((x) & 0xff00) >> 8) )
|
||||
#define SWAP32(x) \
|
||||
( (((x) & 0x000000ff) << 24) | \
|
||||
(((x) & 0x0000ff00) << 8) | \
|
||||
(((x) & 0x00ff0000) >> 8) | \
|
||||
(((x) & 0xff000000) >> 24) )
|
||||
|
||||
/* Byte ordering */
|
||||
#ifndef BYTE_ORDER
|
||||
#define LITTLE_ENDIAN 4321
|
||||
#define BIG_ENDIAN 1234
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
#define BYTE_ORDER BIG_ENDIAN
|
||||
#else
|
||||
#define BYTE_ORDER LITTLE_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* From the K&R book, p. 89 */
|
||||
#ifndef MAX
|
||||
#define MAX(x, y) ((x) > (y) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
extern FILE *data_out_file;
|
||||
extern packet_info pi;
|
||||
extern capture_file cf;
|
||||
|
|
25
gtk/main.h
25
gtk/main.h
|
@ -1,7 +1,7 @@
|
|||
/* ethereal.h
|
||||
* Global defines, etc.
|
||||
*
|
||||
* $Id: main.h,v 1.2 1999/09/09 03:32:02 gram Exp $
|
||||
* $Id: main.h,v 1.3 1999/09/10 07:19:51 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -45,29 +45,6 @@
|
|||
#define DEF_READY_MESSAGE " Ready to load file"
|
||||
#endif
|
||||
|
||||
#define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */
|
||||
|
||||
/* Byte swapping routines */
|
||||
#define SWAP16(x) \
|
||||
( (((x) & 0x00ff) << 8) | \
|
||||
(((x) & 0xff00) >> 8) )
|
||||
#define SWAP32(x) \
|
||||
( (((x) & 0x000000ff) << 24) | \
|
||||
(((x) & 0x0000ff00) << 8) | \
|
||||
(((x) & 0x00ff0000) >> 8) | \
|
||||
(((x) & 0xff000000) >> 24) )
|
||||
|
||||
/* Byte ordering */
|
||||
#ifndef BYTE_ORDER
|
||||
#define LITTLE_ENDIAN 4321
|
||||
#define BIG_ENDIAN 1234
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
#define BYTE_ORDER BIG_ENDIAN
|
||||
#else
|
||||
#define BYTE_ORDER LITTLE_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
typedef struct _selection_info {
|
||||
GtkWidget *tree;
|
||||
GtkWidget *text;
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include "globals.h"
|
||||
#include "packet.h"
|
||||
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-ipv6.h
|
||||
* Definitions for IPv6 packet disassembly
|
||||
*
|
||||
* $Id: packet-ipv6.h,v 1.4 1999/07/23 15:08:25 gram Exp $
|
||||
* $Id: packet-ipv6.h,v 1.5 1999/09/10 07:19:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -26,6 +26,10 @@
|
|||
#ifndef __PACKET_IPV6_H_DEFINED__
|
||||
#define __PACKET_IPV6_H_DEFINED__
|
||||
|
||||
#ifndef __GLOBALS_H__
|
||||
#include "globals.h"
|
||||
#endif
|
||||
|
||||
struct e_in6_addr {
|
||||
union {
|
||||
guint32 u6_addr32[4];
|
||||
|
|
13
packet.h
13
packet.h
|
@ -1,7 +1,7 @@
|
|||
/* packet.h
|
||||
* Definitions for packet disassembly structures and routines
|
||||
*
|
||||
* $Id: packet.h,v 1.94 1999/09/03 07:20:14 guy Exp $
|
||||
* $Id: packet.h,v 1.95 1999/09/10 07:19:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -62,17 +62,6 @@
|
|||
#define hi_nibble(b) ((b & 0xf0) >> 4)
|
||||
#define lo_nibble(b) (b & 0x0f)
|
||||
|
||||
/* Byte ordering */
|
||||
#ifndef BYTE_ORDER
|
||||
#define LITTLE_ENDIAN 4321
|
||||
#define BIG_ENDIAN 1234
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
#define BYTE_ORDER BIG_ENDIAN
|
||||
#else
|
||||
#define BYTE_ORDER LITTLE_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Useful when you have an array whose size you can tell at compile-time */
|
||||
#define array_length(x) (sizeof x / sizeof x[0])
|
||||
|
||||
|
|
4
resolv.c
4
resolv.c
|
@ -1,7 +1,7 @@
|
|||
/* resolv.c
|
||||
* Routines for network object lookup
|
||||
*
|
||||
* $Id: resolv.c,v 1.9 1999/09/09 02:42:26 gram Exp $
|
||||
* $Id: resolv.c,v 1.10 1999/09/10 07:19:41 guy Exp $
|
||||
*
|
||||
* Laurent Deniel <deniel@worldnet.fr>
|
||||
*
|
||||
|
@ -29,7 +29,6 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -67,7 +66,6 @@
|
|||
# include <setjmp.h>
|
||||
#endif
|
||||
|
||||
#include "gtk/main.h"
|
||||
#include "packet.h"
|
||||
#include "packet-ipv6.h"
|
||||
#include "resolv.h"
|
||||
|
|
Loading…
Reference in New Issue