X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fserver.c;h=b3914316e3b9cedef4d11937049dcc429a3d323a;hb=2407b5a8d55101dcc4cccb098888e0e21f6f299c;hp=9df0dd455a1146a1ff5c3b09477fcda1ad9195bf;hpb=7842456e8b7c8a81a88a9d4db35225c053eefb1c;p=silc.git

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 9df0dd45..b3914316 100644
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -163,9 +163,6 @@ int silc_server_init(SilcServer server)
   silc_hash_alloc("md5", &server->md5hash);
   silc_hash_alloc("sha1", &server->sha1hash);
 
-  /* Initialize none cipher */
-  silc_cipher_alloc("none", &server->none_cipher);
-
   /* Allocate PKCS context for local public and private keys */
   silc_pkcs_alloc(server->public_key->name, &server->pkcs);
   silc_pkcs_public_key_set(server->pkcs, server->public_key);
@@ -952,7 +949,7 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router_final)
      timeout!! */
   hb_context = silc_calloc(1, sizeof(*hb_context));
   hb_context->server = server;
-  silc_socket_set_heartbeat(sock, 600, hb_context,
+  silc_socket_set_heartbeat(sock, 300, hb_context,
 			    silc_server_perform_heartbeat,
 			    server->schedule);
 
@@ -1462,7 +1459,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
      timeout!! */
   hb_context = silc_calloc(1, sizeof(*hb_context));
   hb_context->server = server;
-  silc_socket_set_heartbeat(sock, 600, hb_context,
+  silc_socket_set_heartbeat(sock, 400, hb_context,
 			    silc_server_perform_heartbeat,
 			    server->schedule);