svn commit: r603673 - /httpd/mod_ftp/trunk/include/mod_ftp.h

[wr...@apache.org]

Author: wrowe
Date: Wed Dec 12 09:05:34 2007
New Revision: 603673

URL: http://svn.apache.org/viewvc?rev=603673&view=rev
Log:
Reorder by functional group; this is something we can't do after a release, 
it would break ftp sub-modules.

Modified:
    httpd/mod_ftp/trunk/include/mod_ftp.h

Modified: httpd/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/mod_ftp.h?rev=603673&r1=603672&r2=603673&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/mod_ftp.h (original)
+++ httpd/mod_ftp/trunk/include/mod_ftp.h Wed Dec 12 09:05:34 2007
@@ -268,75 +268,54 @@
  */
 struct ftp_connection
 {
-    /* The connection, needed since we don't always have a request_rec */
-    conn_rec *connection;
+    conn_rec *connection;     /* The connection */
+    server_rec *orig_server;  /* Stow the original server for reset */
+    int timeout;              /* User defined connection timeout values */
+    int close_connection;     /* Final control command was processed */
+    const char *response_notes; /* Notes for response handling. */
 
-    /* Stow the original server for reset with the USER command */
-    server_rec *orig_server;
-    
     /* User information */
     int logged_in;
     const char *user;
     const char *authorization;
     int login_attempts;
-    int close_connection;
 
     /* Security information */
-    int auth;     /* The AUTH type.  One of NONE/SSL/TLS */
-    int pbsz;     /* Data protection buffer size.  Usually zero. */
-    int prot;     /* Data channel protection level. C/S/E/P */
+    int auth;                 /* The AUTH type.  One of NONE/SSL/TLS */
+    int pbsz;                 /* Data protection buffer size.  Usually zero. */
+    int prot;                 /* Data channel protection level. C/S/E/P */
     int is_secure;
     void *ssl_input_ctx;
     void *ssl_output_ctx;
 
-    /* Directory information */
-    const char *cwd;
-
-    /* Filter information */
-    int filter_mask;
-
     /* Connection stats */
     int files;
     apr_off_t traffic;
     apr_off_t bytes;
     int transfers;
 
-    /* User defined connection timeout values */
-    int timeout;
-
-    /* For data transfers */
-    apr_off_t restart_point;
+    /* Command state */
+    const char *cwd;          /* Directory information */
+    const char *rename_from;  /* Storage for the RNFR command.  */
+    int type;                 /* FTP transmission (TYPE_A/TYPE_I) */
+    apr_off_t restart_point;  /* For data transfers */
+    int filter_mask;          /* Filters required (CRLF, BYTERANGE, etc) */
+
+    /* Data channel state */
+    int all_epsv;             /* EPSV ALL command issued (refuse all others) */
+    apr_socket_t *csock;      /* The local data socket we connect/accept on */
+    apr_socket_t *datasock;   /* The remote data socket we send/recv on */
     apr_sockaddr_t *clientsa;
-    apr_socket_t *csock;      /* The socket we connect/accept from */
-
-    /* Notes for response handling.  Yes, it's a bit of a hack. */
-    const char *response_notes;
-
+    apr_time_t passive_created; /* Passive creation time or (-1) for active */
     const char *sending_file; /* The file we are currently sending */
-    apr_socket_t *datasock;   /* The data socket we send/recv on */
     int in_sending;           /* Set by the filter once a file is in transit */
-    
-    /* Storage for the RNFR command.  */
-    const char *rename_from;
-
-    /* FTP transmission parameters */
-    int type;
-    /* When did we create the passive connection?  This is used 
-     * as a passive v.s. active (-1) flag, and within the process_request 
-     * loop to make sure that the passive connection isn't open indefinately.
-     */
-    apr_time_t passive_created;
-
-    /* The look-ahead for the next command, since it doesn't have 
-     * it's own request_rec just yet
-     */
-    apr_socket_t *cntlsock;   /* The control socket we must watch */
-    apr_pool_t *next_pool;
+
+    /* Look-ahead for "next" command */
+    apr_socket_t *cntlsock;   /* The control socket to watch for next cmd */
+    apr_pool_t *next_pool;    /* Storage to get us to the next request_rec */
     apr_bucket_brigade *next_bb;
     char *next_request;
     apr_size_t next_reqsize;
-
-    int all_epsv; /* refuse PORT/PASV/EPRT due to prior EPSV ALL command */
 };
 
 #define FTP_DEFAULT_UMASK (APR_GWRITE | APR_WWRITE)