updates.

[silc.git] / lib / silcserver / server.c

diff --git a/lib/silcserver/server.c b/lib/silcserver/server.c
index cf325a44e3c81da3db6b52abac6ef1de29571240..756030e0e89a851e8d52868d01e60436b7b08be6 100644 (file)
--- a/lib/silcserver/server.c
+++ b/lib/silcserver/server.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2005 Pekka Riikonen
+  Copyright (C) 1997 - 2006 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -249,6 +249,7 @@ SILC_FSM_STATE(silc_server_thread_st_run)
     /* Each packet is processed in FSM thread */
     silc_list_start(thread->packet_queue);
     while ((packet = silc_list_get(thread->packet_queue)) != SILC_LIST_END) {
+      /* XXX shouldn't the fsm be &thread->fsm */
       t = silc_fsm_thread_alloc(fsm, thread, silc_server_thread_packet_dest,
                                NULL, FALSE);
       if (t) {
@@ -276,10 +277,10 @@ SILC_FSM_STATE(silc_server_thread_st_run)
     silc_list_start(thread->new_conns);
     while ((ac = silc_list_get(thread->new_conns)) != SILC_LIST_END) {
       ac->thread = thread;
-      ac->t = silc_fsm_thread_alloc(&thread->fsm, ac,
-                                   silc_server_accept_connection_dest,
-                                   NULL, FALSE);
-      silc_fsm_start(ac->t, silc_server_st_accept_connection);
+      silc_fsm_thread_init(&ac->t, &thread->fsm, ac,
+                          silc_server_accept_connection_dest,
+                          NULL, FALSE);
+      silc_fsm_start(&ac->t, silc_server_st_accept_connection);
     }
 
     /* Empty the list */
@@ -634,13 +635,6 @@ SilcServer silc_server_alloc(void *app_context, SilcServerParams params,
   server->params->server_info->public_key = NULL;
   server->params->server_info->private_key = NULL;
 
-  /* Allocate PKCS context for local public and private keys */
-  if (!silc_pkcs_alloc(server->public_key->name, SILC_PKCS_SILC,
-                      &server->pkcs))
-    goto err;
-  silc_pkcs_public_key_set(server->pkcs, server->public_key);
-  silc_pkcs_private_key_set(server->pkcs, server->private_key);
-
   /* Create network listener(s) */
   server->listeners = silc_dlist_init();
   if (!server->listeners)