Regressed buffering code

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

diff --git a/src/users.cpp b/src/users.cpp
index beccb7e66afe495ef439b27ee93c29c58ff9b7fa..e67ad7cecce5ea65190a2ac5a06566652441e085 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -88,8 +88,6 @@ bool DoType(const char* tag, char** entries, void** values, int* types)
 {
        char* TypeName = (char*)values[0];
        char* Classes = (char*)values[1];
-       /*Config->ConfValue("type","name",j,TypeName,&Config->config_f);
-       Config->ConfValue("type","classes",j,Classes,&Config->config_f);*/
        opertypes[TypeName] = strdup(Classes);
        log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
        return true;
@@ -99,25 +97,16 @@ bool DoClass(const char* tag, char** entries, void** values, int* types)
 {
        char* ClassName = (char*)values[0];
        char* CommandList = (char*)values[1];
-       /*Config->ConfValue("class","name",k,ClassName,&Config->config_f);
-       Config->ConfValue("class","commands",k,CommandList,&Config->config_f);*/
        operclass[ClassName] = strdup(CommandList);
        log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
        return true;
 }
 
-bool DoneClassesAndTypes()
+bool DoneClassesAndTypes(const char* tag)
 {
        return true;
 }
 
-template<typename T> inline string ConvToStr(const T &in)
-{
-        stringstream tmp;
-        if (!(tmp << in)) return string();
-        return tmp.str();
-}
-
 userrec::userrec()
 {
        // the PROPER way to do it, AVOID bzero at *ALL* costs
@@ -322,9 +311,7 @@ bool userrec::AddBuffer(const std::string &a)
                 if ((*i != '\r') && (*i != '\0') && (*i != 7))
                         b = b + *i;
        }
-        std::stringstream stream(recvq);
-        stream << b;
-        recvq = stream.str();
+       recvq.append(b);
        unsigned int i = 0;
        // count the size of the first line in the buffer.
        while (i < recvq.length())
@@ -367,7 +354,7 @@ std::string userrec::GetBuffer()
                 ret = ret + *line;
                 line++;
         }
-        if ((*line == '\n') || (*line == '\r'))
+        while ((*line == '\n') || (*line == '\r'))
                 line++;
         recvq = line;
         return ret;
@@ -451,13 +438,25 @@ void kill_link(userrec *user,const char* r)
 {
         user_hash::iterator iter = clientlist.find(user->nick);
 
+
+/*
+ * I'm pretty sure returning here is causing a desync when part of the net thinks a user is gone,
+ * and another part doesn't. We want to broadcast the quit/kill before bailing so the net stays in sync.
+ *
+ * I can't imagine this blowing up, so I'm commenting it out. We still check
+ * before playing with a bad iterator below in our if(). DISCUSS THIS BEFORE YOU DO ANYTHING. --w00t
+ *
+ *     if (iter == clientlist.end())
+ *             return;
+ */
+
         char reason[MAXBUF];
 
         strlcpy(reason,r,MAXQUIT-1);
 
         log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
-        Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
-        log(DEBUG,"closing fd %d",user->fd);
+       if (IS_LOCAL(user))
+               Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
 
         if (user->registered == 7) {
                purge_empty_chans(user);
@@ -465,11 +464,12 @@ void kill_link(userrec *user,const char* r)
                 WriteCommonExcept(user,"QUIT :%s",reason);
         }
 
-        user->FlushWriteBuf();
+       if (IS_LOCAL(user))
+               user->FlushWriteBuf();
 
         FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
 
-        if (user->fd > -1)
+        if (IS_LOCAL(user))
         {
                if (Config->GetIOHook(user->port))
                {
@@ -490,7 +490,7 @@ void kill_link(userrec *user,const char* r)
         // if they were an oper with +s.
         if (user->registered == 7) {
                 // fix by brain: only show local quits because we only show local connects (it just makes SENSE)
-                if (user->fd > -1)
+                if (IS_LOCAL(user))
                         WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
                 AddWhoWas(user);
         }
@@ -498,7 +498,7 @@ void kill_link(userrec *user,const char* r)
         if (iter != clientlist.end())
         {
                 log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
-                if (user->fd > -1)
+                if (IS_LOCAL(user))
                {
                         fd_ref_table[user->fd] = NULL;
                        if (find(local_users.begin(),local_users.end(),user) != local_users.end())
@@ -508,8 +508,8 @@ void kill_link(userrec *user,const char* r)
                        }
                }
                 clientlist.erase(iter);
+               delete user;
         }
-        delete user;
 }
 
 WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)