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;
/*
*/
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 wait_backup : 1; /* Set if we are waiting for backup
+ router to connect to us. */
+ unsigned int server_shutdown: 1; /* Set when shutting down */
+
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. */
+ SilcServerBackup backup; /* Backup routers */
/* Current command identifier, 0 not used */
SilcUInt16 cmd_ident;
SilcHash md5hash;
SilcHash sha1hash;
- /* HMAC objects for MAC's. */
- SilcHmac md5hmac;
- SilcHmac sha1hmac;
-
/* Configuration object */
SilcServerConfig config;
SilcServerConfigRef config_ref;
#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
only once and after that the same task applies to all registered fd's. */
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--; \
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++; \
/* 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);
projects / silc.git / blobdiff