X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fhash.c;h=4fa1e913f11e93826aaddf309516464bf8b011a9;hb=4a2c9aa9ab119a212d78c6a3a73261de56800251;hp=92067ed4132060b020251461e39eba15963e2de5;hpb=96f2ccb2f360c0d2cee1f1f35d7993bef03ff6bf;p=srvx.git diff --git a/src/hash.c b/src/hash.c index 92067ed..4fa1e91 100644 --- 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" @@ -26,7 +28,7 @@ dict_t channels; dict_t clients; dict_t servers; unsigned int max_clients, invis_clients; -time_t max_clients_time; +unsigned long max_clients_time; struct userList curr_opers; static void hash_cleanup(void); @@ -40,6 +42,18 @@ void init_structs(void) reg_exit_func(hash_cleanup); } +int userList_contains(struct userList *list, struct userNode *user) +{ + unsigned int ii; + + for (ii = 0; ii < list->used; ++ii) { + if (user == list->list[ii]) { + return 1; + } + } + return 0; +} + server_link_func_t *slf_list; unsigned int slf_size = 0, slf_used = 0; @@ -47,13 +61,13 @@ void reg_server_link_func(server_link_func_t handler) { if (slf_used == slf_size) { - if (slf_size) { - slf_size <<= 1; - slf_list = realloc(slf_list, slf_size*sizeof(server_link_func_t)); - } else { - slf_size = 8; - slf_list = malloc(slf_size*sizeof(server_link_func_t)); - } + if (slf_size) { + slf_size <<= 1; + slf_list = realloc(slf_list, slf_size*sizeof(server_link_func_t)); + } else { + slf_size = 8; + slf_list = malloc(slf_size*sizeof(server_link_func_t)); + } } slf_list[slf_used++] = handler; } @@ -71,13 +85,13 @@ void reg_new_user_func(new_user_func_t handler) { if (nuf_used == nuf_size) { - if (nuf_size) { - nuf_size <<= 1; - nuf_list = realloc(nuf_list, nuf_size*sizeof(new_user_func_t)); - } else { - nuf_size = 8; - nuf_list = malloc(nuf_size*sizeof(new_user_func_t)); - } + if (nuf_size) { + nuf_size <<= 1; + nuf_list = realloc(nuf_list, nuf_size*sizeof(new_user_func_t)); + } else { + nuf_size = 8; + nuf_list = malloc(nuf_size*sizeof(new_user_func_t)); + } } nuf_list[nuf_used++] = handler; } @@ -108,13 +122,13 @@ void reg_del_user_func(del_user_func_t handler) { if (duf_used == duf_size) { - if (duf_size) { - duf_size <<= 1; - duf_list = realloc(duf_list, duf_size*sizeof(del_user_func_t)); - } else { - duf_size = 8; - duf_list = malloc(duf_size*sizeof(del_user_func_t)); - } + if (duf_size) { + duf_size <<= 1; + duf_list = realloc(duf_list, duf_size*sizeof(del_user_func_t)); + } else { + duf_size = 8; + duf_list = malloc(duf_size*sizeof(del_user_func_t)); + } } duf_list[duf_used++] = handler; } @@ -137,16 +151,16 @@ ReintroduceUser(struct userNode *user) { struct mod_chanmode change; 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); + 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 +250,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; @@ -243,13 +265,13 @@ void reg_new_channel_func(new_channel_func_t handler) { if (ncf_used == ncf_size) { - if (ncf_size) { - ncf_size <<= 1; - ncf_list = realloc(ncf_list, ncf_size*sizeof(ncf_list[0])); - } else { - ncf_size = 8; - ncf_list = malloc(ncf_size*sizeof(ncf_list[0])); - } + if (ncf_size) { + ncf_size <<= 1; + ncf_list = realloc(ncf_list, ncf_size*sizeof(ncf_list[0])); + } else { + ncf_size = 8; + ncf_list = malloc(ncf_size*sizeof(ncf_list[0])); + } } ncf_list[ncf_used++] = handler; } @@ -261,13 +283,13 @@ void reg_join_func(join_func_t handler) { if (jf_used == jf_size) { - if (jf_size) { - jf_size <<= 1; - jf_list = realloc(jf_list, jf_size*sizeof(join_func_t)); - } else { - jf_size = 8; - jf_list = malloc(jf_size*sizeof(join_func_t)); - } + if (jf_size) { + jf_size <<= 1; + jf_list = realloc(jf_list, jf_size*sizeof(join_func_t)); + } else { + jf_size = 8; + jf_list = malloc(jf_size*sizeof(join_func_t)); + } } jf_list[jf_used++] = handler; } @@ -275,10 +297,12 @@ reg_join_func(join_func_t handler) int rel_age; static void -wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned int modec) { +wipeout_channel(struct chanNode *cNode, unsigned long new_time, char **modes, unsigned int modec) { 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 */ @@ -290,6 +314,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; @@ -302,36 +328,36 @@ 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; nnmembers.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; 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)) { 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); } } struct chanNode * -AddChannel(const char *name, time_t time_, const char *modes, char *banlist) +AddChannel(const char *name, unsigned long time_, const char *modes, char *banlist) { struct chanNode *cNode; char new_modes[MAXLEN], *argv[MAXNUMPARAMS]; @@ -351,7 +377,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; @@ -359,7 +385,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; @@ -401,13 +427,13 @@ void reg_del_channel_func(del_channel_func_t handler) { if (dcf_used == dcf_size) { - if (dcf_size) { - dcf_size <<= 1; - dcf_list = realloc(dcf_list, dcf_size*sizeof(dcf_list[0])); - } else { - dcf_size = 8; - dcf_list = malloc(dcf_size*sizeof(dcf_list[0])); - } + if (dcf_size) { + dcf_size <<= 1; + dcf_list = realloc(dcf_list, dcf_size*sizeof(dcf_list[0])); + } else { + dcf_size = 8; + dcf_list = malloc(dcf_size*sizeof(dcf_list[0])); + } } dcf_list[dcf_used++] = handler; } @@ -417,6 +443,7 @@ DelChannel(struct chanNode *channel) { unsigned int n; + verify(channel); dict_remove(channels, channel->name); if (channel->members.used || channel->locks) { @@ -425,7 +452,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; ) @@ -443,29 +470,32 @@ DelChannel(struct chanNode *channel) struct modeNode * AddChannelUser(struct userNode *user, struct chanNode* channel) { - struct modeNode *mNode; - unsigned int n; + struct modeNode *mNode; + unsigned int n; - mNode = GetUserMode(channel, user); - if (mNode) + mNode = GetUserMode(channel, user); + if (mNode) return mNode; - mNode = malloc(sizeof(*mNode)); + mNode = malloc(sizeof(*mNode)); - /* set up modeNode */ - mNode->channel = channel; - mNode->user = user; - mNode->modes = 0; + /* set up modeNode */ + mNode->channel = channel; + mNode->user = user; + mNode->modes = 0; + mNode->oplevel = -1; mNode->idle_since = now; - /* Add modeNode to channel and to user. + /* Add modeNode to channel and to user. * We have to do this before calling join funcs in case the * modeNode is manipulated (e.g. chanserv ops the user). */ - modeList_append(&channel->members, mNode); - modeList_append(&user->channels, mNode); + 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; nmembers, mNode); modeList_remove(&user->channels, mNode); - free(mNode); + /* make callbacks */ for (n=0; nmembers.used && !channel->locks) + /* 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); } @@ -566,9 +600,9 @@ KickChannelUser(struct userNode* target, struct chanNode* channel, struct userNo if (IsLocal(target)) { - /* NULL reason because we don't want a PART message to be - sent by DelChannelUser. */ - DelChannelUser(target, channel, NULL, 0); + /* NULL reason because we don't want a PART message to be + sent by DelChannelUser. */ + DelChannelUser(target, channel, NULL, 0); } } @@ -579,13 +613,13 @@ void reg_kick_func(kick_func_t handler) { if (kf_used == kf_size) { - if (kf_size) { - kf_size <<= 1; - kf_list = realloc(kf_list, kf_size*sizeof(kick_func_t)); - } else { - kf_size = 8; - kf_list = malloc(kf_size*sizeof(kick_func_t)); - } + if (kf_size) { + kf_size <<= 1; + kf_list = realloc(kf_list, kf_size*sizeof(kick_func_t)); + } else { + kf_size = 8; + kf_list = malloc(kf_size*sizeof(kick_func_t)); + } } kf_list[kf_used++] = handler; } @@ -604,12 +638,12 @@ ChannelUserKicked(struct userNode* kicker, struct userNode* victim, struct chanN mn->idle_since = now; for (n=0; nbanlist.used; n++) - if (match_ircglobs(channel->banlist.list[n]->ban, ban)) - return 1; + if (match_ircglobs(channel->banlist.list[n]->ban, ban)) + return 1; return 0; } @@ -629,13 +663,13 @@ void reg_topic_func(topic_func_t handler) { if (tf_used == tf_size) { - if (tf_size) { - tf_size <<= 1; - tf_list = realloc(tf_list, tf_size*sizeof(topic_func_t)); - } else { - tf_size = 8; - tf_list = malloc(tf_size*sizeof(topic_func_t)); - } + if (tf_size) { + tf_size <<= 1; + tf_list = realloc(tf_list, tf_size*sizeof(topic_func_t)); + } else { + tf_size = 8; + tf_list = malloc(tf_size*sizeof(topic_func_t)); + } } tf_list[tf_used++] = handler; } @@ -660,12 +694,12 @@ 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, + /* 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(user, channel, topic); } else { - for (n=0; nmembers.list); + verify(user); + verify(user->channels.list); if (channel->members.used < user->channels.used) { - for (n=0; nmembers.used; n++) { - if (user == channel->members.list[n]->user) { - mn = channel->members.list[n]; - break; - } - } + for (n=0; nmembers.used; n++) { + verify(channel->members.list[n]); + if (user == channel->members.list[n]->user) { + mn = channel->members.list[n]; + break; + } + } } else { - for (n=0; nchannels.used; n++) { - if (channel == user->channels.list[n]->channel) { - mn = user->channels.list[n]; - break; - } - } + for (n=0; nchannels.used; n++) { + verify(user->channels.list[n]); + if (channel == user->channels.list[n]->channel) { + mn = user->channels.list[n]; + break; + } + } } return mn; } @@ -708,7 +749,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);