Преглед изворни кода

* Properly setup initial flood count conditions

Bryan Drewery пре 16 година
родитељ
комит
acfd1c3848
2 измењених фајлова са 5 додато и 4 уклоњено
  1. 1 1
      src/mod/server.mod/server.c
  2. 4 3
      src/mod/server.mod/servmsg.c

+ 1 - 1
src/mod/server.mod/server.c

@@ -327,7 +327,7 @@ void deq_msg()
     last_time.usec += (150*burst) * 1000;
     // Add some penalty for each flood_count
     last_time.usec += (40*flood_count) * 1000;
-    // Cap the penalty at 1800 and depent more on flood_count
+    // Cap the penalty at 1800 and depend more on flood_count
     if (timeval_diff(&last_time, &last_time_save) > 1800) {
       last_time.sec = last_time_save.sec;
       last_time.usec = 1800 * 1000;

+ 4 - 3
src/mod/server.mod/servmsg.c

@@ -276,7 +276,8 @@ got004(char *from, char *msg)
     connect_bursting = now;
     msgburst = SERVER_CONNECT_BURST_RATE;
     msgrate = 200;
-    last_time.sec = now - 100;
+    flood_time.sec = last_time.sec = now - 100;
+    flood_time.usec = last_time.usec = 0;
     putlog(LOG_DEBUG, "*", "Server allows connect bursting, bursting for %d seconds", SERVER_CONNECT_BURST_TIME);
   }
 
@@ -2020,8 +2021,8 @@ static void server_dns_callback(int id, void *client_data, const char *host, bd:
     first_ctcp_check = 0;
 
     // Just connecting, set last queue time to the past.
-    last_time.sec = now - 100;
-    last_time.usec = 0;
+    flood_time.sec = last_time.sec = now - 100;
+    flood_time.usec = last_time.usec = 0;
     end_burstmode();
     use_flood_count = 0;
     real_msgburst = msgburst;