Missing referece for pthread_kill

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

diff --git a/src/users.cpp b/src/users.cpp
index 8c7f1409bfe6a6137dc8a2a449733f23b3aeff98..6418274282b8380fcce10e26e3a716d2e3562758 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -18,13 +18,17 @@ using namespace std;
 
 #include "inspircd_config.h" 
 #include "channels.h"
+#include "connection.h"
 #include "users.h"
 #include "inspircd.h"
 #include <stdio.h>
+#include <pthread.h>
+#include <signal.h>
 #include "inspstring.h"
 #include "helperfuncs.h"
 
 extern std::stringstream config_f;
+extern char ServerName[MAXBUF];
 
 extern time_t TIME;
 
@@ -39,7 +43,7 @@ userrec::userrec()
        strcpy(dhost,"");
        strcpy(fullname,"");
        strcpy(modes,"");
-       strcpy(server,"");
+       server = (char*)FindServerNamePtr(ServerName);
        strcpy(awaymsg,"");
        strcpy(oper,"");
        reset_due = TIME;
@@ -50,7 +54,6 @@ userrec::userrec()
        dns_done = false;
        recvq = "";
        sendq = "";
-       strcpy(result,"");
        for (int i = 0; i < MAXCHANS; i++)
        {
                this->chans[i].channel = NULL;
@@ -59,6 +62,11 @@ userrec::userrec()
        invites.clear();
 }
 
+userrec::~userrec()
+{
+       pthread_kill(this->dnsthread,9);
+}
+
 void userrec::CloseSocket()
 {
        shutdown(this->fd,2);
@@ -67,6 +75,7 @@ void userrec::CloseSocket()
  
 char* userrec::GetFullHost()
 {
+       static char result[MAXBUF];
        snprintf(result,MAXBUF,"%s!%s@%s",nick,ident,dhost);
        return result;
 }
@@ -75,6 +84,7 @@ int userrec::ReadData(void* buffer, size_t size)
 {
        if (this->fd > -1)
        {
+               log(DEBUG,"userrec::ReadData on fd %d",this->fd);
                return read(this->fd, buffer, size);
        }
        else return 0;
@@ -83,8 +93,9 @@ int userrec::ReadData(void* buffer, size_t size)
 
 char* userrec::GetFullRealHost()
 {
-       snprintf(result,MAXBUF,"%s!%s@%s",nick,ident,host);
-       return result;
+       static char fresult[MAXBUF];
+       snprintf(fresult,MAXBUF,"%s!%s@%s",nick,ident,host);
+       return fresult;
 }
 
 bool userrec::IsInvited(char* channel)
@@ -190,20 +201,20 @@ bool userrec::HasPermission(char* command)
 bool userrec::AddBuffer(std::string a)
 {
         std::string b = "";
-        for (int i = 0; i < a.length(); i++)
+        for (unsigned 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;
+       unsigned int i = 0;
        // count the size of the first line in the buffer.
        while (i < recvq.length())
        {
                if (recvq[i++] == '\n')
                        break;
        }
-       if (recvq.length() > this->recvqmax)
+       if (recvq.length() > (unsigned)this->recvqmax)
        {
                this->SetWriteError("RecvQ exceeded");
                WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
@@ -215,7 +226,7 @@ bool userrec::AddBuffer(std::string a)
 
 bool userrec::BufferIsReady()
 {
-        for (int i = 0; i < recvq.length(); i++)
+        for (unsigned int i = 0; i < recvq.length(); i++)
                if (recvq[i] == '\n')
                        return true;
         return false;
@@ -247,7 +258,7 @@ void userrec::AddWriteBuf(std::string data)
 {
        if (this->GetWriteError() != "")
                return;
-       if (sendq.length() + data.length() > this->sendqmax)
+       if (sendq.length() + data.length() > (unsigned)this->sendqmax)
        {
                WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
                this->SetWriteError("SendQ exceeded");