class IP_NOTIFIER: public PROPERTY_NOTIFIER_BASE<uint32_t> {
public:
IP_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(u), rs(r) {}
+ : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(u), rs(r) { user->AddCurrIPAfterNotifier(this); }
IP_NOTIFIER(const IP_NOTIFIER & rhs)
- : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(rhs.user), rs(rhs.rs) {}
+ : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(rhs.user), rs(rhs.rs) { user->AddCurrIPAfterNotifier(this); }
+ ~IP_NOTIFIER() { user->DelCurrIPAfterNotifier(this); }
+
+ IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs)
+ {
+ user->DelCurrIPAfterNotifier(this);
+ user = rhs.user;
+ user->AddCurrIPAfterNotifier(this);
+ return *this;
+ }
+
void Notify(const uint32_t & oldValue, const uint32_t & newValue);
- USER_PTR GetUser() { return user; }
+ USER_PTR GetUser() const { return user; }
private:
- IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs);
USER_PTR user;
REMOTE_SCRIPT & rs;
};
//-----------------------------------------------------------------------------
-class USER;
-//-----------------------------------------------------------------------------
class CONNECTED_NOTIFIER: public PROPERTY_NOTIFIER_BASE<bool> {
public:
- CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER & u)
- : PROPERTY_NOTIFIER_BASE<bool>(), user(u), rs(r) {}
+ CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
+ : PROPERTY_NOTIFIER_BASE<bool>(), user(u), rs(r) { user->AddConnectedAfterNotifier(this); }
CONNECTED_NOTIFIER(const CONNECTED_NOTIFIER & rhs)
- : PROPERTY_NOTIFIER_BASE<bool>(), user(rhs.user), rs(rhs.rs) {}
+ : PROPERTY_NOTIFIER_BASE<bool>(), user(rhs.user), rs(rhs.rs) { user->AddConnectedAfterNotifier(this); }
+ ~CONNECTED_NOTIFIER() { user->DelConnectedAfterNotifier(this); }
+
+ CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs)
+ {
+ user->DelConnectedAfterNotifier(this);
+ user = rhs.user;
+ user->AddConnectedAfterNotifier(this);
+ return *this;
+ }
+
void Notify(const bool & oldValue, const bool & newValue);
+ USER_PTR GetUser() const { return user; }
private:
- CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs);
- USER & user;
+ USER_PTR user;
REMOTE_SCRIPT & rs;
};
//-----------------------------------------------------------------------------
struct USER {
- USER(const std::vector<uint32_t> & r, USER_PTR it, REMOTE_SCRIPT & rs);
- USER(const USER & rhs);
- ~USER();
+ USER(const std::vector<uint32_t> & r, USER_PTR it)
+ : user(it),
+ routers(r),
+ shortPacketsCount(0),
+ ip(user->GetCurrIP())
+ {}
time_t lastSentTime;
USER_PTR user;
std::vector<uint32_t> routers;
int shortPacketsCount;
uint32_t ip;
- CONNECTED_NOTIFIER notifier;
};
//-----------------------------------------------------------------------------
class SETTINGS {
const std::string & GetStrError() const { return errorStr; }
int ParseSettings(const MODULE_SETTINGS & s);
int GetSendPeriod() const { return sendPeriod; }
- int GetPort() const { return port; }
+ uint16_t GetPort() const { return port; }
const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
const std::vector<std::string> & GetUserParams() const { return userParams; }
const std::string & GetPassword() const { return password; }
private:
int sendPeriod;
uint16_t port;
- string errorStr;
+ std::string errorStr;
std::vector<NET_ROUTER> netRouters;
- std::vector<string> userParams;
- string password;
- string subnetFile;
+ std::vector<std::string> userParams;
+ std::string password;
+ std::string subnetFile;
};
//-----------------------------------------------------------------------------
class REMOTE_SCRIPT : public PLUGIN {
int Start();
int Stop();
- int Reload();
+ int Reload(const MODULE_SETTINGS & ms);
bool IsRunning() { return isRunning; }
const std::string & GetStrError() const { return errorStr; }
- const std::string GetVersion() const { return "Remote script v 0.3"; }
+ std::string GetVersion() const { return "Remote script v 0.3"; }
uint16_t GetStartPosition() const { return 10; }
uint16_t GetStopPosition() const { return 10; }
- void DelUser(USER_PTR u) { UnSetUserNotifier(u); }
- void AddUser(USER_PTR u) { SetUserNotifier(u); }
+ void DelUser(USER_PTR u) { UnSetUserNotifiers(u); }
+ void AddUser(USER_PTR u) { SetUserNotifiers(u); }
- void ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP);
+ void AddRSU(USER_PTR user);
+ void DelRSU(USER_PTR user);
private:
REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
bool PrepareNet();
bool FinalizeNet();
- bool Send(uint32_t ip, USER & rsu, bool forceDisconnect = false) const;
- bool SendDirect(uint32_t ip, USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
- bool PreparePacket(char * buf, size_t bufSize, uint32_t ip, USER &rsu, bool forceDisconnect = false) const;
+ bool Send(USER & rsu, bool forceDisconnect = false) const;
+ bool SendDirect(USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
+ bool PreparePacket(char * buf, size_t bufSize, USER &rsu, bool forceDisconnect = false) const;
void PeriodicSend();
std::vector<uint32_t> IP2Routers(uint32_t ip);
bool GetUsers();
- std::string GetUserParam(USER_PTR u, const std::string & paramName) const;
- void SetUserNotifier(USER_PTR u);
- void UnSetUserNotifier(USER_PTR u);
+ void SetUserNotifiers(USER_PTR u);
+ void UnSetUserNotifiers(USER_PTR u);
- void InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const;
- void Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, size_t len8) const;
+ void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password) const;
+ void Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8) const;
mutable BLOWFISH_CTX ctx;
std::list<IP_NOTIFIER> ipNotifierList;
+ std::list<CONNECTED_NOTIFIER> connNotifierList;
std::map<uint32_t, USER> authorizedUsers;
mutable std::string errorStr;
DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
void operator()(std::pair<const uint32_t, USER> & p)
{
- rscript.Send(p.first, p.second, true);
+ rscript.Send(p.second, true);
}
private:
REMOTE_SCRIPT & rscript;
git.stg.codes / stg.git / blobdiff