Updated to keep lowermap const within hashcomp.cpp

[user/henk/code/inspircd.git] / src / connection.cpp

diff --git a/src/connection.cpp b/src/connection.cpp
index 6302b1e7e50e85a74fa6c0141a5137735f501868..384f626e2f2f59f0cbefa57ec3fa6d9bc5d29897 100644 (file)
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -28,6 +28,7 @@
 #include "inspircd.h"
 #include "modules.h"
 #include "inspstring.h"
+#include "helperfuncs.h"
 
 using namespace std;
 
@@ -35,6 +36,8 @@ using namespace std;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
+std::deque<std::string> xsums;
+
 extern int MODCOUNT;
 
 extern time_t TIME;
@@ -56,6 +59,19 @@ extern time_t TIME;
  * to it, to maintain the mesh link.
  */
 
+char* xsumtable = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+// creates a random id for a line for detection of duplicate messages
+std::string CreateSum()
+{
+       char sum[9];
+       sum[0] = ':';
+       sum[8] = '\0';
+       for(int q = 1; q < 8; q++)
+               sum[q] = xsumtable[rand()%52];
+       return sum;
+}
+
 connection::connection()
 {
        fd = 0;
@@ -487,13 +503,30 @@ bool connection::SendPacket(char *message, const char* sendhost)
        }
 }
 
+bool already_have_sum(std::string sum)
+{
+       for (int i = 0; i < xsums.size(); i++)
+       {
+               if (xsums[i] == sum)
+               {
+                       return true;
+               }
+       }
+       if (xsums.size() >= 128)
+       {
+               xsums.pop_front();
+       }
+       xsums.push_back(sum);
+       return false;
+}
+
 // receives a packet from any where there is data waiting, first come, first served
 // fills the message and host values with the host where the data came from.
 
-bool connection::RecvPacket(std::deque<std::string> &messages, char* recvhost)
+bool connection::RecvPacket(std::deque<std::string> &messages, char* recvhost,std::deque<std::string> &sums)
 {
-       char data[4096];
-       memset(data, 0, 4096);
+       char data[65536];
+       memset(data, 0, 65536);
        for (int i = 0; i < this->connectors.size(); i++)
        {
                if (this->connectors[i].GetState() != STATE_DISCONNECTED)
@@ -509,7 +542,7 @@ bool connection::RecvPacket(std::deque<std::string> &messages, char* recvhost)
                        int ret = poll(&polls,1,1);
                        if (ret <= 0) continue;
 
-                       rcvsize = recv(this->connectors[i].GetDescriptor(),data,4090,0);
+                       rcvsize = recv(this->connectors[i].GetDescriptor(),data,65000,0);
                        data[rcvsize] = '\0';
                        if (rcvsize == -1)
                        {
@@ -532,9 +565,35 @@ bool connection::RecvPacket(std::deque<std::string> &messages, char* recvhost)
                                                std::string text = this->connectors[i].GetBuffer();
                                                if (text != "")
                                                {
+                                                       if ((text[0] == ':') && (text.find(" ") != std::string::npos))
+                                                       {
+                                                               std::string orig = text;
+                                                               log(DEBUG,"Original: %s",text.c_str());
+                                                               std::string sum = text.substr(1,text.find(" ")-1);
+                                                               text = text.substr(text.find(" ")+1,text.length());
+                                                               std::string possible_token = text.substr(1,text.find(" ")-1);
+                                                               if (possible_token.length() > 1)
+                                                               {
+                                                                       sums.push_back("*");
+                                                                       text = orig;
+                                                                       log(DEBUG,"Non-mesh, non-tokenized string passed up the chain");
+                                                               }
+                                                               else
+                                                               {
+                                                                       log(DEBUG,"Packet sum: '%s'",sum.c_str());
+                                                                       if ((already_have_sum(sum)) && (sum != "*"))
+                                                                       {
+                                                                               // we don't accept dupes
+                                                                               log(DEBUG,"Duplicate packet sum %s from server %s dropped",sum.c_str(),this->connectors[i].GetServerName().c_str());
+                                                                               continue;
+                                                                       }
+                                                                       sums.push_back(sum.c_str());
+                                                               }
+                                                       }
+                                                       else sums.push_back("*");
                                                        messages.push_back(text.c_str());
                                                        strlcpy(recvhost,this->connectors[i].GetServerName().c_str(),160);
-                                                       log(DEBUG,"main: Connection::RecvPacket() %d:%s->%s",pushed++,recvhost,text.c_str()); 
+                                                       log(DEBUG,"Connection::RecvPacket() %d:%s->%s",pushed++,recvhost,text.c_str()); 
                                                }
                                        }
                                        return true;