A map of ip-to-user replaced with vector of pairs

diff --git a/projects/sgauthstress/proto.cpp b/projects/sgauthstress/proto.cpp
index 7c547daf8462caeb086d4e38cd54241560a5293a..40762b13b3857ed1d09d0a451c5b7d52f2a4bcb1 100644 (file)
--- a/projects/sgauthstress/proto.cpp
+++ b/projects/sgauthstress/proto.cpp
@@ -7,6 +7,7 @@
 #include <stdexcept>
 
 #include "stg/common.h"
 #include <stdexcept>
 
 #include "stg/common.h"

+#include "stg/ia_packets.h"

 
 #include "proto.h"
 
 
 #include "proto.h"
 


@@ -111,7 +112,7 @@ return true;
 
 void PROTO::AddUser(const USER & user)
 {
 
 void PROTO::AddUser(const USER & user)
 {

-    users.insert(std::make_pair(user.GetIP(), user));
+    users.push_back(std::make_pair(user.GetIP(), user));

     struct pollfd pfd;
     pfd.fd = user.GetSocket();
     pfd.events = POLLIN;
     struct pollfd pfd;
     pfd.fd = user.GetSocket();
     pfd.events = POLLIN;


@@ -121,10 +122,10 @@ void PROTO::AddUser(const USER & user)
 
 bool PROTO::Connect(uint32_t ip)
 {
 
 bool PROTO::Connect(uint32_t ip)
 {

-std::map<uint32_t, USER>::const_iterator it;
+/*std::vector<std::pair<uint32_t, USER> >::const_iterator it;

 it = users.find(ip);
 if (it == users.end())
 it = users.find(ip);
 if (it == users.end())

-    return false;
+    return false;*/

 
 // Do something
 
 
 // Do something
 


@@ -133,10 +134,10 @@ return true;
 
 bool PROTO::Disconnect(uint32_t ip)
 {
 
 bool PROTO::Disconnect(uint32_t ip)
 {

-std::map<uint32_t, USER>::const_iterator it;
+/*std::vector<std::pair<uint32_t, USER> >::const_iterator it;

 it = users.find(ip);
 if (it == users.end())
 it = users.find(ip);
 if (it == users.end())

-    return false;
+    return false;*/

 
 // Do something
 
 
 // Do something
 


@@ -163,8 +164,8 @@ bool PROTO::RecvPacket()
 {
 bool result = true;
 std::vector<struct pollfd>::iterator it;
 {
 bool result = true;
 std::vector<struct pollfd>::iterator it;

-std::map<uint32_t, USER>::iterator userIt(users.begin());
-for (it = pollFds.begin(); it != pollFds.end(); ++it)
+std::vector<std::pair<uint32_t, USER> >::iterator userIt;
+for (it = pollFds.begin(), userIt = users.begin(); it != pollFds.end() && userIt != users.end(); ++it, ++userIt)

     {
     if (it->revents)
         {
     {
     if (it->revents)
         {


@@ -173,18 +174,16 @@ for (it = pollFds.begin(); it != pollFds.end(); ++it)
         struct sockaddr_in addr;
         socklen_t fromLen = sizeof(addr);
         char buffer[2048];
         struct sockaddr_in addr;
         socklen_t fromLen = sizeof(addr);
         char buffer[2048];

-        int res = recvfrom(userIt->second.GetSocket(), buffer, sizeof(buffer), 0, (struct sockaddr*)&addr, &fromLen);
+        int res = recvfrom(userIt->second.GetSocket(), buffer, sizeof(buffer), 0, (struct sockaddr *)&addr, &fromLen);

 
         if (res == -1)
             {
             result = false;
 
         if (res == -1)
             {
             result = false;

-            ++userIt;

             continue;
             }
 
         result = result && HandlePacket(buffer, &(userIt->second));
         }
             continue;
             }
 
         result = result && HandlePacket(buffer, &(userIt->second));
         }

-    ++userIt;

     }
 
 return result;
     }
 
 return result;


@@ -319,9 +318,10 @@ return true;
 bool PROTO::ERR_Proc(const void * buffer, USER * user)
 {
 const ERR_8 * packet = static_cast<const ERR_8 *>(buffer);
 bool PROTO::ERR_Proc(const void * buffer, USER * user)
 {
 const ERR_8 * packet = static_cast<const ERR_8 *>(buffer);

+const char * ptr = static_cast<const char *>(buffer);

 
 

-for (int i = 0; i < len/8; i++)
-    Blowfish_Decrypt(&ctxPass, (uint32_t*)(buffer + i*8), (uint32_t*)(buffer + i*8 + 4));
+for (int i = 0; i < sizeof(packet) / 8; i++)
+    Blowfish_Decrypt(user->GetCtx(), (uint32_t *)(ptr + i * 8), (uint32_t *)(ptr + i * 8 + 4));

 
 //uint32_t len = packet->len;
 
 
 //uint32_t len = packet->len;
 


@@ -435,7 +435,7 @@ assert(sizeof(hdr) + length < 2048 && "Packet length must not exceed 2048 bytes"
 
 strncpy((char *)hdr.magic, IA_ID, 6);
 hdr.protoVer[0] = 0;
 
 strncpy((char *)hdr.magic, IA_ID, 6);
 hdr.protoVer[0] = 0;

-hdr.protoVer[1] = IA_PROTO_VER;
+hdr.protoVer[1] = 8; // IA_PROTO_VER

 
 unsigned char buffer[2048];
 memcpy(buffer, &hdr, sizeof(hdr));
 
 unsigned char buffer[2048];
 memcpy(buffer, &hdr, sizeof(hdr));

diff --git a/projects/sgauthstress/proto.h b/projects/sgauthstress/proto.h
index 879e7a35b11a49e3a367842a7de31705bb6429ac..0a2fb2de7648ba3f3675d2bbb9f59aa7ddb56b2e 100644 (file)
--- a/projects/sgauthstress/proto.h
+++ b/projects/sgauthstress/proto.h
@@ -6,6 +6,7 @@
 #include <poll.h>
 
 #include <string>
 #include <poll.h>
 
 #include <string>

+#include <vector>

 #include <map>
 
 #include "stg/os_int.h"
 #include <map>
 
 #include "stg/os_int.h"


@@ -40,7 +41,7 @@ class PROTO {
         struct sockaddr_in serverAddr;
         int timeout;
 
         struct sockaddr_in serverAddr;
         int timeout;
 

-        std::map<uint32_t, USER> users;
+        std::vector<std::pair<uint32_t, USER> > users;

         std::vector<struct pollfd> pollFds;
 
         bool running;
         std::vector<struct pollfd> pollFds;
 
         bool running;