*/
static struct Channel *
check_forward(struct Client *source_p, struct Channel *chptr,
- char *key)
+ char *key, int *err)
{
int depth = 0, i;
+ char *next = NULL;
+
+ /* The caller (m_join) is only interested in the reason
+ * for the original channel.
+ */
+ if ((*err = can_join(source_p, chptr, key, &next)) == 0)
+ return chptr;
/* User is +Q */
if (IsNoForward(source_p))
while (depth < 16)
{
- chptr = find_channel(chptr->mode.forward);
+ chptr = find_channel(next);
/* Can only forward to existing channels */
if (chptr == NULL)
return NULL;
/* Don't forward to +Q channel */
if (chptr->mode.mode & MODE_DISFORWARD)
return NULL;
- i = can_join(source_p, chptr, key);
+ i = can_join(source_p, chptr, key, &next);
if (i == 0)
return chptr;
- if (i != ERR_INVITEONLYCHAN && i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_CHANNELISFULL)
+ if (next == NULL)
return NULL;
depth++;
}
m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static char jbuf[BUFSIZE];
- struct Channel *chptr = NULL;
+ struct Channel *chptr = NULL, *chptr2 = NULL;
struct ConfItem *aconf;
char *name;
char *key = NULL;
char *p = NULL, *p2 = NULL;
char *chanlist;
char *mykey;
- int successful_join_count = 0; /* Number of channels successfully joined */
jbuf[0] = '\0';
}
/* check it begins with # or &, and local chans are disabled */
- else if(!IsChannelName(name))
+ else if(!IsChannelName(name) ||
+ ( ConfigChannel.disable_local_channels && name[0] == '&'))
{
sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
form_str(ERR_NOSUCHCHANNEL), name);
{
sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
me.name, source_p->name, name);
- if(successful_join_count)
- source_p->localClient->last_join_time = rb_current_time();
- return 0;
+ continue;
}
- if(flags == 0) /* if channel doesn't exist, don't penalize */
- successful_join_count++;
-
if(chptr == NULL) /* If I already have a chptr, no point doing this */
{
chptr = get_or_create_channel(source_p, name, NULL);
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
me.name, source_p->name, name);
- if(successful_join_count > 0)
- successful_join_count--;
continue;
}
}
- if(!IsOper(source_p) && !IsExemptSpambot(source_p))
- check_spambot_warning(source_p, name);
-
- /* can_join checks for +i key, bans etc */
- if((i = can_join(source_p, chptr, key)))
+ /* If check_forward returns NULL, they couldn't join and there wasn't a usable forward channel. */
+ if(!(chptr2 = check_forward(source_p, chptr, key, &i)))
{
- if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
- (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
- {
- /* might be wrong, but is there any other better location for such?
- * see extensions/chm_operonly.c for other comments on this
- * -- dwr
- */
- if(i != ERR_CUSTOM)
- sendto_one(source_p, form_str(i), me.name, source_p->name, name);
-
- if(successful_join_count > 0)
- successful_join_count--;
- continue;
- }
+ /* might be wrong, but is there any other better location for such?
+ * see extensions/chm_operonly.c for other comments on this
+ * -- dwr
+ */
+ if(i != ERR_CUSTOM)
+ sendto_one(source_p, form_str(i), me.name, source_p->name, name);
- sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
+ continue;
}
+ else if(chptr != chptr2)
+ sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr2->chname);
+
+ chptr = chptr2;
+
+ if(flags == 0 &&
+ !IsOper(source_p) && !IsExemptSpambot(source_p))
+ check_spambot_warning(source_p, name);
/* add the user to the channel */
add_user_to_channel(chptr, source_p, flags);
/* we send the user their join here, because we could have to
* send a mode out next.
*/
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
- source_p->name,
- source_p->username, source_p->host, chptr->chname);
+ send_channel_join(chptr, source_p);
/* its a new channel, set +nt and burst. */
if(flags & CHFL_CHANOP)
channel_member_names(chptr, source_p, 1);
- if(successful_join_count)
- source_p->localClient->last_join_time = rb_current_time();
-
hook_info.client = source_p;
hook_info.chptr = chptr;
hook_info.key = key;
source_p->servptr->name,
chptr->chname, modebuf, parabuf);
*modebuf = *parabuf = '\0';
+
+ /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+ set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
}
if(!IsMember(source_p, chptr))
chptr->join_delta = rb_current_time();
}
chptr->join_count++;
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
- source_p->name, source_p->username,
- source_p->host, chptr->chname);
+ send_channel_join(chptr, source_p);
}
sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
{
/* If configured, kick people trying to join +i/+k
* channels by recreating them on split servers.
- * Don't kick if the source has sent EOB (services
- * deopping everyone by TS-1 SJOIN).
+ * If the source has sent EOB, assume this is some
+ * sort of hack by services. If cmode +i is set,
+ * services can send kicks if needed; if the key
+ * differs, services cannot kick in a race-free
+ * manner so do so here.
* -- jilles */
if (ConfigChannel.kick_on_split_riding &&
- !HasSentEob(source_p) &&
- ((mode.mode & MODE_INVITEONLY) ||
+ ((!HasSentEob(source_p) &&
+ mode.mode & MODE_INVITEONLY) ||
(mode.key[0] != 0 && irccmp(mode.key, oldmode->key) != 0)))
{
struct membership *msptr;
/* Update capitalization in channel name, this makes the
* capitalization timestamped like modes are -- jilles */
strcpy(chptr->chname, parv[2]);
+
+ /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+ set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
}
if(*modebuf != '\0')
if(!IsMember(target_p, chptr))
{
add_user_to_channel(chptr, target_p, fl);
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
- target_p->name,
- target_p->username, target_p->host, parv[2]);
+ send_channel_join(chptr, target_p);
joins++;
}
* output - NONE
* side effects - Use has decided to join 0. This is legacy
* from the days when channels were numbers not names. *sigh*
- * There is a bunch of evilness necessary here due to
- * anti spambot code.
*/
static void
do_join_0(struct Client *client_p, struct Client *source_p)
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
- if(source_p->user->channel.head && MyConnect(source_p) &&
- !IsOper(source_p) && !IsExemptSpambot(source_p))
- check_spambot_warning(source_p, NULL);
-
while((ptr = source_p->user->channel.head))
{
+ if(MyConnect(source_p) &&
+ !IsOper(source_p) && !IsExemptSpambot(source_p))
+ check_spambot_warning(source_p, NULL);
+
msptr = ptr->data;
chptr = msptr->chptr;
sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
static int
check_channel_name_loc(struct Client *source_p, const char *name)
{
+ const char *p;
+
s_assert(name != NULL);
if(EmptyString(name))
return 0;
if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
{
- for(; *name; ++name)
+ for(p = name; *p; ++p)
{
- if(!IsChanChar(*name) || IsFakeChanChar(*name))
+ if(!IsChanChar(*p) || IsFakeChanChar(*p))
return 0;
}
}
else
{
- for(; *name; ++name)
+ for(p = name; *p; ++p)
{
- if(!IsChanChar(*name))
+ if(!IsChanChar(*p))
return 0;
}
}
+ if(ConfigChannel.only_ascii_channels)
+ {
+ for(p = name; *p; ++p)
+ if(*p < 33 || *p > 126)
+ return 0;
+ }
+
return 1;
}
len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
pbuf += len;
}
- if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward)
+ if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) &&
+ ConfigChannel.use_forward)
{
if(dir != MODE_ADD)
{
projects / solanum.git / blobdiff