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-ftp.c | |
| parent | ff72b97ee01caee4dff97d07195d802086c65f38 (diff) | |
| download | wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.gz wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.bz2 wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.zip | |
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-ftp.c')
| -rw-r--r-- | packet-ftp.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/packet-ftp.c b/packet-ftp.c index 4c3d3d5fe8..c49a6d6745 100644 --- a/packet-ftp.c +++ b/packet-ftp.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 2001, Juan Toledo <toledo@users.sourceforge.net> (Passive FTP) * - * $Id: packet-ftp.c,v 1.47 2002/07/17 06:55:19 guy Exp $ + * $Id: packet-ftp.c,v 1.48 2002/08/02 23:35:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -34,14 +34,6 @@ #include <stdlib.h> #include <ctype.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #include <string.h> #include <glib.h> #include <epan/packet.h> @@ -118,11 +110,11 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); * the address and port number. */ static void -handle_pasv_response(const u_char *line, int linelen, packet_info *pinfo) +handle_pasv_response(const guchar *line, int linelen, packet_info *pinfo) { char *args; char *p; - u_char c; + guchar c; int i; int address[4], port[2]; guint16 server_port; @@ -213,13 +205,13 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ftp_tree = NULL; proto_item *ti; gint offset = 0; - const u_char *line; + const guchar *line; guint32 code; gboolean is_pasv_response = FALSE; gint next_offset; int linelen; int tokenlen; - const u_char *next_token; + const guchar *next_token; if (pinfo->match_port == pinfo->destport) is_request = TRUE; |