diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 23:36:07 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 23:36:07 +0000 |
| commit | 173fe5aef4167b9ad35fe514d05ef25fb66c076f (patch) | |
| tree | 21967e4c27ac5e02aa39319022dd2858682fc5f4 /packet-bootp.c | |
| parent | ff72b97ee01caee4dff97d07195d802086c65f38 (diff) | |
Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.
svn path=/trunk/; revision=5932
Diffstat (limited to 'packet-bootp.c')
| -rw-r--r-- | packet-bootp.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/packet-bootp.c b/packet-bootp.c index 24fc623b5b..4382305e1b 100644 --- a/packet-bootp.c +++ b/packet-bootp.c @@ -2,7 +2,7 @@ * Routines for BOOTP/DHCP packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-bootp.c,v 1.68 2002/06/29 19:45:01 guy Exp $ + * $Id: packet-bootp.c,v 1.69 2002/08/02 23:35:47 jmayer Exp $ * * The information used comes from: * RFC 951: Bootstrap Protocol @@ -39,10 +39,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <string.h> #include <glib.h> #include <epan/int-64bit.h> @@ -146,11 +142,11 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, { char *text; enum field_type ftype; - u_char code = tvb_get_guint8(tvb, voff); + guchar code = tvb_get_guint8(tvb, voff); int vlen; - u_char byte; + guchar byte; int i,optp, consumed; - u_long time_secs; + gulong time_secs; proto_tree *v_tree; proto_item *vti; guint8 protocol; @@ -767,12 +763,12 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, case val_u_short: if (vlen == 2) { - /* one u_short */ + /* one gushort */ proto_tree_add_text(bp_tree, tvb, voff, consumed, "Option %d: %s = %d", code, text, tvb_get_ntohs(tvb, voff+2)); } else { - /* > 1 u_short */ + /* > 1 gushort */ vti = proto_tree_add_text(bp_tree, tvb, voff, consumed, "Option %d: %s", code, text); v_tree = proto_item_add_subtree(vti, ett_bootp_option); |