Move variables declaration to the beginning of the function (old C)

[stg.git] / projects / rscriptd / listener.h

diff --git a/projects/rscriptd/listener.h b/projects/rscriptd/listener.h
index 4a012c776135e1c647c9530a27091c8d984c68e5..f4d2856e7c7b0cdd35d3821d3278b396fd49b5c0 100644 (file)
--- a/projects/rscriptd/listener.h
+++ b/projects/rscriptd/listener.h
@@ -26,10 +26,10 @@
 #include <list>
 #include <functional>
 
 #include <list>
 #include <functional>
 

-#include "os_int.h"
-#include "blowfish.h"
-#include "rs_packets.h"
-#include "stg_logger.h"
+#include "stg/os_int.h"
+#include "stg/blowfish.h"
+#include "stg/rs_packets.h"
+#include "stg/logger.h"

 
 struct UserData
 {
 
 struct UserData
 {


@@ -94,7 +94,6 @@ private:
     // Networking stuff
     bool                PrepareNet();
     bool                FinalizeNet();
     // Networking stuff
     bool                PrepareNet();
     bool                FinalizeNet();

-    bool                WaitPackets(int sd) const;

     bool                RecvPacket();
     // Parsing stuff
     bool                CheckHeader(const RS_PACKET_HEADER & header) const;
     bool                RecvPacket();
     // Parsing stuff
     bool                CheckHeader(const RS_PACKET_HEADER & header) const;


@@ -104,9 +103,6 @@ private:
     void                ProcessTimeouts();
     bool                Disconnect(const UserData & data) const;
     bool                Connect(const UserData & data) const;
     void                ProcessTimeouts();
     bool                Disconnect(const UserData & data) const;
     bool                Connect(const UserData & data) const;

-    // Decryption stuff
-    void                InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
-    void                Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);

 
     BLOWFISH_CTX        ctxS;
     STG_LOGGER &        WriteServLog;
 
     BLOWFISH_CTX        ctxS;
     STG_LOGGER &        WriteServLog;