Cancel future rekeys on a detaching client connection.

[silc.git] / apps / silcd / server.c

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index c9825e008959d76a531aa30356dc2e8ddd830551..3d0623aca8c3aa2071299e4f0cd6b5f895f09158 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -281,8 +281,8 @@ static void silc_server_packet_error(SilcPacketEngine engine,
     return;
 
   silc_schedule_task_add_timeout(server->schedule,
-                                silc_server_packet_error_timeout,
-                                stream, 0, 0);
+                                silc_server_packet_error_timeout, stream,
+                                silc_rng_get_byte(server->rng) % 5, 0);
 }
 
 /* Packet stream callbacks */
@@ -2903,6 +2903,18 @@ static void silc_server_rekey_completion(SilcSKE ske,
                                 sock, idata->sconn->rekey_timeout, 0);
 }
 
+/* Helper to stop future rekeys on a link. */
+void silc_server_stop_rekey(SilcServer server, SilcClientEntry client)
+{
+  if (!client->connection)
+    return;
+
+  SILC_LOG_DEBUG(("Stopping rekey for client %p", client));
+
+  silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_rekey,
+                               client->connection);
+}
+
 /* Rekey callback.  Start rekey as initiator */
 
 SILC_TASK_CALLBACK(silc_server_do_rekey)