* Pass burst/flood_count through restart just in case restarting in the middle of a burst

src/misc.c

@@ -675,6 +675,10 @@ readsocks(const char *fname)
       rolls = atoi(str.c_str());
     else if (type == STR("+altnick_char"))
       altnick_char = str[0];
+    else if (type == STR("+burst"))
+      burst = atoi(str.c_str());
+    else if (type == STR("+flood_count"))
+      flood_count = atoi(str.c_str());
     else if (type == STR("+ip4"))
       ip4 = str.dup();
     else if (type == STR("+ip6"))
@@ -777,6 +781,10 @@ restart(int idx)
       stream << buf.printf(STR("+rolls %d\n"), rolls);
     if (altnick_char)
       stream << buf.printf(STR("+altnick_char %c\n"), altnick_char);
+    if (burst)
+      stream << buf.printf(STR("+burst %d\n"), burst);
+    if (flood_count)
+      stream << buf.printf(STR("+flood_count %d\n"), flood_count);
     stream << buf.printf(STR("+server_online %li\n"), server_online);
   }
   stream << buf.printf(STR("+online_since %li\n"), online_since);

src/mod/server.mod/server.c

@@ -97,7 +97,8 @@ static egg_timeval_t last_time;
 static time_t connect_bursting = 0;
 static int real_msgburst = 0;
 static int real_msgrate = 0;
-static int flood_count = 0;
+int flood_count = 0;
+int burst = 0;
 static bool use_flood_count = 0;
 static egg_timeval_t flood_time = {0, 0};
 static bool use_penalties;
@@ -159,7 +160,6 @@ static const struct {
 #define Q_HELP 2
 #define Q_PLAY 3
 #define Q_CACHE 4
-static int burst;
 
 #include "cmdsserv.c"
 

src/mod/server.mod/server.h

@@ -48,7 +48,7 @@ enum {
 extern bind_table_t	*BT_ctcp, *BT_ctcr;
 extern size_t		nick_len;
 extern bool		trigger_on_ignore, floodless, keepnick, in_deaf, in_callerid, have_cprivmsg, have_cnotice;
-extern int 		servidx, ctcp_mode, answer_ctcp, serv, curserv, default_alines;
+extern int 		servidx, ctcp_mode, answer_ctcp, serv, curserv, default_alines, flood_count, burst;
 extern unsigned int     rolls;
 extern port_t		default_port, newserverport, curservport;
 extern time_t		server_online, tried_jupenick, tried_nick, release_time;