Add an asynchronous resolver library.

[srvx.git] / src / hash.c

diff --git a/src/hash.c b/src/hash.c
index fabda0437dc237e77be5e25510154b2d4f4f26e7..f08a3c593b35cbdca1a9bab92f14d08f7ec011ee 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -289,6 +289,8 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned
     unsigned int orig_limit;
     chan_mode_t orig_modes;
     char orig_key[KEYLEN+1];
+    char orig_apass[KEYLEN+1];
+    char orig_upass[KEYLEN+1];
     unsigned int nn, argc;
 
     /* nuke old topic */
@@ -300,6 +302,8 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned
     orig_modes = cNode->modes;
     orig_limit = cNode->limit;
     strcpy(orig_key, cNode->key);
+    strcpy(orig_upass, cNode->upass);
+    strcpy(orig_apass, cNode->apass);
     cNode->modes = 0;
     mod_chanmode(NULL, cNode, modes, modec, 0);
     cNode->timestamp = new_time;
@@ -323,6 +327,8 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned
         change->modes_set = orig_modes;
         change->new_limit = orig_limit;
         strcpy(change->new_key, orig_key);
+        strcpy(change->new_upass, orig_upass);
+        strcpy(change->new_apass, orig_apass);
         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)) {
@@ -359,7 +365,7 @@ AddChannel(const char *name, time_t time_, const char *modes, char *banlist)
         strcpy(cNode->name, name);
         banList_init(&cNode->banlist);
         modeList_init(&cNode->members);
-        mod_chanmode(NULL, cNode, argv, nn, 0);
+        mod_chanmode(NULL, cNode, argv, nn, MCP_FROM_SERVER);
         dict_insert(channels, cNode->name, cNode);
         cNode->timestamp = time_;
         rel_age = 1;
@@ -367,7 +373,7 @@ AddChannel(const char *name, time_t time_, const char *modes, char *banlist)
         wipeout_channel(cNode, time_, argv, nn);
         rel_age = 1;
     } else if (cNode->timestamp == time_) {
-        mod_chanmode(NULL, cNode, argv, nn, 0);
+        mod_chanmode(NULL, cNode, argv, nn, MCP_FROM_SERVER);
         rel_age = 0;
     } else {
         rel_age = -1;
@@ -425,6 +431,7 @@ DelChannel(struct chanNode *channel)
 {
     unsigned int n;
 
+    verify(channel);
     dict_remove(channels, channel->name);
 
     if (channel->members.used || channel->locks) {
@@ -433,7 +440,7 @@ DelChannel(struct chanNode *channel)
 
     /* go through all channel members and delete them from the channel */
     for (n=channel->members.used; n>0; )
-       DelChannelUser(channel->members.list[--n]->user, channel, false, 1);
+       DelChannelUser(channel->members.list[--n]->user, channel, NULL, 1);
 
     /* delete all channel bans */
     for (n=channel->banlist.used; n>0; )
@@ -464,6 +471,7 @@ AddChannelUser(struct userNode *user, struct chanNode* channel)
        mNode->channel = channel;
        mNode->user = user;
        mNode->modes = 0;
+        mNode->oplevel = -1;
         mNode->idle_since = now;
 
        /* Add modeNode to channel and to user.
@@ -473,7 +481,9 @@ 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)
+            && !(channel->modes & MODE_APASS))
             mNode->modes |= MODE_CHANOP;
 
         for (n=0; n<jf_used; n++) {
@@ -540,7 +550,7 @@ DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reas
     struct modeNode* mNode;
     unsigned int n;
 
-    if (reason)
+    if (IsLocal(user) && reason)
         irc_part(user, channel, reason);
 
     mNode = GetUserMode(channel, user);
@@ -562,7 +572,9 @@ DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reas
     /* free memory */
     free(mNode);
 
-    if (!deleting && !channel->members.used && !channel->locks && !(channel->modes & MODE_REGISTERED))
+    /* A single check for APASS only should be enough here */
+    if (!deleting && !channel->members.used && !channel->locks 
+        && !(channel->modes & MODE_REGISTERED) && !(channel->modes & MODE_APASS))
         DelChannel(channel);
 }
 
@@ -691,8 +703,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;
@@ -700,6 +718,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;