updates.
[silc.git] / apps / silcd / server_internal.h
index 93d046ad6ea5adb7f29e9884aefb9b4d3876b518..9f51174a0652b74f0ef1708c7f447e4a7e0c5abf 100644 (file)
    various things. */
 typedef struct {
   /* Local stats (server and router) */
-  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_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 */
+  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) */
-  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 */
+  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 */
-  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 */
+  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 {
-  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,27 @@ 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;
 
-  /* Current command identifier, 0 not used */
-  uint16 cmd_ident;
+  bool standalone;                  /* TRUE if server is standalone, and
+                                       does not have connection to network. */
+  bool listenning;                  /* TRUE if server is listenning for
+                                       incoming connections. */
 
-  /* Server's own ID entry. */
-  SilcServerEntry id_entry;
+  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;
 
-  /* Back pointer to the primary router of this server. */
-  SilcServerEntry router;
+  /* Current command identifier, 0 not used */
+  uint16 cmd_ident;
 
-  /* SILC server task queues */
-  SilcTaskQueue io_queue;
-  SilcTaskQueue timeout_queue;
-  SilcTaskQueue generic_queue;
+  /* SILC server scheduler */
+  SilcSchedule schedule;
 
   /* ID lists. */
   SilcIDList local_list;
@@ -165,27 +151,26 @@ 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)
 
 /* Prototypes */
+SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final);
 
 #endif