updates.

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

diff --git a/apps/silcd/server_internal.h b/apps/silcd/server_internal.h
index 63ca697a9e479d4b51237ab37261258b3cda6d9f..1de43890672c3e09ca8816ec55be816bf78fdc84 100644 (file)
--- a/apps/silcd/server_internal.h
+++ b/apps/silcd/server_internal.h
@@ -25,39 +25,38 @@
    various things. */
 typedef struct {
   /* Local stats (server and router) */
-  unsigned long my_clients;      /* Locally connected clients */
-  unsigned long my_servers;      /* Locally connected servers */
-  unsigned long my_routers;      /* Locally connected routers */
-  unsigned long my_channels;     /* Locally created channels */
-  unsigned long my_chanclients;          /* Local clients on local channels */
-  unsigned long my_aways;        /* Local clients away (XXX) */
-  unsigned long my_server_ops;   /* Local server operators */
-  unsigned long my_router_ops;   /* Local router operators */
+  uint32 my_clients;             /* Locally connected clients */
+  uint32 my_servers;             /* Locally connected servers */
+  uint32 my_routers;             /* Locally connected routers */
+  uint32 my_channels;            /* Locally created channels */
+  uint32 my_chanclients;         /* Local clients on local channels */
+  uint32 my_aways;               /* Local clients away (XXX) */
+  uint32 my_server_ops;                  /* Local server operators */
+  uint32 my_router_ops;                  /* Local router operators */
 
   /* Global stats (mainly for router) */
-  unsigned long cell_clients;    /* All clients in cell */
-  unsigned long cell_servers;    /* All servers in cell */
-  unsigned long cell_channels;   /* All channels in cell */
-  unsigned long cell_chanclients; /* All clients on cell's channels */
-  unsigned long clients;         /* All clients */
-  unsigned long servers;         /* All servers */
-  unsigned long routers;         /* All routers */
-  unsigned long channels;        /* All channels */
-  unsigned long chanclients;     /* All clients on channels */
-  unsigned long server_ops;      /* All server operators */
-  unsigned long router_ops;      /* All router operators */
+  uint32 cell_clients;           /* All clients in cell */
+  uint32 cell_servers;           /* All servers in cell */
+  uint32 cell_channels;                  /* All channels in cell */
+  uint32 cell_chanclients;       /* All clients on cell's channels */
+  uint32 clients;                /* All clients */
+  uint32 servers;                /* All servers */
+  uint32 routers;                /* All routers */
+  uint32 channels;               /* All channels */
+  uint32 chanclients;            /* All clients on channels */
+  uint32 server_ops;             /* All server operators */
+  uint32 router_ops;             /* All router operators */
 
   /* General */
-  unsigned long conn_attempts;   /* Connection attempts */
-  unsigned long conn_failures;   /* Connection failure */
-  unsigned long auth_attempts;   /* Authentication attempts */
-  unsigned long auth_failures;   /* Authentication failures */
-  unsigned long packets_sent;    /* Sent packets */
-  unsigned long packets_received; /* Received packets */
+  uint32 conn_attempts;                  /* Connection attempts */
+  uint32 conn_failures;                  /* Connection failure */
+  uint32 auth_attempts;                  /* Authentication attempts */
+  uint32 auth_failures;                  /* Authentication failures */
+  uint32 packets_sent;           /* Sent packets */
+  uint32 packets_received;       /* Received packets */
 } SilcServerStatistics;
 
 typedef struct {
-  void *id_entry;
   SilcSocketConnection sock;
 
   /* Remote host name and port */
@@ -65,8 +64,8 @@ typedef struct {
   int remote_port;
   
   /* Current connection retry info */
-  unsigned int retry_count;
-  unsigned int retry_timeout;
+  uint32 retry_count;
+  uint32 retry_timeout;
 
   /* Back pointer to server */
   SilcServer server;
@@ -84,9 +83,12 @@ struct SilcServerStruct {
   int listenning;
   SilcServerID *id;
   unsigned char *id_string;
-  unsigned int id_string_len;
+  uint32 id_string_len;
   SilcIdType id_type;
 
+  /* Current command identifier, 0 not used */
+  uint16 cmd_ident;
+
   /* Server's own ID entry. */
   SilcServerEntry id_entry;
 
@@ -124,7 +126,7 @@ struct SilcServerStruct {
   SilcHmac sha1hmac;
 
   /* Configuration object */
-  SilcConfigServer config;
+  SilcServerConfig config;
 
   /* Random pool */
   SilcRng rng;
@@ -144,6 +146,27 @@ struct SilcServerStruct {
 #endif
 };
 
+/* Server's heartbeat context */
+typedef struct {
+  SilcServer server;
+} *SilcServerHBContext;
+
+/* Failure context. This is allocated when failure packet is received.
+   Failure packets are processed with timeout and data is saved in this
+   structure. */
+typedef struct {
+  SilcServer server;
+  SilcSocketConnection sock;
+  uint32 failure;
+} *SilcServerFailureContext;
+
+/* Session key's re-key context. */
+typedef struct {
+  SilcServer server;
+  SilcSocketConnection sock;
+  uint32 timeout;
+} *SilcServerRekeyContext;
+
 /* Macros */
 
 /* Registers generic task for file descriptor for reading from network and
@@ -171,5 +194,6 @@ do {                                                                        \
 } while(0)
 
 /* Prototypes */
+SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final);
 
 #endif