More allocation debugging support.

[srvx.git] / src / hash.c

diff --git a/src/hash.c b/src/hash.c
index 8952ac0595d368ebeeca96ae388c29abd1033d6e..cb95ce16ef1b1aa0d585c8303475bd71f82e00b7 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,11 +1,12 @@
 /* hash.c - IRC network state database
  * Copyright 2000-2004 srvx Development Team
  *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of srvx.
+ *
+ * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.  Important limitations are
- * listed in the COPYING file that accompanies this software.
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, email srvx-maintainers@srvx.net.
+ * along with srvx; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
 #include "conf.h"
@@ -139,14 +141,14 @@ ReintroduceUser(struct userNode *user)
     unsigned int n;
        
     irc_user(user);
-    change.modes_set = change.modes_clear = 0;
+    mod_chanmode_init(&change);
     change.argc = 1;
     for (n = 0; n < user->channels.used; n++) {
         struct modeNode *mn = user->channels.list[n];
        irc_join(user, mn->channel);
         if (mn->modes) {
             change.args[0].mode = mn->modes;
-            change.args[0].member = mn;
+            change.args[0].u.member = mn;
             mod_chanmode_announce(user, mn->channel, &change);
         }
     }
@@ -236,6 +238,14 @@ StampUser(struct userNode *user, const char *stamp)
     user->modes |= FLAGS_STAMPED;
 }
 
+void
+assign_fakehost(struct userNode *user, const char *host, int announce)
+{
+    safestrncpy(user->fakehost, host, sizeof(user->fakehost));
+    if (announce)
+        irc_fakehost(user, host);
+}
+
 static new_channel_func_t *ncf_list;
 static unsigned int ncf_size = 0, ncf_used = 0;
 
@@ -281,6 +291,11 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned
     char orig_key[KEYLEN+1];
     unsigned int nn, argc;
 
+    /* nuke old topic */
+    cNode->topic[0] = '\0';
+    cNode->topic_nick[0] = '\0';
+    cNode->topic_time = 0;
+
     /* remember the old modes, and update them with the new */
     orig_modes = cNode->modes;
     orig_limit = cNode->limit;
@@ -297,14 +312,13 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned
     /* deop anybody in the channel now, but count services to reop */
     for (nn=argc=0; nn<cNode->members.used; nn++) {
         struct modeNode *mn = cNode->members.list[nn];
-        if (mn->modes & MODE_CHANOP && IsService(mn->user) && IsLocal(mn->user))
+        if ((mn->modes & MODE_CHANOP) && IsService(mn->user) && IsLocal(mn->user))
             argc++;
     }
     if (argc) {
-        extern struct userNode *opserv;
         struct mod_chanmode *change;
 
-        change = mod_chanmode_alloc(nn);
+        change = mod_chanmode_alloc(argc);
         change->modes_clear = 0;
         change->modes_set = orig_modes;
         change->new_limit = orig_limit;
@@ -313,14 +327,13 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned
             struct modeNode *mn = cNode->members.list[nn];
             if ((mn->modes & MODE_CHANOP) && IsService(mn->user) && IsLocal(mn->user)) {
                 change->args[argc].mode = MODE_CHANOP;
-                change->args[argc].member = mn;
+                change->args[argc].u.member = mn;
                 argc++;
             }
         }
-        if (change->argc > 0)
-            mod_chanmode_announce(change->args[0].member->user, cNode, change);
-        else
-            mod_chanmode_announce(opserv, cNode, change);
+        assert(argc == change->argc);
+        change->args[0].u.member->modes &= ~MODE_CHANOP;
+        mod_chanmode_announce(change->args[0].u.member->user, cNode, change);
         mod_chanmode_free(change);
     }
 }
@@ -412,6 +425,7 @@ DelChannel(struct chanNode *channel)
 {
     unsigned int n;
 
+    verify(channel);
     dict_remove(channels, channel->name);
 
     if (channel->members.used || channel->locks) {
@@ -460,6 +474,9 @@ AddChannelUser(struct userNode *user, struct chanNode* channel)
        modeList_append(&channel->members, mNode);
        modeList_append(&user->channels, mNode);
 
+        if (channel->members.used == 1)
+            mNode->modes |= MODE_CHANOP;
+
         for (n=0; n<jf_used; n++) {
             /* Callbacks return true if they kick or kill the user,
              * and we can continue without removing mNode. */
@@ -513,8 +530,7 @@ LockChannel(struct chanNode* channel)
 void
 UnlockChannel(struct chanNode *channel)
 {
-    if (!channel->locks)
-        return;
+    assert(channel->locks > 0);
     if (!--channel->locks && !channel->members.used)
         DelChannel(channel);
 }
@@ -525,9 +541,8 @@ DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reas
     struct modeNode* mNode;
     unsigned int n;
 
-    if (reason) {
+    if (reason)
         irc_part(user, channel, reason);
-    }
 
     mNode = GetUserMode(channel, user);
 
@@ -540,12 +555,15 @@ DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reas
     /* remove modeNode from channel and user */
     modeList_remove(&channel->members, mNode);
     modeList_remove(&user->channels, mNode);
-    free(mNode);
 
+    /* make callbacks */
     for (n=0; n<pf_used; n++)
-        pf_list[n](user, channel, reason);
+       pf_list[n](mNode, reason);
+
+    /* free memory */
+    free(mNode);
 
-    if (!deleting && !channel->members.used && !channel->locks)
+    if (!deleting && !channel->members.used && !channel->locks && !(channel->modes & MODE_REGISTERED))
         DelChannel(channel);
 }
 
@@ -674,8 +692,12 @@ GetUserMode(struct chanNode *channel, struct userNode *user)
 {
     unsigned int n;
     struct modeNode *mn = NULL;
+
+    verify(channel);
+    verify(user);
     if (channel->members.used < user->channels.used) {
        for (n=0; n<channel->members.used; n++) {
+            verify(channel->members.list[n]);
            if (user == channel->members.list[n]->user) {
                mn = channel->members.list[n];
                break;
@@ -683,6 +705,7 @@ GetUserMode(struct chanNode *channel, struct userNode *user)
        }
     } else {
        for (n=0; n<user->channels.used; n++) {
+            verify(user->channels.list[n]);
            if (channel == user->channels.list[n]->channel) {
                mn = user->channels.list[n];
                break;
@@ -701,7 +724,13 @@ DEFINE_LIST(serverList, struct server*)
 static void
 hash_cleanup(void)
 {
+    dict_iterator_t it, next;
+
     DelServer(self, 0, NULL);
+    for (it = dict_first(channels); it; it = next) {
+        next = iter_next(it);
+        DelChannel(iter_data(it));
+    }
     dict_delete(channels);
     dict_delete(clients);
     dict_delete(servers);