* Author : Maxim Mamontov <faust@stargazer.dp.ua>
*/
-/*
- $Revision: 1.33 $
- $Date: 2010/04/16 12:30:37 $
- $Author: faust $
-*/
-
#include <sys/time.h>
#include <csignal>
#include <cassert>
#include <cstdlib>
+#include <cerrno>
+#include <cstring>
#include <algorithm>
#include "stg/common.h"
#include "stg/locker.h"
+#include "stg/users.h"
#include "stg/user_property.h"
#include "stg/plugin_creator.h"
+#include "stg/logger.h"
#include "rscript.h"
#include "ur_functor.h"
#include "send_functor.h"
#define RS_MAX_ROUTERS (100)
+using RS::REMOTE_SCRIPT;
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-RS_USER::RS_USER()
+RS::USER::USER(const std::vector<uint32_t> & r, USER_PTR it, REMOTE_SCRIPT & rs)
: lastSentTime(0),
- user(NULL),
- shortPacketsCount(0)
+ user(it),
+ routers(r),
+ shortPacketsCount(0),
+ ip(user->GetCurrIP()),
+ notifier(rs, *this)
{
+ user->AddConnectedAfterNotifier(¬ifier);
}
//-----------------------------------------------------------------------------
-RS_USER::RS_USER(const std::vector<uint32_t> & r, USER_PTR it)
- : lastSentTime(0),
- user(it),
- routers(r),
- shortPacketsCount(0)
+RS::USER::USER(const RS::USER & rhs)
+ : lastSentTime(rhs.lastSentTime),
+ user(rhs.user),
+ routers(rhs.routers),
+ shortPacketsCount(rhs.shortPacketsCount),
+ ip(rhs.ip),
+ notifier(rhs.notifier)
+{
+ user->DelConnectedAfterNotifier(&rhs.notifier);
+ user->AddConnectedAfterNotifier(¬ifier);
+}
+//-----------------------------------------------------------------------------
+RS::USER::~USER()
{
+ user->DelConnectedAfterNotifier(¬ifier);
}
//-----------------------------------------------------------------------------
-RS_SETTINGS::RS_SETTINGS()
+RS::SETTINGS::SETTINGS()
: sendPeriod(0),
- port(0)
+ port(0),
+ errorStr(),
+ netRouters(),
+ userParams(),
+ password(),
+ subnetFile()
{
}
//-----------------------------------------------------------------------------
-int RS_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int RS::SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
{
int p;
PARAM_VALUE pv;
NRMapParser nrMapParser;
-if (nrMapParser.ReadFile(subnetFile))
+if (!nrMapParser.ReadFile(subnetFile))
{
- errorStr = nrMapParser.GetErrorStr();
- return -1;
+ netRouters = nrMapParser.GetMap();
}
-
-netRouters = nrMapParser.GetMap();
-
-if (netRouters.empty())
+else
{
- errorStr = "Parameter(s) \'Subnet*\' not found.";
- printfd(__FILE__, "Parameter(s) 'Subnet*' not found\n");
- return -1;
+ GetStgLogger()("mod_rscript: error opening subnets file '%s'", subnetFile.c_str());
}
return 0;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
REMOTE_SCRIPT::REMOTE_SCRIPT()
- : sendPeriod(15),
+ : ctx(),
+ ipNotifierList(),
+ authorizedUsers(),
+ errorStr(),
+ rsSettings(),
+ settings(),
+ sendPeriod(15),
halfPeriod(8),
nonstop(false),
isRunning(false),
users(NULL),
+ netRouters(),
+ thread(),
+ mutex(),
sock(0),
onAddUserNotifier(*this),
- onDelUserNotifier(*this)
+ onDelUserNotifier(*this),
+ logger(GetPluginLogger(GetStgLogger(), "rscript"))
{
pthread_mutex_init(&mutex, NULL);
}
//-----------------------------------------------------------------------------
void * REMOTE_SCRIPT::Run(void * d)
{
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
REMOTE_SCRIPT * rs = static_cast<REMOTE_SCRIPT *>(d);
rs->isRunning = true;
InitEncrypt(&ctx, rsSettings.GetPassword());
-//onAddUserNotifier.SetRemoteScript(this);
-//onDelUserNotifier.SetRemoteScript(this);
-
users->AddNotifierUserAdd(&onAddUserNotifier);
users->AddNotifierUserDel(&onDelUserNotifier);
if (pthread_create(&thread, NULL, Run, this))
{
errorStr = "Cannot create thread.";
+ logger("Cannot create thread.");
printfd(__FILE__, "Cannot create thread\n");
return -1;
}
//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)
+ {
+ logger("Cannot stop thread.");
+ return -1;
+ }
+
return 0;
}
//-----------------------------------------------------------------------------
if (nrMapParser.ReadFile(rsSettings.GetMapFileName()))
{
errorStr = nrMapParser.GetErrorStr();
+ logger("Map file reading error: %s", errorStr.c_str());
return -1;
}
if (sock < 0)
{
errorStr = "Cannot create socket.";
+ logger("Canot create a socket: %s", strerror(errno));
printfd(__FILE__, "Cannot create socket\n");
return true;
}
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-map<uint32_t, RS_USER>::iterator it(authorizedUsers.begin());
+map<uint32_t, RS::USER>::iterator it(authorizedUsers.begin());
while (it != authorizedUsers.end())
{
if (difftime(stgTime, it->second.lastSentTime) - (rand() % halfPeriod) > sendPeriod)
- //if (stgTime - it->second.lastSentTime > sendPeriod)
{
Send(it->first, it->second);
}
}
}
//-----------------------------------------------------------------------------
-bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS_USER & rsu, bool forceDisconnect) const
+#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;
+RS::PACKET_HEADER packetHead;
memset(packetHead.padding, 0, sizeof(packetHead.padding));
strcpy((char*)packetHead.magic, RS_ID);
return false;
}
-RS_PACKET_TAIL packetTail;
+RS::PACKET_TAIL packetTail;
memset(packetTail.padding, 0, sizeof(packetTail.padding));
strcpy((char*)packetTail.magic, RS_ID);
return false;
}
//-----------------------------------------------------------------------------
-bool REMOTE_SCRIPT::Send(uint32_t ip, RS_USER & rsu, bool forceDisconnect) const
+bool REMOTE_SCRIPT::Send(uint32_t ip, RS::USER & rsu, bool forceDisconnect) const
{
char buffer[RS_MAX_PACKET_LEN];
return false;
}
//-----------------------------------------------------------------------------
-bool REMOTE_SCRIPT::SendDirect(uint32_t ip, RS_USER & rsu, uint32_t routerIP, bool forceDisconnect) const
+bool REMOTE_SCRIPT::SendDirect(uint32_t ip, RS::USER & rsu, uint32_t routerIP, bool forceDisconnect) const
{
char buffer[RS_MAX_PACKET_LEN];
int res = sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&sendAddr, sizeof(sendAddr));
+if (res < 0)
+ logger("sendto error: %s", strerror(errno));
+
return (res != sizeof(buffer));
}
//-----------------------------------------------------------------------------
USER_PTR u;
int h = users->OpenSearch();
-if (!h)
- {
- errorStr = "users->OpenSearch() error.";
- printfd(__FILE__, "OpenSearch() error\n");
- return true;
- }
+assert(h && "USERS::OpenSearch is always correct");
while (!users->SearchNext(h, &u))
{
*/
if (newIP)
{
- RS_USER rsu(IP2Routers(newIP), u);
+ RS::USER rsu(IP2Routers(newIP), u, *this);
Send(newIP, rsu);
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
- authorizedUsers[newIP] = rsu;
+ authorizedUsers.insert(std::make_pair(newIP, rsu));
}
else
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
- const map<uint32_t, RS_USER>::iterator it(
+ const map<uint32_t, RS::USER>::iterator it(
authorizedUsers.find(oldIP)
);
if (it != authorizedUsers.end())
//-----------------------------------------------------------------------------
void REMOTE_SCRIPT::SetUserNotifier(USER_PTR u)
{
-RS_CHG_AFTER_NOTIFIER<uint32_t> afterChgIPNotifier(*this, u);
+ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u));
-afterChgIPNotifierList.push_front(afterChgIPNotifier);
-
-u->AddCurrIPAfterNotifier(&(*afterChgIPNotifierList.begin()));
+u->AddCurrIPAfterNotifier(&(*ipNotifierList.begin()));
}
//-----------------------------------------------------------------------------
void REMOTE_SCRIPT::UnSetUserNotifier(USER_PTR u)
{
-list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator ipAIter;
-std::list<list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator> toErase;
+list<RS::IP_NOTIFIER>::iterator ipAIter;
+std::list<list<RS::IP_NOTIFIER>::iterator> toErase;
-for (ipAIter = afterChgIPNotifierList.begin(); ipAIter != afterChgIPNotifierList.end(); ++ipAIter)
+for (ipAIter = ipNotifierList.begin(); ipAIter != ipNotifierList.end(); ++ipAIter)
{
if (ipAIter->GetUser() == u)
{
}
}
-std::list<list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator>::iterator eIter;
+std::list<list<RS::IP_NOTIFIER>::iterator>::iterator eIter;
for (eIter = toErase.begin(); eIter != toErase.end(); ++eIter)
{
- afterChgIPNotifierList.erase(*eIter);
+ ipNotifierList.erase(*eIter);
}
}
//-----------------------------------------------------------------------------
-template <typename varParamType>
-void RS_CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType & oldValue, const varParamType & newValue)
+void RS::IP_NOTIFIER::Notify(const uint32_t & oldValue, const uint32_t & newValue)
{
rs.ChangedIP(user, oldValue, newValue);
}
//-----------------------------------------------------------------------------
+void RS::CONNECTED_NOTIFIER::Notify(const bool & /*oldValue*/, const bool & newValue)
+{
+if (!newValue)
+ rs.Send(user.ip, user, true);
+}
+//-----------------------------------------------------------------------------
void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const
{
unsigned char keyL[PASSWD_LEN]; // Пароль для шифровки
git.stg.codes / stg.git / blobdiff