updates.

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

diff --git a/apps/silcd/server.h b/apps/silcd/server.h
index 137cf97d8542f13702f82d5567d21ef5c4ed7d09..012d1edfb56fb2e400a45c5fc957a35ece73f033 100644 (file)
--- a/apps/silcd/server.h
+++ b/apps/silcd/server.h
@@ -26,6 +26,9 @@
    the object private hence this declaration. */
 typedef struct SilcServerStruct *SilcServer;
 
+/* Forward declaration of backup server context */
+typedef struct SilcServerBackupStruct *SilcServerBackup;
+
 #define SILC_SERVER_MAX_CONNECTIONS 1000
 
 /* General definitions */
@@ -36,12 +39,13 @@ typedef struct SilcServerStruct *SilcServer;
 /* Server and router. Used internally by the code. */
 #define SILC_SERVER 0
 #define SILC_ROUTER 1
+#define SILC_BACKUP_ROUTER 2
 
 /* Connection retry timeout. We implement exponential backoff algorithm
-   in connection retry. The interval of timeuot grows when retry count
+   in connection retry. The interval of timeout grows when retry count
    grows. */
-#define SILC_SERVER_RETRY_COUNT        4        /* Max retry count */
-#define SILC_SERVER_RETRY_MULTIPLIER   7 / 4    /* Interval growth */
+#define SILC_SERVER_RETRY_COUNT        7        /* Max retry count */
+#define SILC_SERVER_RETRY_MULTIPLIER   2        /* Interval growth */
 #define SILC_SERVER_RETRY_RANDOMIZER   2        /* timeout += rnd % 2 */
 #define SILC_SERVER_RETRY_INTERVAL_MIN 10       /* Min retry timeout */
 #define SILC_SERVER_RETRY_INTERVAL_MAX 600      /* Max generated timeout */
@@ -66,6 +70,34 @@ typedef struct {
   char require_reverse_mapping;
 } *SilcServerParams;
 
+/* Callback function that is called after the key exchange and connection
+   authentication protocols has been completed with a remote router. The
+   `server_entry' is the remote router entry. */
+typedef void (*SilcServerConnectRouterCallback)(SilcServer server,
+                                               SilcServerEntry server_entry,
+                                               void *context);
+
+typedef struct {
+  SilcSocketConnection sock;
+
+  /* Remote host name and port */
+  char *remote_host;
+  int remote_port;
+  bool backup;
+  char *backup_replace_ip;
+  int backup_replace_port;
+  
+  /* Current connection retry info */
+  uint32 retry_count;
+  uint32 retry_timeout;
+
+  /* Back pointer to server */
+  SilcServer server;
+
+  SilcServerConnectRouterCallback callback;
+  void *callback_context;
+} *SilcServerConnection;
+
 /* Macros */
 
 /* This macro is used to send notify messages with formatted string. The
@@ -89,9 +121,14 @@ int silc_server_alloc(SilcServer *new_server);
 void silc_server_free(SilcServer server);
 int silc_server_init(SilcServer server);
 void silc_server_daemonise(SilcServer server);
+void silc_server_drop(SilcServer server);
 void silc_server_run(SilcServer server);
 void silc_server_stop(SilcServer server);
-void silc_server_packet_parse(SilcPacketParserContext *parser_context);
+void silc_server_start_key_exchange(SilcServer server,
+                                   SilcServerConnection sconn,
+                                   int sock);
+bool silc_server_packet_parse(SilcPacketParserContext *parser_context,
+                             void *context);
 void silc_server_packet_parse_type(SilcServer server, 
                                   SilcSocketConnection sock,
                                   SilcPacketContext *packet);
@@ -103,14 +140,10 @@ void silc_server_free_client_data(SilcServer server,
                                  SilcSocketConnection sock,
                                  SilcClientEntry client, 
                                  int notify,
-                                 char *signoff);
+                                 const char *signoff);
 void silc_server_free_sock_user_data(SilcServer server, 
-                                    SilcSocketConnection sock);
-int silc_server_channel_has_global(SilcChannelEntry channel);
-int silc_server_channel_has_local(SilcChannelEntry channel);
-int silc_server_remove_clients_by_server(SilcServer server, 
-                                        SilcServerEntry entry,
-                                        int server_signoff);
+                                    SilcSocketConnection sock,
+                                    const char *signoff_message);
 void silc_server_remove_from_channels(SilcServer server, 
                                      SilcSocketConnection sock,
                                      SilcClientEntry client,
@@ -122,8 +155,6 @@ int silc_server_remove_from_one_channel(SilcServer server,
                                        SilcChannelEntry channel,
                                        SilcClientEntry client,
                                        int notify);
-int silc_server_client_on_channel(SilcClientEntry client,
-                                 SilcChannelEntry channel);
 void silc_server_disconnect_remote(SilcServer server,
                                   SilcSocketConnection sock,
                                   const char *fmt, ...);
@@ -140,7 +171,7 @@ silc_server_create_new_channel_with_id(SilcServer server,
                                       char *channel_name,
                                       SilcChannelID *channel_id,
                                       int broadcast);
-void silc_server_create_channel_key(SilcServer server, 
+bool silc_server_create_channel_key(SilcServer server, 
                                    SilcChannelEntry channel,
                                    uint32 key_len);
 SilcChannelEntry silc_server_save_channel_key(SilcServer server,
@@ -148,6 +179,9 @@ SilcChannelEntry silc_server_save_channel_key(SilcServer server,
                                              SilcChannelEntry channel);
 void silc_server_perform_heartbeat(SilcSocketConnection sock,
                                   void *hb_context);
+void silc_server_announce_get_channel_topic(SilcServer server,
+                                           SilcChannelEntry channel,
+                                           SilcBuffer *topic);
 void silc_server_announce_get_channel_users(SilcServer server,
                                            SilcChannelEntry channel,
                                            SilcBuffer *channel_users,
@@ -158,10 +192,18 @@ void silc_server_announce_get_channels(SilcServer server,
                                       SilcBuffer *channel_users,
                                       SilcBuffer **channel_users_modes,
                                       uint32 *channel_users_modes_c,
-                                      SilcChannelID ***channel_ids);
-void silc_server_announce_servers(SilcServer server);
-void silc_server_announce_clients(SilcServer server);
-void silc_server_announce_channels(SilcServer server);
+                                      SilcBuffer **channel_topics,
+                                      SilcChannelID ***channel_ids,
+                                      unsigned long creation_time);
+void silc_server_announce_servers(SilcServer server, bool global,
+                                 unsigned long creation_time,
+                                 SilcSocketConnection remote);
+void silc_server_announce_clients(SilcServer server,
+                                 unsigned long creation_time,
+                                 SilcSocketConnection remote);
+void silc_server_announce_channels(SilcServer server,
+                                  unsigned long creation_time,
+                                  SilcSocketConnection remote);
 void silc_server_get_users_on_channel(SilcServer server,
                                      SilcChannelEntry channel,
                                      SilcBuffer *user_list,
@@ -182,6 +224,7 @@ SilcSocketConnection silc_server_get_client_route(SilcServer server,
 SilcBuffer silc_server_get_client_channel_list(SilcServer server,
                                               SilcClientEntry client);
 SilcClientEntry silc_server_get_client_resolve(SilcServer server,
-                                              SilcClientID *client_id);
+                                              SilcClientID *client_id,
+                                              bool *resolved);
 
 #endif