Make server cycle time configurable and default it to 30.

Fixes #81

doc/UPDATES.md

@@ -19,6 +19,8 @@
   * Raise netsplit timeout to 1000 seconds.
   * Indent BOTNET entries some in .whois.
   * Disallow negative 'chanset limit' (#96).
+  * Raise server cycle time from 15 to 30 seconds and add
+    'set server-cycle-wait for configuring it. (#81)
 
 # 1.4.6
   * Disable demo TCL support by default to prevent confusion during build.

doc/help.txt

@@ -1660,6 +1660,7 @@ See also: reload, backup
                          matching alias is used. Normal flag checking is done
                          after the alias is expanded. 
                          $bAliases may not reference other aliases.$b
+[N]  $bserver-cycle-wait$b   Amount of time in seconds to wait between server reconnections.
 [N]  $bserver-port$b         Default port to use for server connections.
 [N]  $bserver-port-ssl$b     Default port to use for SSL server connections.
 [B]  $bserver-use-ssl$b      Use SSL for IRC server connections?

src/mod/server.mod/servmsg.cc

@@ -2104,7 +2104,7 @@ static void connect_server(void)
     dcc[newidx].sock = -1;
     dcc[newidx].u.dns->cbuf = strdup(pass);
 
-    cycle_time = 15;		/* wait 15 seconds before attempting next server connect */
+    cycle_time = server_cycle_wait;		/* wait N seconds before attempting next server connect */
 
     /* I'm resolving... don't start another server connect request */
     resolvserv = 1;

src/set.cc

@@ -75,6 +75,7 @@ char homechan[51] = "";
 char usermode[15] = "";
 bool fish_auto_keyx = 0;
 bool fish_paranoid = 0;
+int server_cycle_wait;
 
 ////// THIS MUST REMAIN SORTED: !LC_ALL=C sort
 // VAR("bad-process",	&badprocess,		VAR_INT|VAR_DETECTED,				0, 4, "ignore"),
@@ -126,6 +127,7 @@ static variable_t vars[] = {
  VAR("promisc",		&promisc,		VAR_INT|VAR_DETECTED,				0, 4, "ignore"),
  VAR("rbl-servers",	rbl_servers,		VAR_STRING|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB,	0, 0, DEFAULT_RBL),
  VAR("realname",	botrealname,		VAR_STRING|VAR_NOLHUB,				0, 0, "* I'm too lame to read BitchX.doc *"),
+ VAR("server-cycle-wait",&server_cycle_wait,	VAR_INT|VAR_NOLHUB,				5, 500, "30"),
  VAR("server-port",	&default_port,		VAR_INT|VAR_SHORT|VAR_NOLHUB,			0, 65535, "6667"),
  VAR("server-port-ssl",	&default_port_ssl,	VAR_INT|VAR_SHORT|VAR_NOLHUB,			0, 65535, "6697"),
  VAR("server-use-ssl",	&ssl_use,		VAR_INT|VAR_BOOL|VAR_NOLHUB,			0, 1, "0"),

src/set.h

@@ -20,7 +20,7 @@
 #define VAR_SHUFFLE	BIT9
 /* no local */
 #define VAR_NOLOC	BIT10	
-/* no local hub */
+/* no hub local */
 #define VAR_NOLHUB	BIT11
 /* trigger cloak script changing? */
 #define VAR_CLOAK	BIT12
@@ -73,7 +73,7 @@ extern char		auth_key[], auth_prefix[2], motd[], alias[], rbl_servers[1024], gro
 extern bool		dccauth, auth_obscure, manop_warn, auth_chan, oidentd, ident_botnick, irc_autoaway, link_cleartext, use_deaf, use_callerid, fish_auto_keyx, fish_paranoid;
 extern int		cloak_script, fight_threshold, in_bots, set_noshare, dcc_autoaway,
 			kill_threshold, lag_threshold, op_bots, hijack, login, promisc, trace,
-                        ison_time, msgrate, msgburst;
+                        ison_time, msgrate, msgburst, server_cycle_wait;
 extern rate_t		op_requests, close_threshold;
 
 namespace bd {