Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/rscriptd/listener.h b/projects/rscriptd/listener.h
index 16c492190a5853eef55f66d6cff634215488b311..c6fb143a05c3104aeba54530ef9f1c12e296c31c 100644 (file)
--- a/projects/rscriptd/listener.h
+++ b/projects/rscriptd/listener.h
@@ -29,7 +29,7 @@
 #include "stg/os_int.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"
 #include "stg/os_int.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"

-#include "stg/stg_logger.h"
+#include "stg/logger.h"

 
 struct UserData
 {
 
 struct UserData
 {


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

-    bool                WaitPackets(int sd) const;

     bool                RecvPacket();
     // Parsing stuff
     bool                RecvPacket();
     // Parsing stuff

-    bool                CheckHeader(const RS_PACKET_HEADER & header) const;
+    bool                CheckHeader(const RS::PACKET_HEADER & header) const;

     bool                GetParams(char * buffer, UserData & data);
     // Processing stuff
     void                ProcessPending();
     bool                GetParams(char * buffer, UserData & data);
     // Processing stuff
     void                ProcessPending();