X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Fsilcd%2Fserver.h;h=8cdf3b0352f35603cc4f4520f8a4d7f5b80628d4;hp=3fec0d75d71d56a339909a7edf24a7ae32933d72;hb=413da0f8686910f5e627393157566ae729ca99c4;hpb=d3c80aacbbdedf10b7abf4b10aa4748632efe7da

diff --git a/apps/silcd/server.h b/apps/silcd/server.h
index 3fec0d75..8cdf3b03 100644
--- a/apps/silcd/server.h
+++ b/apps/silcd/server.h
@@ -50,9 +50,6 @@ typedef struct {
   SilcUInt32 retry_count;
   SilcUInt32 retry_timeout;
 
-  /* Back pointer to server */
-  SilcServer server;
-
   SilcServerConnectRouterCallback callback;
   void *callback_context;
 } *SilcServerConnection;
@@ -60,7 +57,7 @@ typedef struct {
 /* General definitions */
 
 /* SILC port */
-#define SILC_PORT 706;
+#define SILC_PORT 706
 
 /* Server and router. Used internally by the code. */
 #define SILC_SERVER 0
@@ -86,6 +83,10 @@ typedef struct {
 #define SILC_SERVER_MAX_CONNECTIONS    1000	 /* Max connections */
 #define SILC_SERVER_MAX_CONNECTIONS_SINGLE 1000  /* Max connections per host */
 #define SILC_SERVER_LOG_FLUSH_DELAY    300       /* Default log flush delay */
+#define SILC_SERVER_QOS_RATE_LIMIT     10        /* Default QoS rate limit */
+#define SILC_SERVER_QOS_BYTES_LIMIT    2048      /* Default QoS bytes limit */
+#define SILC_SERVER_QOS_LIMIT_SEC      0         /* Default QoS limit sec */
+#define SILC_SERVER_QOS_LIMIT_USEC     500000    /* Default QoS limit usec */
 
 /* Macros */
 
@@ -114,9 +115,21 @@ do {									\
   (sock->protocol && sock->protocol->protocol && 			\
    sock->protocol->protocol->type == SILC_PROTOCOL_SERVER_REKEY)
 
-/* Output an error message wether to stderr or LOG_ERROR if we are in the
-   background. */
-#define SILC_SERVER_LOG_ERROR(fmt) silc_server_stderr(silc_format fmt)
+/* Check whether backup resuming protocol is active */
+#define SILC_SERVER_IS_BACKUP(sock)					\
+  (sock->protocol && sock->protocol->protocol && 			\
+   sock->protocol->protocol->type == SILC_PROTOCOL_SERVER_BACKUP)
+
+/* Output a message to stderr or to the appropriate log facility wether
+   we are in the background or not. */
+#define SILC_SERVER_LOG_INFO(fmt)					\
+  silc_server_stderr(SILC_LOG_INFO, silc_format fmt)
+#define SILC_SERVER_LOG_WARNING(fmt)					\
+  silc_server_stderr(SILC_LOG_WARNING, silc_format fmt)
+#define SILC_SERVER_LOG_ERROR(fmt)					\
+  silc_server_stderr(SILC_LOG_ERROR, silc_format fmt)
+#define SILC_SERVER_LOG_FATAL(fmt)					\
+  silc_server_stderr(SILC_LOG_WARNING, silc_format fmt)
 
 /* Prototypes */
 int silc_server_alloc(SilcServer *new_server);
@@ -150,7 +163,7 @@ void silc_server_remove_from_channels(SilcServer server,
 				      SilcClientEntry client,
 				      bool notify,
 				      const char *signoff_message,
-				      bool keygen);
+				      bool keygen, bool killed);
 bool silc_server_remove_from_one_channel(SilcServer server,
 					 SilcSocketConnection sock,
 					 SilcChannelEntry channel,
@@ -196,6 +209,8 @@ void silc_server_announce_get_channels(SilcServer server,
 				       SilcBuffer **channel_users_modes,
 				       SilcUInt32 *channel_users_modes_c,
 				       SilcBuffer **channel_topics,
+				       SilcBuffer **channel_invites,
+				       SilcBuffer **channel_bans,
 				       SilcChannelID ***channel_ids,
 				       unsigned long creation_time);
 void silc_server_announce_servers(SilcServer server, bool global,
@@ -236,10 +251,6 @@ SilcBuffer silc_server_get_client_channel_list(SilcServer server,
 					       bool get_private,
 					       bool get_secret,
 					       SilcBuffer *user_mode_list);
-SilcClientEntry silc_server_get_client_resolve(SilcServer server,
-					       SilcClientID *client_id,
-					       bool always_resolve,
-					       bool *resolved);
-void silc_server_stderr(char *message);
+void silc_server_stderr(SilcLogType type, char *message);
 
 #endif