From fddc5ee42006ca6ce2ca46cd8817eb8aba4db03a Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Fri, 4 Jan 2008 18:42:59 +0100 Subject: [PATCH] config.h: remove some obsolete options, move MAX_BUFFER to tunable section --- include/config.h | 24 ++++++------------------ include/config.h.dist | 24 ++++++------------------ 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/include/config.h b/include/config.h index 860af7b8..d20bfd92 100644 --- a/include/config.h +++ b/include/config.h @@ -96,18 +96,6 @@ */ #undef TS6_ONLY -/* USE_LOGFILE - log errors and such to LPATH - * If you wish to have the server send 'vital' messages about server - * to a logfile, define USE_LOGFILE. - */ -#define USE_LOGFILE - -/* CLIENT_FLOOD - client excess flood threshold(in messages) - * The number of messages that we can receive before we disconnect the - * remote client... - */ -#define CLIENT_FLOOD 20 - /* HANGONGOODLINK and HANGONRETRYDELAY * Often net breaks for a short time and it's useful to try to * establishing the same connection again faster than CONNECTFREQUENCY @@ -133,6 +121,12 @@ */ #define RATBOX_SOMAXCONN 25 +/* MAX_BUFFER + * The amount of fds to reserve for clients exempt from limits + * and dns lookups. + */ +#define MAX_BUFFER 60 + /* ---------------------------------------------------------------- * STOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOP * ---------------------------------------------------------------- @@ -140,12 +134,6 @@ * ---------------------------------------------------------------- */ -/* MAX_BUFFER - * The amount of fds to reserve for clients exempt from limits - * and dns lookups. - */ -#define MAX_BUFFER 60 - #define CONFIG_RATBOX_LEVEL_2 #include "defaults.h" diff --git a/include/config.h.dist b/include/config.h.dist index 860af7b8..d20bfd92 100644 --- a/include/config.h.dist +++ b/include/config.h.dist @@ -96,18 +96,6 @@ */ #undef TS6_ONLY -/* USE_LOGFILE - log errors and such to LPATH - * If you wish to have the server send 'vital' messages about server - * to a logfile, define USE_LOGFILE. - */ -#define USE_LOGFILE - -/* CLIENT_FLOOD - client excess flood threshold(in messages) - * The number of messages that we can receive before we disconnect the - * remote client... - */ -#define CLIENT_FLOOD 20 - /* HANGONGOODLINK and HANGONRETRYDELAY * Often net breaks for a short time and it's useful to try to * establishing the same connection again faster than CONNECTFREQUENCY @@ -133,6 +121,12 @@ */ #define RATBOX_SOMAXCONN 25 +/* MAX_BUFFER + * The amount of fds to reserve for clients exempt from limits + * and dns lookups. + */ +#define MAX_BUFFER 60 + /* ---------------------------------------------------------------- * STOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOP * ---------------------------------------------------------------- @@ -140,12 +134,6 @@ * ---------------------------------------------------------------- */ -/* MAX_BUFFER - * The amount of fds to reserve for clients exempt from limits - * and dns lookups. - */ -#define MAX_BUFFER 60 - #define CONFIG_RATBOX_LEVEL_2 #include "defaults.h"