Changeset 17876 for src/router/proftpd/include/proftpd.h

Timestamp:

11/11/11 13:17:43 (19 months ago)

Author:

BrainSlayer

Message:

update proftp

File:

• src/router/proftpd/include/proftpd.h (modified) (9 diffs)

src/router/proftpd/include/proftpd.h

@@ -3 +3 @@
  * Copyright (c) 1997, 1998 Public Flood Software
  * Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver@tos.net>
- * Copyright (c) 2001-2008 The ProFTPD Project team
+ * Copyright (c) 2001-2011 The ProFTPD Project team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
  *
  * As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu
@@ -26 +26 @@
 
 /* General options
- * $Id: proftpd.h,v 1.60 2009/09/02 17:58:53 castaglia Exp $
+ * $Id: proftpd.h,v 1.71 2011/09/21 05:40:04 castaglia Exp $
  */
 
@@ -64 +64 @@
 struct cmd_struc;
 struct config_struc;
+struct modret_struc;
 
 typedef struct {
@@ -124 +125 @@
 
   int wtmp_log;                         /* Are we logging to wtmp? */
+  int multiline_rfc2228;                /* Are we using RFC2228-style multiline responses ? */
+
   struct conn_struc *c;                 /* Control connection */
   struct conn_struc *d;                 /* Data connection */
@@ -135 +138 @@
 
   char *curr_cmd;                       /* Current FTP command */
+  int curr_cmd_id;                      /* Current FTP command ID */
+  struct cmd_struc *curr_cmd_rec;       /* Current command */
+
   int curr_phase;                       /* Current handler phase */
 
@@ -177 +183 @@
   unsigned int total_files_xfer;
 
+  /* Total number of "raw" protocol bytes read in from the network for
+   * the session.
+   */
+  off_t total_raw_in;
+
+  /* Total number of "raw" protocol bytes written out to the network for
+   * the session.
+   */
+  off_t total_raw_out;
+
+  /* Reason code for end of session/disconnection; in reality, the values
+   * come from the pr_disconnect_reason_e enum in session.h.
+   */
+  int disconnect_reason;
+
+  /* Module which disconnected/ended the session */
+  struct module_struc *disconnect_module;
+
 } session_t;
 
@@ -193 +217 @@
 extern char AddressCollisionCheck;
 extern char ServerType;
-extern char MultilineRFC2228;
 
 /* Session/State flags */
@@ -245 +268 @@
 #define PR_TIMER_SESSION        5
 
+/* Developer code */
+
+#ifdef PR_DEVEL_TIMING
+# define PR_DEVEL_CLOCK(code) \
+  { \
+    int local_errno; \
+    struct timeval local_before, local_after, local_since; \
+    timerclear(&local_before); \
+    timerclear(&local_after); \
+    timerclear(&local_since); \
+    (void) gettimeofday(&local_before, NULL); \
+    (code); \
+    local_errno = errno; \
+    (void) gettimeofday(&local_after, NULL); \
+    timersub(&local_after, &local_before, &local_since); \
+    (void) pr_trace_msg("timing", 9, "code at %s:%d took %lu sec, %lu usec", __FILE__, __LINE__, (unsigned long) local_since.tv_sec, (unsigned long) local_since.tv_usec); \
+    errno = local_errno; \
+  }
+#else
+# define PR_DEVEL_CLOCK(code)   (code)
+#endif /* PR_DEVEL_TIMING */
+
 /* Misc Prototypes */
-
-void end_login(int);
 void pr_signals_handle(void);
 void session_exit(int, void *, int, void *);