Branch merge.

[irc/rqf/shadowircd.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 844f0aad44ab06f289f31c5e106426dd293044c5..b45acb2f0551e3b6c97b6ccddb2ea17c700db211 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -40,7 +40,7 @@
 #include "s_auth.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "send.h"
@@ -76,6 +76,7 @@ static EVH check_pings;
 extern rb_bh *client_heap;
 extern rb_bh *lclient_heap;
 extern rb_bh *pclient_heap;
+static rb_bh *away_heap = NULL;
 
 extern char current_uid[IDLEN];
 
@@ -117,12 +118,15 @@ init_client(void)
         * start off the check ping event ..  -- adrian
         * Every 30 seconds is plenty -- db
         */
-       client_heap = rb_bh_create(sizeof(struct Client), CLIENT_HEAP_SIZE);
-       lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
-       pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE);
+       client_heap = rb_bh_create(sizeof(struct Client), CLIENT_HEAP_SIZE, "client_heap");
+       lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE, "lclient_heap");
+       pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
+       away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
+
        rb_event_addish("check_pings", check_pings, NULL, 30);
        rb_event_addish("free_exited_clients", &free_exited_clients, NULL, 4);
        rb_event_addish("exit_aborted_clients", exit_aborted_clients, NULL, 1);
+       rb_event_add("flood_recalc", flood_recalc, NULL, 1);
 
        nd_dict = irc_dictionary_create(irccmp);
 }
@@ -157,7 +161,7 @@ make_client(struct Client *from)
                client_p->localClient->lasttime = client_p->localClient->firsttime = rb_current_time();
 
                client_p->localClient->F = NULL;
-               client_p->localClient->ctrlfd = -1;
+               client_p->localClient->ctrlF = NULL;
 
                client_p->preClient = (struct PreClient *) rb_bh_alloc(pclient_heap);
 
