X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ftpd.h;h=3110b10dd853f6fa2cb245a616246534ac2ca240;hb=f0c7394d9bdae7e980847003f2da6dcc3d2ad96c;hp=02ae127e3788146839ae3f26792edf53737e6d45;hpb=48955535eec053240872782e9fa97529ef117006;p=betaftpd

diff --git a/ftpd.h b/ftpd.h
index 02ae127..3110b10 100644
--- a/ftpd.h
+++ b/ftpd.h
@@ -15,6 +15,9 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#ifndef _FTPD_H
+#define _FTPD_H 1
+
 /*
  * This is the port you want BetaFTPD to listen on. The standard
  * FTP port is 21 -- if you really want to use BetaFTPD as your
@@ -49,6 +52,22 @@
  */
 #define MAX_BLOCK_SIZE 4096
 
+#if HAVE_PWD_H
+#include <pwd.h>
+#endif
+
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #if HAVE_LINUX_SENDFILE && !HAVE_MMAP
 #warning sendfile() without mmap() is not supported -- disabling sendfile()
 #undef HAVE_LINUX_SENDFILE
@@ -111,25 +130,6 @@ struct conn {
 	time_t last_transfer;
 };
 
-#if WANT_DCACHE
-/* doubly linked list of cached directory listings */
-struct dcache {
-	struct dcache *prev_dcache;
-	struct dcache *next_dcache;
-
-	int use_count;
-	time_t last_used;
-	time_t generated;
-
-	char dir_name[256];
-	char pattern[256];
-	struct list_options lo;
-
-	char *dir_data;
-	int dir_size;
-};
-#endif
-
 /* doubly linked list of file transfers */
 struct ftran {
 	struct ftran *prev_ftran;
@@ -177,18 +177,12 @@ void remove_from_linked_list(struct list_element * const elem);
 
 struct conn *alloc_new_conn(const int sock);
 struct ftran *alloc_new_ftran(const int sock, const struct conn * const c);
-#if WANT_DCACHE
-struct dcache *alloc_new_dcache();
-#endif
 
 int add_fd(const int fd, const int events);
 void del_fd(const int fd);
 
 void destroy_conn(struct conn * const c);
 void destroy_ftran(struct ftran * const f);
-#if WANT_DCACHE
-void destroy_dcache(struct dcache * const d);
-#endif
 
 #if HAVE_POLL
 int process_all_clients(const int num_ac);
@@ -207,9 +201,6 @@ RETSIGTYPE handle_alarm(int signum);
 
 void accept_new_client(int * const server_sock);
 void time_out_sockets();
-#if WANT_DCACHE
-void time_out_dcache();
-#endif
 
 void remove_bytes(struct conn * const c, const int i);
 void numeric(struct conn * const c, const int numeric, const char * const format, ...);
@@ -225,3 +216,4 @@ void dump_file(struct conn * const c, const int num, const char * const filename
 void list_readmes(struct conn * const c);
 #endif
 
+#endif