X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ftpd.c;h=7f73e8951ca177e08e15bbd060c05c9e2b1ae16a;hb=f0c7394d9bdae7e980847003f2da6dcc3d2ad96c;hp=3982a74e2d4812a1f42ccafd345995f55a1ceb1a;hpb=e2f3b5bb424d135afb31af195ac5af45be7b75eb;p=betaftpd

diff --git a/ftpd.c b/ftpd.c
index 3982a74..7f73e89 100644
--- a/ftpd.c
+++ b/ftpd.c
@@ -28,10 +28,6 @@
 #include <config.h>
 #endif
 
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -76,10 +72,6 @@
 #include <unistd.h>
 #endif
 
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
 #if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -88,10 +80,6 @@
 #include <sys/stat.h>
 #endif
 
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
 #if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -112,6 +100,10 @@
 #include <linux/socket.h>
 #endif
 
+#if HAVE_LINUX_TCP_H
+#include <linux/tcp.h>
+#endif
+
 #if HAVE_MMAP
 #include <sys/mman.h>
 #endif
@@ -171,6 +163,10 @@
 #include <ascii.h>
 #endif
 
+#if WANT_DCACHE
+#include <dcache.h>
+#endif
+
 #ifndef MAP_FAILED
 #define MAP_FAILED -1
 #endif
@@ -443,30 +439,6 @@ struct ftran *alloc_new_ftran(const int sock, const struct conn * const c)
 	return f;
 }
 
-#if WANT_DCACHE
-/*
- * alloc_new_dcache():
- *		Allocates a new directory cache entry (type `struct dcache'),
- *		and adds it to the linked list.
- */
-struct dcache *alloc_new_dcache()
-{
-	struct dcache *d = (struct dcache *)(malloc(sizeof(struct dcache)));
-
-	if (d == NULL) return d;
-
-	d->use_count = 0;
-	d->last_used = 0;
-	strcpy(d->dir_name, "");
-	d->dir_data = NULL;
-
-	add_to_linked_list((struct list_element *)first_dcache,
-			   (struct list_element *)d);
-
-	return d;
-}
-#endif
-
 /*
  * destroy_conn():
  *		Destroy a control connection, remove it from the linked
@@ -538,27 +510,6 @@ void destroy_ftran(struct ftran * const f)
 	remove_from_linked_list((struct list_element *)f);
 }
 
-#if WANT_DCACHE
-/*
- * destroy_dcache():
- *		Destroy a directory listing cache entry, remove it from the
- *		linked list, and clean up after it.
- *
- *		If you free a cache entry that is in use (use_count > 0),
- *		BetaFTPD will most likely crash (later). The thing you're supposed
- *		to do when you're done with a dcache entry, is to decrement
- *		its use_count, and let the timeout functions do the destroying
- *		when it's time to do so.
- */
-void destroy_dcache(struct dcache * const d)
-{
-        if (d == NULL) return;
-
-	if (d->dir_data != NULL) free(d->dir_data);
-	remove_from_linked_list((struct list_element *)d);
-}
-#endif
-
 /*
  * process_all_clients():
  *		Processes all the _control_ connections in active_clients
@@ -1191,29 +1142,6 @@ void time_out_sockets()
 	}
 }
 
-#if WANT_DCACHE
-/*
- * time_out_dcache():
- *		Time out expired directory listing cache entries.
- *		Uses much of the same code as time_out_sockets().
- */
-void time_out_dcache()
-{
-	struct dcache *d = NULL, *next = first_dcache->next_dcache;
-	time_t now = time(NULL);	
-
-	/* run through the linked list */
-	while (next != NULL) {
-		d = next;
-		next = d->next_dcache;
-
-		if (d->use_count == 0 && (now - d->last_used > 900)) {
-			destroy_dcache(d);
-		}
-	}
-}
-#endif
-
 /*
  * remove_bytes():
  *		Remove some bytes from the incoming buffer. This gives