X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Fconfigure.cpp;h=647295965586a4cb57910d9cd9e6b2874c38fbcc;hb=9855300460b2e695b44646897811cc3f28428fa0;hp=3f63841ecde0ae2fc4377962496669724a388759;hpb=a7f13680d2597d2012d13e1ae706af5af586e0da;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/configure.cpp b/win/configure.cpp
index 3f63841ec..647295965 100644
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -184,10 +184,11 @@ void Banner()
 
 void Run()
 {
-	int max_fd = 1024;
+	int max_fd = 10200;
 	bool use_iocp = false;
-	bool support_ip6links = false;
+	bool support_ip6links = true;
 	bool use_openssl = false;
+	bool ipv6 = true;
 	char mod_path[MAX_PATH];
 	char config_file[MAX_PATH];
 	char library_dir[MAX_PATH];
@@ -197,7 +198,7 @@ void Run()
 	char openssl_inc_path[MAX_PATH];
 	char openssl_lib_path[MAX_PATH];
 
-	int max_clients = 1024;
+	int max_clients = 10200;
 	int nicklen = 31;
 	int chanlen = 64;
 	int modechanges = 20;
@@ -236,20 +237,24 @@ void Run()
 #endif
 	printf_c("InspIRCd revision ID: \033[1;32m%s \033[0m\n\n", revision ? revision_text : "(Non-SVN build)");
 
-	max_fd = get_int_option("What is the maximum file descriptor count you would like to allow?", 1024);
+	max_fd = get_int_option("What is the maximum file descriptor count you would like to allow?", 10200);
 
 	// detect windows
 	if(iswinxp())
 	{
 		printf_c("You are running Windows 2000 or above, and IOCP support is most likely available.\n"
-			     "This removes the socket number limitation of select and is much more efficent.\n"
-				 "If you are unsure, answer yes.\n\n");
+			     "Thisis much more efficent but is currently EXPERIMENTAL and UNSUPPORTED.\n"
+				 "If you are unsure, answer no.\n\n");
 
-		use_iocp = get_bool_option("Do you want to use the IOCP implementation?", true);
+		use_iocp = get_bool_option("Do you want to use the IOCP implementation?", false);
 	}
 
-	support_ip6links = get_bool_option("\nYou have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled InspIRCd servers?\nIf you are using a recent operating system and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)", 
-		true);
+	ipv6 = get_bool_option("Do you want to enable IPv6?", false);
+
+	if (!ipv6)
+		support_ip6links = get_bool_option("\nYou have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled InspIRCd servers?\nIf you are using a recent operating system and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)", true);
+	else
+		support_ip6links = true;
 	
 	printf_c("\033[1mAll paths are relative to the binary directory.\033[0m\n");
 	get_string_option("In what directory do you wish to install the InspIRCd base?", "..", base_path);
@@ -267,7 +272,7 @@ void Run()
 		"different servers on the network.\n\n");
 
     
-	max_clients = get_int_option("Please enter the maximum number of clients at any one time?", 1024);
+	max_clients = get_int_option("Please enter the maximum number of clients at any one time?", 10200);
 	nicklen = get_int_option("Please enter the maximum length of nicknames?", 31);
 	chanlen = get_int_option("Please enter the maximum length of channel names?", 64);
 	modechanges = get_int_option("Please enter the maximum number of mode changes in one line?", 20);
@@ -362,6 +367,8 @@ void Run()
 	fprintf(f, "#define __CONFIGURATION_AUTO__\n\n");
 	if(use_iocp)
 		fprintf(f, "#define CONFIG_USE_IOCP 1\n\n");
+	if (ipv6)
+		fprintf(f, "#define IPV6 1\n\n");
 
 	fprintf(f, "#define CONFIG_FILE \"%s/inspircd.conf\"\n", config_file);
 	fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path);
@@ -395,6 +402,7 @@ void Run()
 	fprintf(f, "#define MAXBUF 514\n");
 
 	fprintf(f, "\n#include \"inspircd_win32wrapper.h\"\n\n");
+	fprintf(f, "#include \"threadengines/threadengine_win32.h\"\n\n");
 	fprintf(f, "#endif\n\n");
 	fclose(f);