* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: m_join.c 3494 2007-05-27 13:07:27Z jilles $
*/
#include "stdinc.h"
#include "channel.h"
#include "client.h"
-#include "common.h"
#include "hash.h"
#include "match.h"
#include "ircd.h"
#include "chmode.h"
#include "ratelimit.h"
#include "s_assert.h"
+#include "hook.h"
+
+static const char join_desc[] = "Provides the JOIN and TS6 SJOIN commands to facilitate joining and creating channels";
-static int m_join(struct Client *, struct Client *, int, const char **);
-static int ms_join(struct Client *, struct Client *, int, const char **);
-static int ms_sjoin(struct Client *, struct Client *, int, const char **);
+static void m_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_sjoin(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static int h_can_create_channel;
static int h_channel_join;
+static int h_channel_lowerts;
struct Message join_msgtab = {
- "JOIN", 0, 0, 0, MFLG_SLOW,
+ "JOIN", 0, 0, 0, 0,
{mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}}
};
struct Message sjoin_msgtab = {
- "SJOIN", 0, 0, 0, MFLG_SLOW,
+ "SJOIN", 0, 0, 0, 0,
{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore}
};
mapi_hlist_av1 join_hlist[] = {
{ "can_create_channel", &h_can_create_channel },
{ "channel_join", &h_channel_join },
+ { "channel_lowerts", &h_channel_lowerts },
{ NULL, NULL },
};
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $");
+DECLARE_MODULE_AV2(join, NULL, NULL, join_clist, join_hlist, NULL, NULL, NULL, join_desc);
static void do_join_0(struct Client *client_p, struct Client *source_p);
-static int check_channel_name_loc(struct Client *source_p, const char *name);
+static bool check_channel_name_loc(struct Client *source_p, const char *name);
static void send_join_error(struct Client *source_p, int numeric, const char *name);
-static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
+static char *set_final_mode(char *mbuf, char *parabuf, struct Mode *mode, struct Mode *oldmode);
static void remove_our_modes(struct Channel *chptr, struct Client *source_p);
static void remove_ban_list(struct Channel *chptr, struct Client *source_p,
rb_dlink_list * list, char c, int mems);
-static char modebuf[MODEBUFLEN];
-static char parabuf[MODEBUFLEN];
-static const char *para[MAXMODEPARAMS];
-static char *mbuf;
-static int pargs;
-
/* Check what we will forward to, without sending any notices to the user
* -- jilles
*/
{
if (next == NULL)
return NULL;
+
chptr = find_channel(next);
/* Can only forward to existing channels */
if (chptr == NULL)
return NULL;
- /* Already on there, show original error message */
+ /* Already on there... but don't send the original reason for
+ * being unable to join. It isn't their fault they're already
+ * on the channel, and it looks hostile otherwise.
+ * --Elizafox
+ */
if (IsMember(source_p, chptr))
+ {
+ *err = ERR_USERONCHANNEL; /* I'm borrowing this for now. --Elizafox */
return NULL;
+ }
/* Juped. Sending a warning notice would be unfair */
if (hash_find_resv(chptr->chname))
return NULL;
/* Don't forward to +Q channel */
if (chptr->mode.mode & MODE_DISFORWARD)
return NULL;
+
i = can_join(source_p, chptr, key, &next);
if (i == 0)
return chptr;
* parv[1] = channel
* parv[2] = channel password (key)
*/
-static int
-m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static char jbuf[BUFSIZE];
struct Channel *chptr = NULL, *chptr2 = NULL;
/* join 0 parts all channels */
if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist)
{
- (void) strcpy(jbuf, "0");
+ rb_strlcpy(jbuf, "0", sizeof(jbuf));
continue;
}
- /* check it begins with # or &, and local chans are disabled */
- else if(!IsChannelName(name) ||
- ( ConfigChannel.disable_local_channels && name[0] == '&'))
+ /* check it begins with a valid channel prefix per policy. */
+ else if (!IsChannelName(name))
{
sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
form_str(ERR_NOSUCHCHANNEL), name);
continue;
}
- if(splitmode && !IsOper(source_p) && (*name != '&') &&
+ if(splitmode && !IsOperGeneral(source_p) && (*name != '&') &&
ConfigChannel.no_join_on_split)
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
continue;
}
- if(splitmode && !IsOper(source_p) && (*name != '&') &&
+ if(splitmode && !IsOperGeneral(source_p) && (*name != '&') &&
ConfigChannel.no_create_on_split)
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
}
/* 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((chptr2 = check_forward(source_p, chptr, key, &i)) == NULL)
{
/* might be wrong, but is there any other better location for such?
* see extensions/chm_operonly.c for other comments on this
chptr = chptr2;
if(flags == 0 &&
- !IsOper(source_p) && !IsExemptSpambot(source_p))
+ !IsOperGeneral(source_p) && !IsExemptSpambot(source_p))
check_spambot_warning(source_p, name);
/* add the user to the channel */
chptr->mode.mode |= ConfigChannel.autochanmodes;
modes = channel_modes(chptr, &me);
- sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
+ sendto_channel_local(&me, ONLY_CHANOPS, chptr, ":%s MODE %s %s",
me.name, chptr->chname, modes);
sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
me.name, source_p->name, chptr->chname,
chptr->topic_info,
- (unsigned long)chptr->topic_time);
+ (long long)chptr->topic_time);
}
channel_member_names(chptr, source_p, 1);
hook_info.key = key;
call_hook(h_channel_join, &hook_info);
}
-
- return 0;
}
/*
* parv[3] = "+", formerly channel modes but now unused
* alternatively, a single "0" parameter parts all channels
*/
-static int
-ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
+ static char modebuf[MODEBUFLEN];
+ static char parabuf[MODEBUFLEN];
struct Channel *chptr;
static struct Mode mode;
time_t oldts;
time_t newts;
- int isnew;
- int keep_our_modes = YES;
+ bool isnew;
+ bool keep_our_modes = true;
rb_dlink_node *ptr, *next_ptr;
+ char *mbuf;
/* special case for join 0 */
if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2)
{
do_join_0(client_p, source_p);
- return 0;
+ return;
}
if(parc < 4)
- return 0;
+ return;
if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
- return 0;
+ return;
/* joins for local channels cant happen. */
if(parv[2][0] == '&')
- return 0;
+ return;
mbuf = modebuf;
mode.key[0] = mode.forward[0] = '\0';
mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
- return 0;
+ return;
newts = atol(parv[1]);
oldts = chptr->channelts;
-#ifdef IGNORE_BOGUS_TS
- if(newts < 800000000)
- {
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "*** Bogus TS %ld on %s ignored from %s",
- (long) newts, chptr->chname, client_p->name);
- newts = (oldts == 0) ? oldts : 800000000;
- }
-#else
/* making a channel TS0 */
if(!isnew && !newts && oldts)
{
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(&me, ALL_MEMBERS, chptr,
":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to 0",
me.name, chptr->chname, chptr->chname, (long) oldts);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Server %s changing TS on %s from %ld to 0",
source_p->name, chptr->chname, (long) oldts);
}
-#endif
if(isnew)
chptr->channelts = newts;
;
else if(newts < oldts)
{
- keep_our_modes = NO;
+ keep_our_modes = false;
chptr->channelts = newts;
}
/* Lost the TS, other side wins, so remove modes on this side */
if(!keep_our_modes)
{
- set_final_mode(&mode, &chptr->mode);
+ mbuf = set_final_mode(mbuf, parabuf, &mode, &chptr->mode);
chptr->mode = mode;
remove_our_modes(chptr, source_p);
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
}
/* If setting -j, clear join throttle state -- jilles */
chptr->join_count = chptr->join_delta = 0;
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(&me, ALL_MEMBERS, chptr,
":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
me.name, chptr->chname, chptr->chname,
(long) oldts, (long) newts);
* capitalization timestamped like modes are -- jilles */
strcpy(chptr->chname, parv[2]);
if(*modebuf != '\0')
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(source_p->servptr, ALL_MEMBERS, chptr,
":%s MODE %s %s %s",
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);
+ set_channel_mlock(client_p, source_p, chptr, NULL, false);
+
+ hook_data_channel hookdata;
+ hookdata.client = source_p;
+ hookdata.chptr = chptr;
+
+ call_hook(h_channel_lowerts, &hookdata);
}
if(!IsMember(source_p, chptr))
sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
":%s JOIN %ld %s +",
source_p->id, (long) chptr->channelts, chptr->chname);
- return 0;
}
-static int
-ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
+ static char modebuf[MODEBUFLEN];
+ static char parabuf[MODEBUFLEN];
static char buf_uid[BUFSIZE];
static const char empty_modes[] = "0";
struct Channel *chptr;
static struct Mode mode, *oldmode;
const char *modes;
int args = 0;
- int keep_our_modes = 1;
- int keep_new_modes = 1;
+ bool keep_our_modes = true;
+ bool keep_new_modes = true;
int fl;
- int isnew;
+ bool isnew;
int mlen_uid;
int len_uid;
int len;
int i, joinc = 0, timeslice = 0;
static char empty[] = "";
rb_dlink_node *ptr, *next_ptr;
+ char *mbuf;
+ int pargs;
+ const char *para[MAXMODEPARAMS];
if(parc < 5)
- return 0;
+ return;
if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
- return 0;
+ return;
/* SJOIN's for local channels can't happen. */
if(*parv[2] == '&')
- return 0;
+ return;
modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0';
pargs = mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
rb_strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward));
args++;
if(parc < 5 + args)
- return 0;
+ return;
break;
case 'j':
sscanf(parv[4 + args], "%d:%d", &joinc, ×lice);
mode.join_num = joinc;
mode.join_time = timeslice;
if(parc < 5 + args)
- return 0;
+ return;
break;
case 'k':
rb_strlcpy(mode.key, parv[4 + args], sizeof(mode.key));
args++;
if(parc < 5 + args)
- return 0;
+ return;
break;
case 'l':
mode.limit = atoi(parv[4 + args]);
args++;
if(parc < 5 + args)
- return 0;
+ return;
break;
default:
if(chmode_flags[(int) *s] != 0)
s = "";
if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
- return 0; /* channel name too long? */
+ return; /* channel name too long? */
oldts = chptr->channelts;
oldmode = &chptr->mode;
-#ifdef IGNORE_BOGUS_TS
- if(newts < 800000000)
- {
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "*** Bogus TS %ld on %s ignored from %s",
- (long) newts, chptr->chname, client_p->name);
-
- newts = (oldts == 0) ? oldts : 800000000;
- }
-#else
if(!isnew && !newts && oldts)
{
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(&me, ALL_MEMBERS, chptr,
":%s NOTICE %s :*** Notice -- TS for %s "
"changed from %ld to 0",
me.name, chptr->chname, chptr->chname, (long) oldts);
"Server %s changing TS on %s from %ld to 0",
source_p->name, chptr->chname, (long) oldts);
}
-#endif
if(isnew)
chptr->channelts = newts;
{
/* Channel was emptied, create a new one */
if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
- return 0; /* oops! */
+ return; /* oops! */
oldmode = &chptr->mode;
}
}
- keep_our_modes = NO;
+ keep_our_modes = false;
chptr->channelts = newts;
}
else
- keep_new_modes = NO;
+ keep_new_modes = false;
if(!keep_new_modes)
mode = *oldmode;
if(oldmode->limit > mode.limit)
mode.limit = oldmode->limit;
if(strcmp(mode.key, oldmode->key) < 0)
- strcpy(mode.key, oldmode->key);
+ rb_strlcpy(mode.key, oldmode->key, sizeof(mode.key));
if(oldmode->join_num > mode.join_num ||
(oldmode->join_num == mode.join_num &&
oldmode->join_time > mode.join_time))
mode.join_time = oldmode->join_time;
}
if(irccmp(mode.forward, oldmode->forward) < 0)
- strcpy(mode.forward, oldmode->forward);
+ rb_strlcpy(mode.forward, oldmode->forward, sizeof(mode.forward));
}
else
{
chptr->join_count = chptr->join_delta = 0;
}
- set_final_mode(&mode, oldmode);
+ mbuf = set_final_mode(mbuf, parabuf, &mode, oldmode);
chptr->mode = mode;
/* Lost the TS, other side wins, so remove modes on this side */
'q', ALL_MEMBERS);
chptr->bants++;
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(&me, ALL_MEMBERS, chptr,
":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
me.name, chptr->chname, chptr->chname,
(long) oldts, (long) newts);
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);
+ set_channel_mlock(client_p, source_p, chptr, NULL, false);
}
if(*modebuf != '\0')
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
+ sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
fakesource_p->name, chptr->chname, modebuf, parabuf);
*modebuf = *parabuf = '\0';
if(pargs >= MAXMODEPARAMS)
{
*mbuf = '\0';
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
fakesource_p->name, chptr->chname,
modebuf,
if(pargs >= MAXMODEPARAMS)
{
*mbuf = '\0';
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
fakesource_p->name,
chptr->chname,
*mbuf = '\0';
if(pargs)
{
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
fakesource_p->name, chptr->chname, modebuf,
para[0], CheckEmpty(para[1]),
{
destroy_channel(chptr);
- return 0;
+ return;
}
/* Keep the colon if we're sending an SJOIN without nicks -- jilles */
}
sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
-
- return 0;
}
/*
while((ptr = source_p->user->channel.head))
{
if(MyConnect(source_p) &&
- !IsOper(source_p) && !IsExemptSpambot(source_p))
+ !IsOperGeneral(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",
+ sendto_channel_local(source_p, ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
source_p->name,
source_p->username, source_p->host, chptr->chname);
remove_user_from_channel(msptr);
}
}
-static int
+static bool
check_channel_name_loc(struct Client *source_p, const char *name)
{
const char *p;
s_assert(name != NULL);
if(EmptyString(name))
- return 0;
+ return false;
- if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
+ if(ConfigFileEntry.disable_fake_channels && !IsOperGeneral(source_p))
{
for(p = name; *p; ++p)
{
if(!IsChanChar(*p) || IsFakeChanChar(*p))
- return 0;
+ return false;
}
}
else
for(p = name; *p; ++p)
{
if(!IsChanChar(*p))
- return 0;
+ return false;
}
}
{
for(p = name; *p; ++p)
if(*p < 33 || *p > 126)
- return 0;
+ return false;
}
- return 1;
+ return true;
}
/* send_join_error()
NORMAL_NUMERIC(ERR_NEEDREGGEDNICK);
NORMAL_NUMERIC(ERR_THROTTLE);
+ case ERR_USERONCHANNEL:
+ sendto_one_numeric(source_p, ERR_USERONCHANNEL,
+ form_str(ERR_USERONCHANNEL), source_p->name, name);
+ break;
default:
sendto_one_numeric(source_p, numeric,
"%s :Cannot join channel", name);
}
}
-static void
-set_final_mode(struct Mode *mode, struct Mode *oldmode)
+static char *
+set_final_mode(char *mbuf, char *parabuf, struct Mode *mode, struct Mode *oldmode)
{
int dir = MODE_QUERY;
char *pbuf = parabuf;
pbuf += len;
}
*mbuf = '\0';
+
+ return mbuf;
}
/*
char *lpara[MAXMODEPARAMS];
int count = 0;
int i;
+ char *mbuf = lmodebuf;
- mbuf = lmodebuf;
*mbuf++ = '-';
for(i = 0; i < MAXMODEPARAMS; i++)
if(count >= MAXMODEPARAMS)
{
*mbuf = '\0';
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(source_p, ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
source_p->name, chptr->chname,
lmodebuf, lpara[0], lpara[1],
if(count >= MAXMODEPARAMS)
{
*mbuf = '\0';
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(source_p, ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
source_p->name, chptr->chname, lmodebuf,
lpara[0], lpara[1], lpara[2], lpara[3]);
if(count != 0)
{
*mbuf = '\0';
- sendto_channel_local(ALL_MEMBERS, chptr,
+ sendto_channel_local(source_p, ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
source_p->name, chptr->chname, lmodebuf,
EmptyString(lpara[0]) ? "" : lpara[0],
char *pbuf;
int count = 0;
int cur_len, mlen, plen;
+ char *mbuf;
pbuf = lparabuf;
*mbuf = '\0';
*(pbuf - 1) = '\0';
- sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
+ sendto_channel_local(source_p, mems, chptr, "%s %s", lmodebuf, lparabuf);
cur_len = mlen;
mbuf = lmodebuf + mlen;
*mbuf = '\0';
*(pbuf - 1) = '\0';
- sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
+ sendto_channel_local(source_p, mems, chptr, "%s %s", lmodebuf, lparabuf);
list->head = list->tail = NULL;
list->length = 0;
projects / solanum.git / blobdiff