Added back missing comment to example config

[irc/evilnet/x3.git] / src / hash.c

diff --git a/src/hash.c b/src/hash.c
index 34f508af8413e8814da194fede9d843b5a645dce..6e1005ff150f80b1851e0c88ffd3d7e98571ce9e 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,7 +1,7 @@
 /* hash.c - IRC network state database
  * Copyright 2000-2004 srvx Development Team
  *
- * This file is part of srvx.
+ * This file is part of x3.
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -148,7 +148,7 @@ ReintroduceUser(struct userNode *user)
        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);
         }
     }
@@ -225,7 +225,7 @@ call_account_func(struct userNode *user, const char *stamp)
 }
 
 void
-StampUser(struct userNode *user, const char *stamp)
+StampUser(struct userNode *user, const char *stamp, time_t timestamp)
 {
 #ifdef WITH_PROTOCOL_P10
     /* The P10 protocol says we can't stamp users who already
@@ -234,7 +234,7 @@ StampUser(struct userNode *user, const char *stamp)
         return;
 #endif
 
-    irc_account(user, stamp);
+    irc_account(user, stamp, timestamp);
     user->modes |= FLAGS_STAMPED;
 }
 
@@ -333,13 +333,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++;
             }
         }
         assert(argc == change->argc);
-        change->args[0].member->modes &= ~MODE_CHANOP;
-        mod_chanmode_announce(change->args[0].member->user, cNode, change);
+        change->args[0].u.member->modes &= ~MODE_CHANOP;
+        mod_chanmode_announce(change->args[0].u.member->user, cNode, change);
         mod_chanmode_free(change);
     }
 }
@@ -503,7 +503,8 @@ AddChannelUser(struct userNode *user, struct chanNode* channel)
        modeList_append(&channel->members, mNode);
        modeList_append(&user->channels, mNode);
 
-        if (channel->members.used == 1)
+        if (channel->members.used == 1
+            && !(channel->modes & MODE_REGISTERED))
             mNode->modes |= MODE_CHANOP;
 
         for (n=0; n<jf_used; n++) {
@@ -691,7 +692,7 @@ reg_topic_func(topic_func_t handler)
 }
 
 void
-SetChannelTopic(struct chanNode *channel, struct userNode *user, const char *topic, int announce)
+SetChannelTopic(struct chanNode *channel, struct userNode *service, struct userNode *user, const char *topic, int announce)
 {
     unsigned int n;
     struct modeNode *mn;
@@ -712,7 +713,7 @@ SetChannelTopic(struct chanNode *channel, struct userNode *user, const char *top
     if (announce) {
        /* We don't really care if a local user messes with the topic,
          * so don't call the tf_list functions. */
-       irc_topic(user, channel, topic);
+       irc_topic(service, user, channel, topic);
     } else {
        for (n=0; n<tf_used; n++)
            if (tf_list[n](user, channel, old_topic))
@@ -731,8 +732,14 @@ GetUserMode(struct chanNode *channel, struct userNode *user)
 {
     unsigned int n;
     struct modeNode *mn = NULL;
+
+    verify(channel);
+    verify(channel->members.list);
+    verify(user);
+    verify(user->channels.list);
     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;
@@ -740,6 +747,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;
@@ -749,6 +757,32 @@ GetUserMode(struct chanNode *channel, struct userNode *user)
     return mn;
 }
 
+struct userNode *IsInChannel(struct chanNode *channel, struct userNode *user)
+{
+    unsigned int n;
+
+    verify(channel);
+    verify(channel->members.list);
+    verify(user);
+    verify(user->channels.list);
+    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) {
+                return(user);
+           }
+       }
+    } else {
+       for (n=0; n<user->channels.used; n++) {
+            verify(user->channels.list[n]);
+           if (channel == user->channels.list[n]->channel) {
+                return(user);
+           }
+       }
+    }
+    return NULL;
+}
+
 DEFINE_LIST(userList, struct userNode*)
 DEFINE_LIST(modeList, struct modeNode*)
 DEFINE_LIST(banList, struct banNode*)