X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=0e676600edb5b6571a67375644b3e844d7419228;hb=70246812d3304b7c0ce81e7708c0fd98438ccd49;hp=b940bd6afc544268ec8e868ce5dde676b7cf8525;hpb=e7f0a0fb7edf96abbddf72eadb490b5eb22447ec;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index b940bd6af..0e676600e 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -19,9 +19,12 @@
 #include "users.h"
 #include "inspircd.h"
 #include <stdio.h>
+#include "inspstring.h"
 
 extern std::stringstream config_f;
 
+extern time_t TIME;
+
 userrec::userrec()
 {
 	// the PROPER way to do it, AVOID bzero at *ALL* costs
@@ -36,9 +39,15 @@ userrec::userrec()
 	strcpy(inbuf,"");
 	strcpy(server,"");
 	strcpy(awaymsg,"");
+	strcpy(oper,"");
+	reset_due = TIME;
+	lines_in = 0;
 	fd = lastping = signon = idle_lastmsg = nping = registered = 0;
 	flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
 	haspassed = false;
+	dns_done = false;
+	recvq = "";
+	sendq = "";
 	strcpy(result,"");
 	for (int i = 0; i < MAXCHANS; i++)
 	{
@@ -109,7 +118,6 @@ void userrec::RemoveInvite(char* channel)
 bool userrec::HasPermission(char* command)
 {
 	char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
-	char* myclass;
 	char* mycmd;
 	char* savept;
 	char* savept2;
@@ -159,3 +167,96 @@ bool userrec::HasPermission(char* command)
 }
 
 
+bool userrec::AddBuffer(std::string a)
+{
+        std::string b = "";
+        for (int i = 0; i < a.length(); i++)
+                if ((a[i] != '\r') && (a[i] != '\0') && (a[i] != 7))
+                        b = b + a[i];
+        std::stringstream stream(recvq);
+        stream << b;
+        recvq = stream.str();
+	int i = 0;
+	// count the size of the first line in the buffer.
+	while (i < recvq.length())
+	{
+		if (recvq[i++] == '\n')
+			break;
+	}
+	// return false if we've had more than 600 characters WITHOUT
+	// a carriage return (this is BAD, drop the socket)
+	return (i < 600);
+}
+
+bool userrec::BufferIsReady()
+{
+        for (int i = 0; i < recvq.length(); i++)
+		if (recvq[i] == '\n')
+			return true;
+        return false;
+}
+
+void userrec::ClearBuffer()
+{
+        recvq = "";
+}
+
+std::string userrec::GetBuffer()
+{
+	if (recvq == "")
+		return "";
+        char* line = (char*)recvq.c_str();
+        std::string ret = "";
+        while ((*line != '\n') && (strlen(line)))
+        {
+                ret = ret + *line;
+                line++;
+        }
+        if ((*line == '\n') || (*line == '\r'))
+                line++;
+        recvq = line;
+        return ret;
+}
+
+void userrec::AddWriteBuf(std::string data)
+{
+        std::stringstream stream;
+        stream << sendq << data;
+        sendq = stream.str();
+}
+
+// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
+void userrec::FlushWriteBuf()
+{
+	if (sendq.length())
+	{
+		char* tb = (char*)this->sendq.c_str();
+		int n_sent = write(this->fd,tb,this->sendq.length());
+		if (n_sent == -1)
+		{
+			this->SetWriteError(strerror(errno));
+		}
+		else
+		{
+			// advance the queue
+			tb += n_sent;
+			this->sendq = tb;
+			// update the user's stats counters
+			this->bytes_out += n_sent;
+			this->cmds_out++;
+		}
+	}
+}
+
+void userrec::SetWriteError(std::string error)
+{
+	log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
+	// don't try to set the error twice, its already set take the first string.
+	if (this->WriteError == "")
+		this->WriteError = error;
+}
+
+std::string userrec::GetWriteError()
+{
+	return this->WriteError;
+}