@@ -1398,6 +1402,11 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
                  const char *comment)
 {
        delete_auth_queries(source_p);
+       if (source_p->localClient->dnsquery)
+       {
+               delete_resolver_queries(source_p->localClient->dnsquery);
+               rb_free(source_p->localClient->dnsquery);
+       }
        del_unknown_ip(source_p);
        rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
@@ -1553,10 +1562,10 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s was connected"
                             " for %ld seconds.  %d/%d sendK/recvK.",
-                            source_p->name, rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
+                            source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
 
        ilog(L_SERVER, "%s was connected for %ld seconds.  %d/%d sendK/recvK.",
-            source_p->name, rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
+            source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
         
        if(has_id(source_p))
                del_from_id_hash(source_p->id, source_p);
@@ -1709,8 +1718,8 @@ void
 count_local_client_memory(size_t * count, size_t * local_client_memory_used)
 {
        size_t lusage;
-       rb_bh_usage(lclient_heap, count, NULL, &lusage);
-       *local_client_memory_used = lusage + (*count * (sizeof(MemBlock) + sizeof(struct Client)));
+       rb_bh_usage(lclient_heap, count, NULL, &lusage, NULL);
+       *local_client_memory_used = lusage + (*count * (sizeof(void *) + sizeof(struct Client)));
 }
 
 /*
@@ -1720,10 +1729,10 @@ void
 count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
 {
        size_t lcount, rcount;
-       rb_bh_usage(lclient_heap, &lcount, NULL, NULL);
-       rb_bh_usage(client_heap, &rcount, NULL, NULL);
+       rb_bh_usage(lclient_heap, &lcount, NULL, NULL, NULL);
+       rb_bh_usage(client_heap, &rcount, NULL, NULL, NULL);
        *count = rcount - lcount;
-       *remote_client_memory_used = *count * (sizeof(MemBlock) + sizeof(struct Client));
+       *remote_client_memory_used = *count * (sizeof(void *) + sizeof(struct Client));
 }
 
 
@@ -1845,9 +1854,9 @@ static rb_bh *user_heap;
 void
 initUser(void)
 {
-       user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE);
+       user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
        if(!user_heap)
-               outofmemory();
+               rb_outofmemory();
 }
 
 /*
@@ -1906,6 +1915,8 @@ make_server(struct Client *client_p)
 void
 free_user(struct User *user, struct Client *client_p)
 {
+       free_away(client_p);
+
        if(--user->refcnt <= 0)
        {
                if(user->away)
@@ -1936,21 +1947,21 @@ free_user(struct User *user, struct Client *client_p)
        }
 }
 
-void\r
-allocate_away(struct Client *client_p)\r
-{\r
-       if(client_p->user->away == NULL)\r
-               client_p->user->away = rb_bh_alloc(away_heap);  \r
-}\r
-\r
-\r
-void\r
-free_away(struct Client *client_p)\r
-{\r
-       if(client_p->user->away != NULL) {\r
-               rb_bh_free(away_heap, client_p->user->away);\r
-               client_p->user->away = NULL;\r
-       }\r
+void
+allocate_away(struct Client *client_p)
+{
+       if(client_p->user->away == NULL)
+               client_p->user->away = rb_bh_alloc(away_heap);  
+}
+
+
+void
+free_away(struct Client *client_p)
+{
+       if(client_p->user != NULL && client_p->user->away != NULL) {
+               rb_bh_free(away_heap, client_p->user->away);
+               client_p->user->away = NULL;
+       }
 }
 
 void
@@ -2021,21 +2032,21 @@ close_connection(struct Client *client_p)
        {
                struct server_conf *server_p;
 
-               ServerStats->is_sv++;
-               ServerStats->is_sbs += client_p->localClient->sendB;
-               ServerStats->is_sbr += client_p->localClient->receiveB;
-               ServerStats->is_sks += client_p->localClient->sendK;
-               ServerStats->is_skr += client_p->localClient->receiveK;
-               ServerStats->is_sti += rb_current_time() - client_p->localClient->firsttime;
-               if(ServerStats->is_sbs > 2047)
+               ServerStats.is_sv++;
+               ServerStats.is_sbs += client_p->localClient->sendB;
+               ServerStats.is_sbr += client_p->localClient->receiveB;
+               ServerStats.is_sks += client_p->localClient->sendK;
+               ServerStats.is_skr += client_p->localClient->receiveK;
+               ServerStats.is_sti += rb_current_time() - client_p->localClient->firsttime;
+               if(ServerStats.is_sbs > 2047)
                {
-                       ServerStats->is_sks += (ServerStats->is_sbs >> 10);
-                       ServerStats->is_sbs &= 0x3ff;
+                       ServerStats.is_sks += (ServerStats.is_sbs >> 10);
+                       ServerStats.is_sbs &= 0x3ff;
                }
-               if(ServerStats->is_sbr > 2047)
+               if(ServerStats.is_sbr > 2047)
                {
-                       ServerStats->is_skr += (ServerStats->is_sbr >> 10);
-                       ServerStats->is_sbr &= 0x3ff;
+                       ServerStats.is_skr += (ServerStats.is_sbr >> 10);
+                       ServerStats.is_sbr &= 0x3ff;
                }
 
                /*
@@ -2059,25 +2070,25 @@ close_connection(struct Client *client_p)
        }
        else if(IsClient(client_p))
        {
-               ServerStats->is_cl++;
-               ServerStats->is_cbs += client_p->localClient->sendB;
-               ServerStats->is_cbr += client_p->localClient->receiveB;
-               ServerStats->is_cks += client_p->localClient->sendK;
-               ServerStats->is_ckr += client_p->localClient->receiveK;
-               ServerStats->is_cti += rb_current_time() - client_p->localClient->firsttime;
-               if(ServerStats->is_cbs > 2047)
+               ServerStats.is_cl++;
+               ServerStats.is_cbs += client_p->localClient->sendB;
+               ServerStats.is_cbr += client_p->localClient->receiveB;
+               ServerStats.is_cks += client_p->localClient->sendK;
+               ServerStats.is_ckr += client_p->localClient->receiveK;
+               ServerStats.is_cti += rb_current_time() - client_p->localClient->firsttime;
+               if(ServerStats.is_cbs > 2047)
                {
-                       ServerStats->is_cks += (ServerStats->is_cbs >> 10);
-                       ServerStats->is_cbs &= 0x3ff;
+                       ServerStats.is_cks += (ServerStats.is_cbs >> 10);
+                       ServerStats.is_cbs &= 0x3ff;
                }
-               if(ServerStats->is_cbr > 2047)
+               if(ServerStats.is_cbr > 2047)
                {
-                       ServerStats->is_ckr += (ServerStats->is_cbr >> 10);
-                       ServerStats->is_cbr &= 0x3ff;
+                       ServerStats.is_ckr += (ServerStats.is_cbr >> 10);
+                       ServerStats.is_cbr &= 0x3ff;
                }
        }
        else
-               ServerStats->is_ni++;
+               ServerStats.is_ni++;
 
        if(client_p->localClient->F)
        {
@@ -2089,10 +2100,10 @@ close_connection(struct Client *client_p)
                client_p->localClient->F = NULL;
        }
 
-       if(-1 < client_p->localClient->ctrlfd)
+       if(client_p->localClient->ctrlF)
        {
-               rb_close(client_p->localClient->ctrlfd);
-               client_p->localClient->ctrlfd = -1;
+               rb_close(client_p->localClient->ctrlF);
+               client_p->localClient->ctrlF = NULL;
        }
 
        rb_linebuf_donebuf(&client_p->localClient->buf_sendq);