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-dns.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-dns.c')
| -rw-r--r-- | packet-dns.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/packet-dns.c b/packet-dns.c index e763fc2634..df25723a2d 100644 --- a/packet-dns.c +++ b/packet-dns.c @@ -1,7 +1,7 @@ /* packet-dns.c * Routines for DNS packet disassembly * - * $Id: packet-dns.c,v 1.89 2002/07/16 22:50:45 guy Exp $ + * $Id: packet-dns.c,v 1.90 2002/08/02 23:35:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,10 +26,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif @@ -270,7 +266,7 @@ http://www.microsoft.com/windows2000/library/resources/reskit/samplechapters/cnc which discuss them to some extent. */ static char * -dns_type_name (u_int type) +dns_type_name (guint type) { char *type_names[] = { "unused", @@ -362,7 +358,7 @@ dns_type_name (u_int type) static char * -dns_long_type_name (u_int type) +dns_long_type_name (guint type) { char *type_names[] = { "unused", @@ -773,7 +769,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset, proto_tree * add_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset, const char *name, int namelen, const char *type_name, const char *class_name, - u_int ttl, u_short data_len) + guint ttl, gushort data_len) { proto_tree *rr_tree; @@ -794,7 +790,7 @@ add_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset, static proto_tree * add_opt_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset, const char *name, int namelen, const char *type_name, int class, - u_int ttl, u_short data_len) + guint ttl, gushort data_len) { proto_tree *rr_tree; @@ -870,8 +866,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, int data_offset; int cur_offset; int data_start; - u_int ttl; - u_short data_len; + guint ttl; + gushort data_len; proto_tree *rr_tree = NULL; proto_item *trr = NULL; |