/* 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.
}
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
return;
#endif
- irc_account(user, stamp);
+ irc_account(user, stamp, timestamp);
user->modes |= FLAGS_STAMPED;
}
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 */
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;
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)) {
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;
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;
mNode->channel = channel;
mNode->user = user;
mNode->modes = 0;
+ mNode->oplevel = -1;
mNode->idle_since = now;
/* Add modeNode to channel and to user.
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++) {
/* 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);
}
+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; n<kf_used; n++)
+ kf_list[n](kicker, target, channel);
+
/* don't remove them from the channel, since the server will send a PART */
irc_kick(kicker, target, channel, why);
}
}
-static kick_func_t *kf_list;
-static unsigned int kf_size = 0, kf_used = 0;
-
void
reg_kick_func(kick_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;
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))
{
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;
}
} 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;
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*)