X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/d76ed9a966ee3d955c8ef00ecc02e643c2005e2e..d9d33535b1c4723eaad2f4a684706bfd4ba57641:/src/hash.c diff --git a/src/hash.c b/src/hash.c index 439b68d..ebf2d9a 100644 --- a/src/hash.c +++ b/src/hash.c @@ -1,9 +1,9 @@ /* 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 + * x3 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. @@ -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; } @@ -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; @@ -309,12 +313,18 @@ wipeout_channel(struct chanNode *cNode, time_t new_time, char **modes, unsigned free(cNode->banlist.list[nn]); cNode->banlist.used = 0; + /* remove our old exe,[t list, replace it with the new one */ + for (nn=0; nnexemptlist.used; nn++) + free(cNode->exemptlist.list[nn]); + cNode->exemptlist.used = 0; + /* 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)) argc++; } + if (argc) { struct mod_chanmode *change; @@ -323,23 +333,25 @@ 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)) { 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); } } struct chanNode * -AddChannel(const char *name, time_t time_, const char *modes, char *banlist) +AddChannel(const char *name, time_t time_, const char *modes, char *banlist, char *exemptlist) { struct chanNode *cNode; char new_modes[MAXLEN], *argv[MAXNUMPARAMS]; @@ -358,8 +370,9 @@ AddChannel(const char *name, time_t time_, const char *modes, char *banlist) cNode = calloc(1, sizeof(*cNode) + strlen(name)); strcpy(cNode->name, name); banList_init(&cNode->banlist); + exemptList_init(&cNode->exemptlist); 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 +380,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; @@ -399,6 +412,23 @@ AddChannel(const char *name, time_t time_, const char *modes, char *banlist) } } + /* go through list of exempts and add each one */ + if (exemptlist && (rel_age >= 0)) { + for (nn=0; exemptlist[nn];) { + char *exempt = exemptlist + nn; + struct exemptNode *en; + while (exemptlist[nn] != ' ' && exemptlist[nn]) + nn++; + while (exemptlist[nn] == ' ') + exemptlist[nn++] = 0; + en = calloc(1, sizeof(*en)); + safestrncpy(en->exempt, exempt, sizeof(en->exempt)); + safestrncpy(en->who, "", sizeof(en->who)); + en->set = now; + exemptList_append(&cNode->exemptlist, en); + } + } + return cNode; } @@ -440,11 +470,17 @@ DelChannel(struct chanNode *channel) free(channel->banlist.list[--n]); channel->banlist.used = 0; + /* delete all channel exempts */ + for (n=channel->exemptlist.used; n>0; ) + free(channel->exemptlist.list[--n]); + channel->exemptlist.used = 0; + for (n=0; nmembers); banList_clean(&channel->banlist); + exemptList_clean(&channel->exemptlist); free(channel); } @@ -464,6 +500,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 +510,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; nmembers.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); } +static kick_func_t *kf_list; +static unsigned int kf_size = 0, kf_used = 0; + void KickChannelUser(struct userNode* target, struct chanNode* channel, struct userNode *kicker, const char *why) { + unsigned int n; + if (!target || !channel || IsService(target) || !GetUserMode(channel, target)) return; + + /* This may break things, but lets see.. -Rubin */ + for (n=0; nexemptlist.used; n++) + if (match_ircglobs(channel->exemptlist.list[n]->exempt, exempt)) + return 1; + return 0; +} + static topic_func_t *tf_list; static unsigned int tf_size = 0, tf_used = 0; @@ -651,7 +709,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; @@ -672,7 +730,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; nmembers.list); + verify(user); + verify(user->channels.list); if (channel->members.used < user->channels.used) { for (n=0; nmembers.used; n++) { + verify(channel->members.list[n]); if (user == channel->members.list[n]->user) { mn = channel->members.list[n]; break; @@ -700,6 +764,7 @@ GetUserMode(struct chanNode *channel, struct userNode *user) } } else { for (n=0; nchannels.used; n++) { + verify(user->channels.list[n]); if (channel == user->channels.list[n]->channel) { mn = user->channels.list[n]; break; @@ -709,9 +774,36 @@ 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; nmembers.used; n++) { + verify(channel->members.list[n]); + if (user == channel->members.list[n]->user) { + return(user); + } + } + } else { + for (n=0; nchannels.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*) +DEFINE_LIST(exemptList, struct exemptNode*) DEFINE_LIST(channelList, struct chanNode*) DEFINE_LIST(serverList, struct server*)