tupdates

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

diff --git a/apps/silcd/server_internal.h b/apps/silcd/server_internal.h
index e50340b839c88f4fea73433686170124d8999ec2..f4f1d10ce21c0698b7fb1d9500d4fd7964c5238c 100644 (file)
--- a/apps/silcd/server_internal.h
+++ b/apps/silcd/server_internal.h
@@ -96,11 +96,6 @@ struct SilcServerStruct {
   /* Table of connected sockets */
   SilcSocketConnection *sockets;
 
-  /* Server keys */
-  SilcCipher send_key;
-  SilcCipher receive_key;
-  SilcCipher none_cipher;
-
   /* Server public key */
   SilcPKCS pkcs;
   SilcPublicKey public_key;
@@ -126,9 +121,6 @@ struct SilcServerStruct {
   /* Pending command queue */
   SilcDList pending_commands;
 
-  /* Default parameteres for server */
-  SilcServerParams params;
-
 #ifdef SILC_SIM
   /* SIM (SILC Module) list */
   SilcDList sim;
@@ -183,6 +175,14 @@ do {                                               \
   }                                            \
 } while(0)
 
+#define SILC_GET_SKE_FLAGS(x, p)                       \
+  if ((x)) {                                           \
+    if ((x)->param && (x)->param->key_exchange_pfs)    \
+      (p)->flags |= SILC_SKE_SP_FLAG_PFS;              \
+    if (!(x)->publickey)                               \
+      (p)->flags |= SILC_SKE_SP_FLAG_MUTUAL;           \
+  }
+
 /* Prototypes */
 SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final);