Merge remote-tracking branch 'github/master'

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

diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp
index b168e5e226fe8f1304d775660312351ed47a1222..e4f1e2cd7f9097bf9cd5d21aa57da7f15a770cf2 100644 (file)
--- a/projects/rscriptd/listener.cpp
+++ b/projects/rscriptd/listener.cpp
@@ -22,7 +22,6 @@
 #include "listener.h"
 
 #include "stg/scriptexecuter.h"
-#include "stg/locker.h"
 #include "stg/common.h"
 #include "stg/const.h"
 
@@ -199,7 +198,7 @@ bool LISTENER::RecvPacket(const std::stop_token& token)
 struct iovec iov[2];
 
 char buffer[RS_MAX_PACKET_LEN];
-RS::PACKET_HEADER packetHead;
+STG::RS::PACKET_HEADER packetHead;
 
 iov[0].iov_base = reinterpret_cast<char *>(&packetHead);
 iov[0].iov_len = sizeof(packetHead);
@@ -266,7 +265,7 @@ return false;
 //-----------------------------------------------------------------------------
 bool LISTENER::GetParams(char * buffer, UserData & data)
 {
-RS::PACKET_TAIL packetTail;
+STG::RS::PACKET_TAIL packetTail;
 
 DecryptString(&packetTail, buffer, sizeof(packetTail), &ctxS);
 
@@ -407,7 +406,7 @@ else
 return false;
 }
 //-----------------------------------------------------------------------------
-bool LISTENER::CheckHeader(const RS::PACKET_HEADER & header) const
+bool LISTENER::CheckHeader(const STG::RS::PACKET_HEADER & header) const
 {
 if (strncmp(reinterpret_cast<const char*>(header.magic), RS_ID, RS_MAGIC_LEN))
     return true;