X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/f7163d9c994af13f0f72f49f7203b7ac3e281a1e..355911106bc27f5504eb904a064367ef1b5f0aba:/projects/stargazer/plugins/other/rscript/rscript.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index b4bbb1a0..c9fcc549 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -58,24 +58,23 @@ return rsc.GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -RS_USER::RS_USER() - : lastSentTime(0), - user(NULL), - shortPacketsCount(0) -{ -} -//----------------------------------------------------------------------------- -RS_USER::RS_USER(const std::vector & r, USER_PTR it) - : lastSentTime(0), - user(it), - routers(r), - shortPacketsCount(0) +RS_USER & RS_USER::operator=(const RS_USER & rvalue) { +lastSentTime = rvalue.lastSentTime; +user = rvalue.user; +routers = rvalue.routers; +shortPacketsCount = rvalue.shortPacketsCount; +return *this; } //----------------------------------------------------------------------------- RS_SETTINGS::RS_SETTINGS() : sendPeriod(0), - port(0) + port(0), + errorStr(), + netRouters(), + userParams(), + password(), + subnetFile() { } //----------------------------------------------------------------------------- @@ -171,11 +170,20 @@ return 0; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- REMOTE_SCRIPT::REMOTE_SCRIPT() - : sendPeriod(15), + : ctx(), + afterChgIPNotifierList(), + authorizedUsers(), + errorStr(), + rsSettings(), + settings(), + sendPeriod(15), halfPeriod(8), nonstop(false), isRunning(false), users(NULL), + netRouters(), + thread(), + mutex(), sock(0), onAddUserNotifier(*this), onDelUserNotifier(*this) @@ -190,6 +198,10 @@ pthread_mutex_destroy(&mutex); //----------------------------------------------------------------------------- void * REMOTE_SCRIPT::Run(void * d) { +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + REMOTE_SCRIPT * rs = static_cast(d); rs->isRunning = true; @@ -274,25 +286,17 @@ if (isRunning) //5 seconds to thread stops itself for (int i = 0; i < 25 && isRunning; i++) { - usleep(200000); - } - - //after 5 seconds waiting thread still running. now killing it - if (isRunning) - { - if (pthread_kill(thread, SIGINT)) - { - errorStr = "Cannot kill thread."; - printfd(__FILE__, "Cannot kill thread\n"); - return -1; - } - printfd(__FILE__, "REMOTE_SCRIPT killed Run\n"); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } } users->DelNotifierUserDel(&onDelUserNotifier); users->DelNotifierUserAdd(&onAddUserNotifier); +if (isRunning) + return -1; + return 0; } //----------------------------------------------------------------------------- @@ -357,7 +361,11 @@ while (it != authorizedUsers.end()) } } //----------------------------------------------------------------------------- +#ifdef NDEBUG +bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t, uint32_t ip, RS_USER & rsu, bool forceDisconnect) const +#else bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS_USER & rsu, bool forceDisconnect) const +#endif { RS_PACKET_HEADER packetHead;