updates.

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

diff --git a/apps/silcd/server_internal.h b/apps/silcd/server_internal.h
index 0e1ac428af554ac03eaf7bc2c305bf6276a17bf0..24942e378d23f4158ae4ebee0c6bf9b9bb57a3cd 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,11 +83,11 @@ 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 */
-  unsigned short cmd_ident;
+  uint16 cmd_ident;
 
   /* Server's own ID entry. */
   SilcServerEntry id_entry;
@@ -96,7 +95,8 @@ struct SilcServerStruct {
   /* Back pointer to the primary router of this server. */
   SilcServerEntry router;
 
-  /* SILC server task queues */
+  /* SILC server schduler and task queues */
+  SilcSchedule schedule;
   SilcTaskQueue io_queue;
   SilcTaskQueue timeout_queue;
   SilcTaskQueue generic_queue;
@@ -127,7 +127,7 @@ struct SilcServerStruct {
   SilcHmac sha1hmac;
 
   /* Configuration object */
-  SilcConfigServer config;
+  SilcServerConfig config;
 
   /* Random pool */
   SilcRng rng;
@@ -152,6 +152,15 @@ 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;
+
 /* Macros */
 
 /* Registers generic task for file descriptor for reading from network and
@@ -167,17 +176,18 @@ do {                                                                      \
   silc_task_set_iotype(tmptask, SILC_TASK_WRITE);                      \
 } while(0)
 
-#define SILC_SET_CONNECTION_FOR_INPUT(fd)                              \
+#define SILC_SET_CONNECTION_FOR_INPUT(s, fd)                           \
 do {                                                                   \
-  silc_schedule_set_listen_fd((fd), (1L << SILC_TASK_READ));            \
+  silc_schedule_set_listen_fd((s), (fd), (1L << SILC_TASK_READ));      \
 } while(0)
      
-#define SILC_SET_CONNECTION_FOR_OUTPUT(fd)                             \
+#define SILC_SET_CONNECTION_FOR_OUTPUT(s, fd)                          \
 do {                                                                   \
-  silc_schedule_set_listen_fd((fd), ((1L << SILC_TASK_READ) |           \
-                                    (1L << SILC_TASK_WRITE)));         \
+  silc_schedule_set_listen_fd((s), (fd), ((1L << SILC_TASK_READ) |     \
+                                    (1L << SILC_TASK_WRITE)));         \
 } while(0)
 
 /* Prototypes */
+SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final);
 
 #endif