src/core/CNProtocol.cpp

@@ -41,8 +41,7 @@ int CNSocketEncryption::xorData(uint8_t* buffer, uint8_t* key, int size) {
 uint64_t CNSocketEncryption::createNewKey(uint64_t uTime, int32_t iv1, int32_t iv2) {
     uint64_t num = (uint64_t)(iv1 + 1);
     uint64_t num2 = (uint64_t)(iv2 + 1);
-    uint64_t dEKey;
-    memcpy(&dEKey, defaultKey, sizeof(dEKey));
+    uint64_t dEKey = (uint64_t)(*(uint64_t*)&defaultKey[0]);
     return dEKey * (uTime * num * num2);
 }
 
@@ -66,7 +65,7 @@ CNPacketData::CNPacketData(void *b, uint32_t t, int l, int trnum, void *trs):
 // ========================================================[[ CNSocket ]]========================================================
 
 CNSocket::CNSocket(SOCKET s, struct sockaddr_in &addr, PacketHandler ph): sock(s), sockaddr(addr), pHandler(ph) {
-    memcpy(&EKey, CNSocketEncryption::defaultKey, sizeof(EKey));
+    EKey = (uint64_t)(*(uint64_t*)&CNSocketEncryption::defaultKey[0]);
 }
 
 bool CNSocket::sendData(uint8_t* data, int size) {
@@ -110,11 +109,7 @@ bool CNSocket::isAlive() {
 }
 
 void CNSocket::kill() {
-    if (!alive)
-        return;
-
     alive = false;
-
 #ifdef _WIN32
     shutdown(sock, SD_BOTH);
     closesocket(sock);
@@ -246,10 +241,9 @@ void CNSocket::step() {
     if (readSize <= 0) {
         // we aren't reading a packet yet, try to start looking for one
         int recved = recv(sock, (buffer_t*)readBuffer, sizeof(int32_t), 0);
-        if (recved >= 0 && recved < sizeof(int32_t)) {
-            // too little data for readSize or the socket was closed normally (when 0 bytes were read)
+        if (recved == 0) {
+            // the socket was closed normally
             kill();
-            return;
         } else if (!SOCKETERROR(recved)) {
             // we got our packet size!!!!
             readSize = *((int32_t*)readBuffer);
@@ -270,12 +264,11 @@ void CNSocket::step() {
     }
 
     if (readSize > 0 && readBufferIndex < readSize) {
-        // read until the end of the packet (or at least try to)
+        // read until the end of the packet! (or at least try too)
         int recved = recv(sock, (buffer_t*)(readBuffer + readBufferIndex), readSize - readBufferIndex, 0);
         if (recved == 0) {
             // the socket was closed normally
             kill();
-            return;
         } else if (!SOCKETERROR(recved))
             readBufferIndex += recved;
         else if (OF_ERRNO != OF_EWOULD) {
@@ -418,9 +411,9 @@ void CNServer::addPollFD(SOCKET s) {
     fds.push_back({s, POLLIN});
 }
 
-void CNServer::removePollFD(int fd) {
+void CNServer::removePollFD(int i) {
     auto it = fds.begin();
-    while (it != fds.end() && it->fd != fd)
+    while (it != fds.end() && it->fd != fds[i].fd)
         it++;
     assert(it != fds.end());
 
@@ -465,7 +458,7 @@ void CNServer::start() {
                 if (!setSockNonblocking(sock, newConnectionSocket))
                     continue;
 
-                std::cout << "New " << serverType << " connection! " << inet_ntoa(address.sin_addr) << std::endl;
+                std::cout << "New connection! " << inet_ntoa(address.sin_addr) << std::endl;
 
                 addPollFD(newConnectionSocket);
 
@@ -497,29 +490,22 @@ void CNServer::start() {
                 if (fds[i].revents & ~POLLIN)
                     cSock->kill();
 
-                if (cSock->isAlive())
+                if (cSock->isAlive()) {
                     cSock->step();
+                } else {
+                    killConnection(cSock);
+                    connections.erase(fds[i].fd);
+                    delete cSock;
+
+                    removePollFD(i);
+
+                    // a new entry was moved to this position, so we check it again
+                    i--;
+                }
             }
         }
 
         onStep();
-
-        // clean up dead connection sockets
-        auto it = connections.begin();
-        while (it != connections.end()) {
-            CNSocket *cSock = it->second;
-
-            if (!cSock->isAlive()) {
-                killConnection(cSock);
-                it = connections.erase(it);
-
-                removePollFD(cSock->sock);
-
-                delete cSock;
-            } else {
-                it++;
-            }
-        }
     }
 }
 

src/core/CNProtocol.hpp

@@ -230,7 +230,6 @@ protected:
     const size_t STARTFDSCOUNT = 8; // number of initial PollFD slots
     std::vector<PollFD> fds;
 
-    std::string serverType = "invalid";
     SOCKET sock;
     uint16_t port;
     socklen_t addressSize;

src/servers/CNLoginServer.cpp

@@ -11,7 +11,6 @@
 std::map<CNSocket*, CNLoginData> CNLoginServer::loginSessions;
 
 CNLoginServer::CNLoginServer(uint16_t p) {
-    serverType = "login";
     port = p;
     pHandler = &CNLoginServer::handlePacket;
     init();
@@ -209,12 +208,9 @@ void CNLoginServer::login(CNSocket* sock, CNPacketData* data) {
     // send the resp in with original key
     sock->sendPacket(resp, P_LS2CL_REP_LOGIN_SUCC);
 
-    uint64_t defaultKey;
-    memcpy(&defaultKey, CNSocketEncryption::defaultKey, sizeof(defaultKey));
-
     // update keys
     sock->setEKey(CNSocketEncryption::createNewKey(resp.uiSvrTime, resp.iCharCount + 1, resp.iSlotNum + 1));
-    sock->setFEKey(CNSocketEncryption::createNewKey(defaultKey, login->iClientVerC, 1));
+    sock->setFEKey(CNSocketEncryption::createNewKey((uint64_t)(*(uint64_t*)&CNSocketEncryption::defaultKey[0]), login->iClientVerC, 1));
 
     DEBUGLOG(
         std::cout << "Login Server: Login success. Welcome " << userLogin << " [" << loginSessions[sock].userID << "]" << std::endl;

src/servers/CNShardServer.cpp

@@ -16,7 +16,6 @@ std::map<uint32_t, PacketHandler> CNShardServer::ShardPackets;
 std::list<TimerEvent> CNShardServer::Timers;
 
 CNShardServer::CNShardServer(uint16_t p) {
-    serverType = "shard";
     port = p;
     pHandler = &CNShardServer::handlePacket;
     REGISTER_SHARD_TIMER(keepAliveTimer, 4000);