Static analyzer bug fixes

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

diff --git a/apps/silcd/server.h b/apps/silcd/server.h
index f249a3766680c2edf4d4ef87e39437cd5c11afd0..98e9be5103b5347c1f3677c5fc13835b4dd13920 100644 (file)
--- a/apps/silcd/server.h
+++ b/apps/silcd/server.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2005, 2007 Pekka Riikonen
+  Copyright (C) 1997 - 2009 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
@@ -120,11 +120,6 @@ do {                                                                       \
   silc_free(__fmt__);                                                  \
 } while(0)
 
-/* Check whether rekey protocol is active */
-#define SILC_SERVER_IS_REKEY(sock)                                     \
-  (sock->protocol && sock->protocol->protocol &&                       \
-   sock->protocol->protocol->type == SILC_PROTOCOL_SERVER_REKEY)
-
 /* 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)                                      \
@@ -144,6 +139,7 @@ SilcBool silc_server_rehash(SilcServer server);
 void silc_server_run(SilcServer server);
 void silc_server_stop(SilcServer server);
 void silc_server_start_key_exchange(SilcServerConnection sconn);
+void silc_server_stop_rekey(SilcServer server, SilcClientEntry client);
 void silc_server_create_connection(SilcServer server,
                                   SilcBool reconnect,
                                   SilcBool dynamic,
@@ -165,7 +161,7 @@ void silc_server_remove_from_channels(SilcServer server,
                                      SilcClientEntry client,
                                      SilcBool notify,
                                      const char *signoff_message,
-                                     SilcBool keygen, bool killed);
+                                     SilcBool keygen, SilcBool killed);
 SilcBool silc_server_remove_from_one_channel(SilcServer server,
                                         SilcPacketStream sock,
                                         SilcChannelEntry channel,
@@ -193,8 +189,6 @@ SilcBool silc_server_create_channel_key(SilcServer server,
 SilcChannelEntry silc_server_save_channel_key(SilcServer server,
                                              SilcBuffer key_payload,
                                              SilcChannelEntry channel);
-void silc_server_perform_heartbeat(SilcPacketStream sock,
-                                  void *hb_context);
 void silc_server_announce_get_channel_topic(SilcServer server,
                                            SilcChannelEntry channel,
                                            SilcBuffer *topic);