updates

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

diff --git a/apps/silcd/server_internal.h b/apps/silcd/server_internal.h
index bc215e07da8db9358021808434226b094048ab06..41df9ab805195c78fd85d781c76f7235afd29b42 100644 (file)
--- a/apps/silcd/server_internal.h
+++ b/apps/silcd/server_internal.h
@@ -56,21 +56,6 @@ typedef struct {
   uint32 packets_received;       /* Received packets */
 } SilcServerStatistics;
 
-typedef struct {
-  SilcSocketConnection sock;
-
-  /* Remote host name and port */
-  char *remote_host;
-  int remote_port;
-  
-  /* Current connection retry info */
-  uint32 retry_count;
-  uint32 retry_timeout;
-
-  /* Back pointer to server */
-  SilcServer server;
-} *SilcServerConnection;
-
 /* 
    SILC Server Object.
 
@@ -79,26 +64,30 @@ struct SilcServerStruct {
   char *server_name;
   int server_type;
   int sock;
-  int standalone;
-  int listenning;
   SilcServerID *id;
   unsigned char *id_string;
   uint32 id_string_len;
   SilcIdType id_type;
 
+  bool standalone;                  /* TRUE if server is standalone, and
+                                       does not have connection to network. */
+  bool listenning;                  /* TRUE if server is listenning for
+                                       incoming connections. */
+  SilcServerEntry id_entry;         /* Server's own ID entry */
+  SilcServerEntry router;           /* Pointer to the primary router */
+  unsigned long router_connect;             /* Time when router was connected */
+  SilcServerBackup backup;          /* Backup routers */
+  bool backup_router;               /* TRUE if this is backup router */
+  bool backup_primary;              /* TRUE if we've switched our primary
+                                       router to a backup router. */
+  SilcServerConnection router_conn; /* non-NULL when connecting to the
+                                      primary router, and NULL otherwise. */
+
   /* Current command identifier, 0 not used */
   uint16 cmd_ident;
 
-  /* Server's own ID entry. */
-  SilcServerEntry id_entry;
-
-  /* Back pointer to the primary router of this server. */
-  SilcServerEntry router;
-
-  /* SILC server task queues */
-  SilcTaskQueue io_queue;
-  SilcTaskQueue timeout_queue;
-  SilcTaskQueue generic_queue;
+  /* SILC server scheduler */
+  SilcSchedule schedule;
 
   /* ID lists. */
   SilcIDList local_list;
@@ -107,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;
@@ -165,25 +149,33 @@ typedef struct {
 /* Registers generic task for file descriptor for reading from network and
    writing to network. As being generic task the actual task is allocated 
    only once and after that the same task applies to all registered fd's. */
-#define SILC_REGISTER_CONNECTION_FOR_IO(fd)                            \
-do {                                                                   \
-  SilcTask tmptask = silc_task_register(server->generic_queue, (fd),   \
-                                       silc_server_packet_process,     \
-                                       context, 0, 0,                  \
-                                       SILC_TASK_GENERIC,              \
-                                       SILC_TASK_PRI_NORMAL);          \
-  silc_task_set_iotype(tmptask, SILC_TASK_WRITE);                      \
+#define SILC_REGISTER_CONNECTION_FOR_IO(fd)            \
+do {                                                   \
+  silc_schedule_task_add(server->schedule, (fd),       \
+                        silc_server_packet_process,    \
+                        context, 0, 0,                 \
+                        SILC_TASK_GENERIC,             \
+                        SILC_TASK_PRI_NORMAL);         \
 } while(0)
 
-#define SILC_SET_CONNECTION_FOR_INPUT(fd)                              \
-do {                                                                   \
-  silc_schedule_set_listen_fd((fd), (1L << SILC_TASK_READ));            \
+#define SILC_SET_CONNECTION_FOR_INPUT(s, fd)                   \
+do {                                                           \
+  silc_schedule_set_listen_fd((s), (fd), SILC_TASK_READ);      \
 } while(0)
      
-#define SILC_SET_CONNECTION_FOR_OUTPUT(fd)                             \
-do {                                                                   \
-  silc_schedule_set_listen_fd((fd), ((1L << SILC_TASK_READ) |           \
-                                    (1L << SILC_TASK_WRITE)));         \
+#define SILC_SET_CONNECTION_FOR_OUTPUT(s, fd)                                \
+do {                                                                         \
+  silc_schedule_set_listen_fd((s), (fd), (SILC_TASK_READ | SILC_TASK_WRITE)); \
+} while(0)
+
+#define SILC_OPER_STATS_UPDATE(c, type, mod)   \
+do {                                           \
+  if ((c)->mode & (mod)) {                     \
+    if ((c)->connection)                       \
+      server->stat.my_ ## type ## _ops--;      \
+    if (server->server_type == SILC_ROUTER)    \
+      server->stat. type ## _ops--;            \
+  }                                            \
 } while(0)
 
 /* Prototypes */