Merged silc_1_0_branch to trunk.

[silc.git] / apps / silcd / protocol.h

diff --git a/apps/silcd/protocol.h b/apps/silcd/protocol.h
index a6ce666a1d28c3a7e94c3a77da40c531c328e2dc..3c184abce2ae2363f1193d1f1dd38ee316037258 100644 (file)
--- a/apps/silcd/protocol.h
+++ b/apps/silcd/protocol.h
@@ -2,15 +2,14 @@
 
   protocol.h
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2003 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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -44,10 +43,10 @@ typedef struct {
   void *dest_id;
   SilcIdType dest_id_type;
 
-  /* Pointer to the configurations. */
-  void *cconfig;
-  void *sconfig;
-  void *rconfig;
+  /* Pointers to the configurations. Defined only when responder is TRUE */
+  SilcServerConfigRef cconfig;
+  SilcServerConfigRef sconfig;
+  SilcServerConfigRef rconfig;
 
   SilcTask timeout_task;
   SilcPacketContext *packet;
@@ -79,10 +78,10 @@ typedef struct {
   void *dest_id;
   SilcIdType dest_id_type;
 
-  /* Pointer to the configurations. */
-  void *cconfig;
-  void *sconfig;
-  void *rconfig;
+  /* Pointers to the configurations. Defined only when responder is TRUE */
+  SilcServerConfigRef cconfig;
+  SilcServerConfigRef sconfig;
+  SilcServerConfigRef rconfig;
 
   SilcTask timeout_task;
   SilcPacketContext *packet;
@@ -98,6 +97,7 @@ typedef struct {
   bool pfs;                        /* TRUE if PFS is to be used */
   SilcSKE ske;                     /* Defined if PFS is used */
   SilcPacketContext *packet;
+  SilcTask timeout_task;
 } SilcServerRekeyInternalContext;
 
 /* Prototypes */