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

diff --git a/apps/silcd/server.h b/apps/silcd/server.h
index f7520b79..8cdf3b03 100644
--- a/apps/silcd/server.h
+++ b/apps/silcd/server.h
@@ -120,9 +120,16 @@ do {									\
   (sock->protocol && sock->protocol->protocol && 			\
    sock->protocol->protocol->type == SILC_PROTOCOL_SERVER_BACKUP)
 
-/* 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)
+/* 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);
@@ -156,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,
@@ -202,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,
@@ -242,6 +251,6 @@ SilcBuffer silc_server_get_client_channel_list(SilcServer server,
 					       bool get_private,
 					       bool get_secret,
 					       SilcBuffer *user_mode_list);
-void silc_server_stderr(char *message);
+void silc_server_stderr(SilcLogType type, char *message);
 
 #endif