Implement connecting and disconnecting users

diff --git a/projects/sgauthstress/proto.cpp b/projects/sgauthstress/proto.cpp
index b89681f6722c5368eeabff198996ef260601800b..d4624594ebf006b10ed20f355759eb1398c348e9 100644 (file)
--- a/projects/sgauthstress/proto.cpp
+++ b/projects/sgauthstress/proto.cpp
@@ -5,12 +5,21 @@
 #include <cstring>
 #include <cassert>
 #include <stdexcept>
 #include <cstring>
 #include <cassert>
 #include <stdexcept>

+#include <algorithm>

 
 #include "stg/common.h"
 #include "stg/ia_packets.h"
 
 #include "proto.h"
 
 
 #include "stg/common.h"
 #include "stg/ia_packets.h"
 
 #include "proto.h"
 

+class HasIP : public std::unary_function<std::pair<uint32_t, USER>, bool> {
+    public:
+        explicit HasIP(uint32_t i) : ip(i) {}
+        bool operator()(const std::pair<uint32_t, USER> & value) { return value.first == ip; }
+    private:
+        uint32_t ip;
+};
+

 PROTO::PROTO(const std::string & server,
              uint16_t port,
              uint16_t localPort,
 PROTO::PROTO(const std::string & server,
              uint16_t port,
              uint16_t localPort,


@@ -111,38 +120,45 @@ if (pthread_join(tid, NULL))
 return true;
 }
 
 return true;
 }
 

-void PROTO::AddUser(const USER & user)
+void PROTO::AddUser(const USER & user, bool connect)

 {
 {

-    users.push_back(std::make_pair(user.GetIP(), user));
-    struct pollfd pfd;
-    pfd.fd = user.GetSocket();
-    pfd.events = POLLIN;
-    pfd.revents = 0;
-    pollFds.push_back(pfd);
+users.push_back(std::make_pair(user.GetIP(), user));
+struct pollfd pfd;
+pfd.fd = user.GetSocket();
+pfd.events = POLLIN;
+pfd.revents = 0;
+pollFds.push_back(pfd);
+
+users.back().second.InitNetwork();
+
+if (connect)
+    {
+    RealConnect(&users.back().second);
+    }

 }
 
 bool PROTO::Connect(uint32_t ip)
 {
 }
 
 bool PROTO::Connect(uint32_t ip)
 {

-/*std::vector<std::pair<uint32_t, USER> >::const_iterator it;
-it = users.find(ip);
+std::vector<std::pair<uint32_t, USER> >::iterator it;
+it = std::find_if(users.begin(), users.end(), HasIP(ip));

 if (it == users.end())
 if (it == users.end())

-    return false;*/
+    return false;

 
 // Do something
 
 
 // Do something
 

-return true;
+return RealConnect(&it->second);

 }
 
 bool PROTO::Disconnect(uint32_t ip)
 {
 }
 
 bool PROTO::Disconnect(uint32_t ip)
 {

-/*std::vector<std::pair<uint32_t, USER> >::const_iterator it;
-it = users.find(ip);
+std::vector<std::pair<uint32_t, USER> >::iterator it;
+it = std::find_if(users.begin(), users.end(), HasIP(ip));

 if (it == users.end())
 if (it == users.end())

-    return false;*/
+    return false;

 
 // Do something
 
 
 // Do something
 

-return true;
+return RealDisconnect(&it->second);

 }
 
 void PROTO::Run()
 }
 
 void PROTO::Run()


@@ -235,6 +251,8 @@ user->SetAliveTimeout(aliveTimeout);
 user->SetUserTimeout(userTimeout);
 user->SetRnd(rnd);
 
 user->SetUserTimeout(userTimeout);
 user->SetRnd(rnd);
 

+printfd(__FILE__, "PROTO::CONN_SYN_ACK_Proc() - user '%s' successfully logged in from IP %s\n", user->GetLogin().c_str(), inet_ntostring(user->GetIP()).c_str());
+

 return true;
 }
 
 return true;
 }
 


@@ -468,7 +486,7 @@ if (res < 0)
     errorStr = "Failed to send packet: '";
     errorStr += strerror(errno);
     errorStr += "'";
     errorStr = "Failed to send packet: '";
     errorStr += strerror(errno);
     errorStr += "'";

-    printfd(__FILE__, "PROTO::SendPacket() - %s\n", errorStr.c_str());
+    printfd(__FILE__, "PROTO::SendPacket() - %s, fd: %d\n", errorStr.c_str(), user->GetSocket());

     return false;
     }
 
     return false;
     }
 


@@ -481,3 +499,28 @@ if (res < sizeof(buffer))
 
 return true;
 }
 
 return true;
 }

+
+bool PROTO::RealConnect(USER * user)
+{
+if (user->GetPhase() != 1 &&
+    user->GetPhase() != 5)
+    {
+    errorStr = "Unexpected connect";
+    printfd(__FILE__, "PROTO::RealConnect() - wrong phase: %d\n", user->GetPhase());
+    }
+user->SetPhase(2);
+
+return Send_CONN_SYN(user);
+}
+
+bool PROTO::RealDisconnect(USER * user)
+{
+if (user->GetPhase() != 3)
+    {
+    errorStr = "Unexpected disconnect";
+    printfd(__FILE__, "PROTO::RealDisconnect() - wrong phase: %d\n", user->GetPhase());
+    }
+user->SetPhase(4);
+
+return Send_DISCONN_SYN(user);
+}

diff --git a/projects/sgauthstress/proto.h b/projects/sgauthstress/proto.h
index 05fe472266ef092f2d6f9539d83a516b4b316b09..a63a4f90c3e6e7bf5df600363d5509fc62b9f6e2 100644 (file)
--- a/projects/sgauthstress/proto.h
+++ b/projects/sgauthstress/proto.h
@@ -31,7 +31,7 @@ class PROTO {
 
         const std::string GetStrError() const { return errorStr; }
 
 
         const std::string GetStrError() const { return errorStr; }
 

-        void AddUser(const USER & user);
+        void AddUser(const USER & user, bool connect = false);

 
         bool Connect(uint32_t ip);
         bool Disconnect(uint32_t ip);
 
         bool Connect(uint32_t ip);
         bool Disconnect(uint32_t ip);


@@ -74,6 +74,9 @@ class PROTO {
         bool Send_DISCONN_SYN(USER * user);
         bool Send_DISCONN_ACK(USER * user);
         bool Send_ALIVE_ACK(USER * user);
         bool Send_DISCONN_SYN(USER * user);
         bool Send_DISCONN_ACK(USER * user);
         bool Send_ALIVE_ACK(USER * user);

+
+        bool RealConnect(USER * user);
+        bool RealDisconnect(USER * user);

 };
 
 #endif
 };
 
 #endif