X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fserver_internal.h;h=7cf42a8ed8964553455acac8f70a10e81438c231;hb=413da0f8686910f5e627393157566ae729ca99c4;hp=7a6a9253c6bcb7b02b23a03696bdea81cc64ef09;hpb=f1a1c41a159700e60f98a1dcf3bc4801c36af62c;p=silc.git diff --git a/apps/silcd/server_internal.h b/apps/silcd/server_internal.h index 7a6a9253..7cf42a8e 100644 --- a/apps/silcd/server_internal.h +++ b/apps/silcd/server_internal.h @@ -4,13 +4,13 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2002 Pekka Riikonen + Copyright (C) 1997 - 2003 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -29,8 +29,9 @@ typedef struct { SilcUInt32 my_servers; /* Locally connected servers */ SilcUInt32 my_routers; /* Locally connected routers */ SilcUInt32 my_channels; /* Locally created channels */ - SilcUInt32 my_chanclients; /* Local clients on local channels */ - SilcUInt32 my_aways; /* Local clients away (XXX) */ + SilcUInt32 my_chanclients; /* Local clients on local channels */ + SilcUInt32 my_aways; /* Local clients away (gone) */ + SilcUInt32 my_detached; /* Local clients detached */ SilcUInt32 my_server_ops; /* Local server operators */ SilcUInt32 my_router_ops; /* Local router operators */ @@ -38,22 +39,28 @@ typedef struct { SilcUInt32 cell_clients; /* All clients in cell */ SilcUInt32 cell_servers; /* All servers in cell */ SilcUInt32 cell_channels; /* All channels in cell */ - SilcUInt32 cell_chanclients; /* All clients on cell's channels */ - SilcUInt32 clients; /* All clients */ - SilcUInt32 servers; /* All servers */ - SilcUInt32 routers; /* All routers */ - SilcUInt32 channels; /* All channels */ + SilcUInt32 cell_chanclients; /* All clients on cell's channels */ + SilcUInt32 clients; /* All clients */ + SilcUInt32 servers; /* All servers */ + SilcUInt32 routers; /* All routers */ + SilcUInt32 channels; /* All channels */ SilcUInt32 chanclients; /* All clients on channels */ + SilcUInt32 aways; /* All clients away (gone) */ + SilcUInt32 detached; /* All clients detached */ SilcUInt32 server_ops; /* All server operators */ SilcUInt32 router_ops; /* All router operators */ + /* More to add + SilcUInt32 secret_channels; + SilcUInt32 private_channels; + */ /* General */ SilcUInt32 conn_attempts; /* Connection attempts */ SilcUInt32 conn_failures; /* Connection failure */ SilcUInt32 auth_attempts; /* Authentication attempts */ SilcUInt32 auth_failures; /* Authentication failures */ - SilcUInt32 packets_sent; /* Sent packets */ - SilcUInt32 packets_received; /* Received packets */ + SilcUInt32 packets_sent; /* Sent SILC packets */ + SilcUInt32 packets_received; /* Received SILC packets */ } SilcServerStatistics; /* @@ -62,28 +69,37 @@ typedef struct { */ struct SilcServerStruct { char *server_name; - int server_type; int sock; + SilcServerEntry id_entry; SilcServerID *id; unsigned char *id_string; SilcUInt32 id_string_len; - SilcIdType id_type; - SilcUInt32 starttime; - bool standalone; /* TRUE if server is standalone, and + + unsigned int server_type : 2; /* Server type (server.h) */ + unsigned int standalone : 1; /* Set if server is standalone, and does not have connection to network. */ - bool listenning; /* TRUE if server is listenning for + unsigned int listenning : 1; /* Set if server is listenning for incoming connections. */ - bool background; - SilcServerEntry id_entry; /* Server's own ID entry */ + unsigned int background : 1; /* Set when server is on background */ + unsigned int backup_router : 1; /* Set if this is backup router */ + unsigned int backup_primary : 1; /* Set if we've switched our primary + router to a backup router. */ + unsigned int backup_noswitch: 1; /* Set if we've won't switch to + become primary (we are backup) */ + unsigned int backup_closed : 1; /* Set if backup closed connection. + Do not allow resuming in this case. */ + unsigned int wait_backup : 1; /* Set if we are waiting for backup + router to connect to us. */ + unsigned int server_shutdown: 1; /* Set when shutting down */ + unsigned int no_reconnect : 1; /* If set, server won't reconnect to + router after disconnection. */ + SilcServerEntry router; /* Pointer to the primary router */ unsigned long router_connect; /* Time when router was connected */ + SilcServerConnection router_conn; /* non-NULL when connecting to the + primary router, and NULL otherwise. */ 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 */ SilcUInt16 cmd_ident; @@ -94,6 +110,7 @@ struct SilcServerStruct { /* ID lists. */ SilcIDList local_list; SilcIDList global_list; + SilcHashTable watcher_list; /* Table of connected sockets */ SilcSocketConnection *sockets; @@ -107,10 +124,6 @@ struct SilcServerStruct { SilcHash md5hash; SilcHash sha1hash; - /* HMAC objects for MAC's. */ - SilcHmac md5hmac; - SilcHmac sha1hmac; - /* Configuration object */ SilcServerConfig config; SilcServerConfigRef config_ref; @@ -125,30 +138,42 @@ struct SilcServerStruct { /* Pending command queue */ SilcDList pending_commands; + /* Purge context for disconnected clients */ + SilcIDListPurge purge_i; + SilcIDListPurge purge_g; + #ifdef SILC_SIM /* SIM (SILC Module) list */ SilcDList sim; #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; SilcUInt32 failure; } *SilcServerFailureContext; +/* Rekey must be performed at the lastest when this many packets is sent */ +#define SILC_SERVER_REKEY_THRESHOLD 0xfffffe00 + /* Macros */ +/* Return pointer to the primary router connection */ +#define SILC_PRIMARY_ROUTE(server) \ + (!server->standalone && server->router ? server->router->connection : NULL) + +/* Return TRUE if a packet must be broadcasted (router broadcasts) */ +#define SILC_BROADCAST(server) (server->server_type == SILC_ROUTER) + +/* Return TRUE if entry is locally connected or local to us */ +#define SILC_IS_LOCAL(entry) \ + (((SilcIDListData)entry)->status & SILC_IDLIST_STATUS_LOCAL) + /* Registers generic task for file descriptor for reading from network and - writing to network. As being generic task the actual task is allocated + 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 { \ @@ -159,23 +184,25 @@ do { \ SILC_TASK_PRI_NORMAL); \ } while(0) -#define SILC_SET_CONNECTION_FOR_INPUT(s, fd) \ -do { \ - silc_schedule_set_listen_fd((s), (fd), SILC_TASK_READ); \ +#define SILC_SET_CONNECTION_FOR_INPUT(s, fd) \ +do { \ + silc_schedule_set_listen_fd((s), (fd), SILC_TASK_READ, FALSE); \ } while(0) - -#define SILC_SET_CONNECTION_FOR_OUTPUT(s, fd) \ -do { \ - silc_schedule_set_listen_fd((s), (fd), (SILC_TASK_READ | 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), \ + FALSE); \ } while(0) #define SILC_OPER_STATS_UPDATE(c, type, mod) \ do { \ if ((c)->mode & (mod)) { \ - if ((c)->connection) \ + if (SILC_IS_LOCAL((c))) \ server->stat.my_ ## type ## _ops--; \ if (server->server_type == SILC_ROUTER) \ server->stat. type ## _ops--; \ + (c)->mode &= ~(mod); \ } \ } while(0) @@ -183,14 +210,14 @@ do { \ do { \ if (client->mode & (mod)) { \ if (!(mode & (mod))) { \ - if (client->connection) \ + if (SILC_IS_LOCAL(client)) \ server->stat.my_ ## oper ## _ops--; \ if (server->server_type == SILC_ROUTER) \ server->stat. oper ## _ops--; \ } \ } else { \ if (mode & (mod)) { \ - if (client->connection) \ + if (SILC_IS_LOCAL(client)) \ server->stat.my_ ## oper ## _ops++; \ if (server->server_type == SILC_ROUTER) \ server->stat. oper ## _ops++; \ @@ -208,5 +235,9 @@ do { \ /* Prototypes */ SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final); +SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_callback); +SILC_TASK_CALLBACK_GLOBAL(silc_server_connect_to_router); +void silc_server_watcher_list_destroy(void *key, void *context, + void *user_context); #endif