ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/channel.c

Comparing ircd-hybrid/trunk/src/channel.c (file contents):
Revision 5464 by michael, Wed Feb 4 18:20:56 2015 UTC vs.
Revision 7266 by michael, Sat Feb 6 19:02:03 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 31 | Line 31
31		#include "client.h"
32		#include "hash.h"
33		#include "conf.h"
34	+	#include "conf_resv.h"
35		#include "hostmask.h"
36		#include "irc_string.h"
37		#include "ircd.h"
#	Line 41 | Line 42
42		#include "memory.h"
43		#include "mempool.h"
44		#include "misc.h"
44	–	#include "resv.h"
45
46
47		dlink_list channel_list;
48		mp_pool_t *ban_pool;    /*! \todo ban_pool shouldn't be a global var */
49
50	–	struct event splitmode_event =
51	–	{
52	–	.name = "check_splitmode",
53	–	.handler = check_splitmode,
54	–	.when = 5
55	–	};
56	–
50		static mp_pool_t *member_pool, *channel_pool;
51
52
#	Line 62 | Line 55 | static mp_pool_t *member_pool, *channel_
55		void
56		channel_init(void)
57		{
58	<	add_capability("EX", CAP_EX, 1);
59	<	add_capability("IE", CAP_IE, 1);
58	>	add_capability("EX", CAPAB_EX);
59	>	add_capability("IE", CAPAB_IE);
60
61		channel_pool = mp_pool_new(sizeof(struct Channel), MP_CHUNK_SIZE_CHANNEL);
62		ban_pool = mp_pool_new(sizeof(struct Ban), MP_CHUNK_SIZE_BAN);
#	Line 73 | Line 66 | channel_init(void)
66		/*! \brief Adds a user to a channel by adding another link to the
67		*         channels member chain.
68		* \param chptr      Pointer to channel to add client to
69	<	* \param who        Pointer to client (who) to add
69	>	* \param client_p   Pointer to client (who) to add
70		* \param flags      Flags for chanops etc
71		* \param flood_ctrl Whether to count this join in flood calculations
72		*/
73		void
74	<	add_user_to_channel(struct Channel *chptr, struct Client *who,
74	>	add_user_to_channel(struct Channel *chptr, struct Client *client_p,
75		unsigned int flags, int flood_ctrl)
76		{
77	<	struct Membership *member = NULL;
77	>	assert(IsClient(client_p));
78
79		if (GlobalSetOptions.joinfloodtime > 0)
80		{
#	Line 106 | Line 99 | add_user_to_channel(struct Channel *chpt
99		SetJoinFloodNoticed(chptr);
100		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
101		"Possible Join Flooder %s on %s target: %s",
102	<	get_client_name(who, HIDE_IP),
103	<	who->servptr->name, chptr->name);
102	>	get_client_name(client_p, HIDE_IP),
103	>	client_p->servptr->name, chptr->name);
104		}
105		}
106
107		chptr->last_join_time = CurrentTime;
108		}
109
110	<	member = mp_pool_get(member_pool);
111	<	member->client_p = who;
110	>	struct Membership *member = mp_pool_get(member_pool);
111	>	member->client_p = client_p;
112		member->chptr = chptr;
113		member->flags = flags;
114
115		dlinkAdd(member, &member->channode, &chptr->members);
116
117	<	if (MyConnect(who))
117	>	if (MyConnect(client_p))
118		dlinkAdd(member, &member->locchannode, &chptr->locmembers);
119
120	<	dlinkAdd(member, &member->usernode, &who->channel);
120	>	dlinkAdd(member, &member->usernode, &client_p->channel);
121		}
122
123		/*! \brief Deletes an user from a channel by removing a link in the
#	Line 147 | Line 140 | remove_user_from_channel(struct Membersh
140		mp_pool_release(member);
141
142		if (chptr->members.head == NULL)
143	<	destroy_channel(chptr);
143	>	channel_free(chptr);
144		}
145
146	<	/* send_members()
146	>	/* channel_send_members()
147		*
148		* inputs       -
149		* output       - NONE
150		* side effects -
151		*/
152		static void
153	<	send_members(struct Client *client_p, const struct Channel *chptr,
154	<	char *modebuf, char *parabuf)
153	>	channel_send_members(struct Client *client_p, const struct Channel *chptr,
154	>	char *modebuf, char *parabuf)
155		{
156		char buf[IRCD_BUFSIZE] = "";
157		const dlink_node *node = NULL;
158		int tlen;              /* length of text to append */
159		char *t, *start;       /* temp char pointer */
160
161	<	start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %lu %s %s %s:",
162	<	me.id, (unsigned long)chptr->creationtime,
161	>	start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %ju %s %s %s:",
162	>	me.id, chptr->creationtime,
163		chptr->name, modebuf, parabuf);
164
165		DLINK_FOREACH(node, chptr->members.head)
#	Line 220 | Line 213 | send_members(struct Client *client_p, co
213		* \param flag     Char flag flagging type of mode. Currently this can be 'b', e' or 'I'
214		*/
215		static void
216	<	send_mode_list(struct Client *client_p, const struct Channel *chptr,
217	<	const dlink_list *list, const char flag)
216	>	channel_send_mask_list(struct Client *client_p, const struct Channel *chptr,
217	>	const dlink_list *list, const char flag)
218		{
219		const dlink_node *node = NULL;
220		char mbuf[IRCD_BUFSIZE] = "";
#	Line 229 | Line 222 | send_mode_list(struct Client *client_p,
222		int tlen, mlen, cur_len;
223		char *pp = pbuf;
224
225	<	if (!list->length)
225	>	if (!dlink_list_length(list))
226		return;
227
228	<	mlen = snprintf(mbuf, sizeof(mbuf), ":%s BMASK %lu %s %c :", me.id,
229	<	(unsigned long)chptr->creationtime, chptr->name, flag);
228	>	mlen = snprintf(mbuf, sizeof(mbuf), ":%s BMASK %ju %s %c :", me.id,
229	>	chptr->creationtime, chptr->name, flag);
230		cur_len = mlen;
231
232		DLINK_FOREACH(node, list->head)
#	Line 267 | Line 260 | send_mode_list(struct Client *client_p,
260		* \param chptr    Pointer to channel pointer
261		*/
262		void
263	<	send_channel_modes(struct Client *client_p, struct Channel *chptr)
263	>	channel_send_modes(struct Client *client_p, struct Channel *chptr)
264		{
265		char modebuf[MODEBUFLEN] = "";
266		char parabuf[MODEBUFLEN] = "";
267
268		channel_modes(chptr, client_p, modebuf, parabuf);
269	<	send_members(client_p, chptr, modebuf, parabuf);
269	>	channel_send_members(client_p, chptr, modebuf, parabuf);
270
271	<	send_mode_list(client_p, chptr, &chptr->banlist, 'b');
272	<	send_mode_list(client_p, chptr, &chptr->exceptlist, 'e');
273	<	send_mode_list(client_p, chptr, &chptr->invexlist, 'I');
271	>	channel_send_mask_list(client_p, chptr, &chptr->banlist, 'b');
272	>	channel_send_mask_list(client_p, chptr, &chptr->exceptlist, 'e');
273	>	channel_send_mask_list(client_p, chptr, &chptr->invexlist, 'I');
274		}
275
276		/*! \brief Check channel name for invalid characters
#	Line 286 | Line 279 | send_channel_modes(struct Client *client
279		* \return 0 if invalid, 1 otherwise
280		*/
281		int
282	<	check_channel_name(const char *name, const int local)
282	>	channel_check_name(const char *name, const int local)
283		{
284		const char *p = name;
285
286	<	assert(p);
286	>	assert(!EmptyString(p));
287
288		if (!IsChanPrefix(*p))
289		return 0;
#	Line 315 | Line 308 | void
308		remove_ban(struct Ban *ban, dlink_list *list)
309		{
310		dlinkDelete(&ban->node, list);
318	–
319	–	MyFree(ban->name);
320	–	MyFree(ban->user);
321	–	MyFree(ban->host);
322	–	MyFree(ban->who);
323	–
311		mp_pool_release(ban);
312		}
313
314	<	/* free_channel_list()
314	>	/* channel_free_mask_list()
315		*
316		* inputs       - pointer to dlink_list
317		* output       - NONE
318		* side effects -
319		*/
320	<	void
321	<	free_channel_list(dlink_list *list)
320	>	static void
321	>	channel_free_mask_list(dlink_list *list)
322		{
323	<	dlink_node *node = NULL, *node_next = NULL;
324	<
325	<	DLINK_FOREACH_SAFE(node, node_next, list->head)
326	<	remove_ban(node->data, list);
327	<
341	<	assert(list->tail == NULL && list->head == NULL);
323	>	while (list->head)
324	>	{
325	>	struct Ban *ban = list->head->data;
326	>	remove_ban(ban, list);
327	>	}
328		}
329
330		/*! \brief Get Channel block for name (and allocate a new channel
#	Line 347 | Line 333 | free_channel_list(dlink_list *list)
333		* \return Channel block
334		*/
335		struct Channel *
336	<	make_channel(const char *name)
336	>	channel_make(const char *name)
337		{
338		struct Channel *chptr = NULL;
339
#	Line 359 | Line 345 | make_channel(const char *name)
345		chptr->creationtime = CurrentTime;
346		chptr->last_join_time = CurrentTime;
347
348	<	strlcpy(chptr->name, name, sizeof(chptr->name));
349	<	dlinkAdd(chptr, &chptr->node, &channel_list);
348	>	chptr->name_len = strlcpy(chptr->name, name, sizeof(chptr->name));
349	>	if (chptr->name_len >= sizeof(chptr->name))
350	>	chptr->name_len = sizeof(chptr->name) - 1;
351
352	+	dlinkAdd(chptr, &chptr->node, &channel_list);
353		hash_add_channel(chptr);
354
355		return chptr;
#	Line 371 | Line 359 | make_channel(const char *name)
359		* \param chptr Channel pointer
360		*/
361		void
362	<	destroy_channel(struct Channel *chptr)
362	>	channel_free(struct Channel *chptr)
363		{
364	<	clear_invites(chptr);
364	>	clear_invites_channel(chptr);
365
366		/* Free ban/exception/invex lists */
367	<	free_channel_list(&chptr->banlist);
368	<	free_channel_list(&chptr->exceptlist);
369	<	free_channel_list(&chptr->invexlist);
367	>	channel_free_mask_list(&chptr->banlist);
368	>	channel_free_mask_list(&chptr->exceptlist);
369	>	channel_free_mask_list(&chptr->invexlist);
370
371		dlinkDelete(&chptr->node, &channel_list);
372		hash_del_channel(chptr);
#	Line 401 | Line 389 | channel_pub_or_secret(const struct Chann
389		}
390
391		/*! \brief lists all names on given channel
392	<	* \param source_p Pointer to client struct requesting names
392	>	* \param client_p Pointer to client struct requesting names
393		* \param chptr    Pointer to channel block
394		* \param show_eon Show RPL_ENDOFNAMES numeric or not
395		*                 (don't want it with /names with no params)
396		*/
397		void
398	<	channel_member_names(struct Client *source_p, struct Channel *chptr,
398	>	channel_member_names(struct Client *client_p, struct Channel *chptr,
399		int show_eon)
400		{
401		const dlink_node *node = NULL;
402		char buf[IRCD_BUFSIZE + 1] = "";
403		char *t = NULL, *start = NULL;
404		int tlen = 0;
405	<	const int is_member = IsMember(source_p, chptr);
406	<	const int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
407	<	const int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
405	>	const int is_member = IsMember(client_p, chptr);
406	>	const int multi_prefix = HasCap(client_p, CAP_MULTI_PREFIX) != 0;
407	>	const int uhnames = HasCap(client_p, CAP_UHNAMES) != 0;
408	>
409	>	assert(IsClient(client_p));
410
411		if (PubChannel(chptr) || is_member)
412		{
413		t = buf + snprintf(buf, sizeof(buf), numeric_form(RPL_NAMREPLY),
414	<	me.name, source_p->name,
414	>	me.name, client_p->name,
415		channel_pub_or_secret(chptr), chptr->name);
416		start = t;
417
#	Line 456 | Line 446 | channel_member_names(struct Client *sour
446		if (t + tlen - buf > IRCD_BUFSIZE - 2)
447		{
448		*(t - 1) = '\0';
449	<	sendto_one(source_p, "%s", buf);
449	>	sendto_one(client_p, "%s", buf);
450		t = start;
451		}
452
#	Line 472 | Line 462 | channel_member_names(struct Client *sour
462		if (tlen)
463		{
464		*(t - 1) = '\0';
465	<	sendto_one(source_p, "%s", buf);
465	>	sendto_one(client_p, "%s", buf);
466		}
467		}
468
469		if (show_eon)
470	<	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->name);
470	>	sendto_one_numeric(client_p, &me, RPL_ENDOFNAMES, chptr->name);
471		}
472
473		/*! \brief Adds client to invite list
474	<	* \param chptr Pointer to channel block
475	<	* \param who   Pointer to client to add invite to
474	>	* \param chptr    Pointer to channel block
475	>	* \param client_p Pointer to client to add invite to
476		*/
477		void
478	<	add_invite(struct Channel *chptr, struct Client *who)
478	>	add_invite(struct Channel *chptr, struct Client *client_p)
479		{
480	<	del_invite(chptr, who);
480	>	assert(IsClient(client_p));
481	>
482	>	del_invite(chptr, client_p);
483
484		/*
485		* Delete last link in chain if the list is max length
486		*/
487	<	if (dlink_list_length(&who->connection->invited) >=
487	>	if (dlink_list_length(&client_p->connection->invited) >=
488		ConfigChannel.max_channels)
489	<	del_invite(who->connection->invited.tail->data, who);
489	>	del_invite(client_p->connection->invited.tail->data, client_p);
490
491		/* Add client to channel invite list */
492	<	dlinkAdd(who, make_dlink_node(), &chptr->invites);
492	>	dlinkAdd(client_p, make_dlink_node(), &chptr->invites);
493
494		/* Add channel to the end of the client invite list */
495	<	dlinkAdd(chptr, make_dlink_node(), &who->connection->invited);
495	>	dlinkAdd(chptr, make_dlink_node(), &client_p->connection->invited);
496		}
497
498		/*! \brief Delete Invite block from channel invite list
499		*         and client invite list
500	<	* \param chptr Pointer to Channel struct
501	<	* \param who   Pointer to client to remove invites from
500	>	* \param chptr    Pointer to Channel struct
501	>	* \param client_p Pointer to client to remove invites from
502		*/
503		void
504	<	del_invite(struct Channel *chptr, struct Client *who)
504	>	del_invite(struct Channel *chptr, struct Client *client_p)
505		{
506		dlink_node *node = NULL;
507
508	<	if ((node = dlinkFindDelete(&who->connection->invited, chptr)))
508	>	if ((node = dlinkFindDelete(&client_p->connection->invited, chptr)))
509		free_dlink_node(node);
510
511	<	if ((node = dlinkFindDelete(&chptr->invites, who)))
511	>	if ((node = dlinkFindDelete(&chptr->invites, client_p)))
512		free_dlink_node(node);
513		}
514
#	Line 524 | Line 516 | del_invite(struct Channel *chptr, struct
516		* \param chptr Pointer to Channel struct
517		*/
518		void
519	<	clear_invites(struct Channel *chptr)
519	>	clear_invites_channel(struct Channel *chptr)
520		{
521		dlink_node *node = NULL, *node_next = NULL;
522
#	Line 532 | Line 524 | clear_invites(struct Channel *chptr)
524		del_invite(chptr, node->data);
525		}
526
527	+	/*! \brief Removes all invites of a specific client
528	+	* \param client_p Pointer to Client struct
529	+	*/
530	+	void
531	+	clear_invites_client(struct Client *client_p)
532	+	{
533	+	dlink_node *node = NULL, *node_next = NULL;
534	+
535	+	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->invited.head)
536	+	del_invite(node->data, client_p);
537	+	}
538	+
539		/* get_member_status()
540		*
541		* inputs       - pointer to struct Membership
#	Line 546 | Line 550 | clear_invites(struct Channel *chptr)
550		const char *
551		get_member_status(const struct Membership *member, const int combine)
552		{
553	<	static char buffer[4];  /* 4 for @%+\0 */
553	>	static char buffer[CMEMBER_STATUS_FLAGS_LEN + 1];  /* +1 for \0 */
554		char *p = buffer;
555
556		if (member->flags & CHFL_CHANOP)
#	Line 571 | Line 575 | get_member_status(const struct Membershi
575		}
576
577		/*!
578	<	* \param who  Pointer to Client to check
579	<	* \param list Pointer to ban list to search
578	>	* \param client_p Pointer to Client to check
579	>	* \param list     Pointer to ban list to search
580		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
577	–	*
581		*/
582		static int
583	<	find_bmask(const struct Client *who, const dlink_list *const list)
583	>	find_bmask(const struct Client *client_p, const dlink_list *const list)
584		{
585		const dlink_node *node = NULL;
586
#	Line 585 | Line 588 | find_bmask(const struct Client *who, con
588		{
589		const struct Ban *ban = node->data;
590
591	<	if (!match(ban->name, who->name) && !match(ban->user, who->username))
591	>	if (!match(ban->name, client_p->name) && !match(ban->user, client_p->username))
592		{
593		switch (ban->type)
594		{
595		case HM_HOST:
596	<	if (!match(ban->host, who->host) || !match(ban->host, who->sockhost))
596	>	if (!match(ban->host, client_p->host) || !match(ban->host, client_p->sockhost))
597		return 1;
598		break;
599		case HM_IPV4:
600	<	if (who->connection->aftype == AF_INET)
601	<	if (match_ipv4(&who->connection->ip, &ban->addr, ban->bits))
600	>	if (client_p->connection->aftype == AF_INET)
601	>	if (match_ipv4(&client_p->connection->ip, &ban->addr, ban->bits))
602		return 1;
603		break;
604		case HM_IPV6:
605	<	if (who->connection->aftype == AF_INET6)
606	<	if (match_ipv6(&who->connection->ip, &ban->addr, ban->bits))
605	>	if (client_p->connection->aftype == AF_INET6)
606	>	if (match_ipv6(&client_p->connection->ip, &ban->addr, ban->bits))
607		return 1;
608		break;
609		default:
#	Line 613 | Line 616 | find_bmask(const struct Client *who, con
616		}
617
618		/*!
619	<	* \param chptr Pointer to channel block
620	<	* \param who   Pointer to client to check access fo
619	>	* \param chptr    Pointer to channel block
620	>	* \param client_p Pointer to client to check access fo
621		* \return 0 if not banned, 1 otherwise
622		*/
623		int
624	<	is_banned(const struct Channel *chptr, const struct Client *who)
624	>	is_banned(const struct Channel *chptr, const struct Client *client_p)
625		{
626	<	if (find_bmask(who, &chptr->banlist))
627	<	if (!find_bmask(who, &chptr->exceptlist))
626	>	if (find_bmask(client_p, &chptr->banlist))
627	>	if (!find_bmask(client_p, &chptr->exceptlist))
628		return 1;
629
630		return 0;
631		}
632
633		/*! Tests if a client can join a certain channel
634	<	* \param source_p Pointer to client attempting to join
634	>	* \param client_p Pointer to client attempting to join
635		* \param chptr    Pointer to channel
636		* \param key      Key sent by client attempting to join if present
637		* \return ERR_BANNEDFROMCHAN, ERR_INVITEONLYCHAN, ERR_CHANNELISFULL
638		*         or 0 if allowed to join.
639		*/
640	<	int
641	<	can_join(struct Client *source_p, const struct Channel *chptr, const char *key)
640	>	static int
641	>	can_join(struct Client *client_p, const struct Channel *chptr, const char *key)
642		{
643	<	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
643	>	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(client_p, UMODE_SSL))
644		return ERR_SSLONLYCHAN;
645
646	<	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(source_p, UMODE_REGISTERED))
646	>	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(client_p, UMODE_REGISTERED))
647		return ERR_NEEDREGGEDNICK;
648
649	<	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(source_p, UMODE_OPER))
649	>	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(client_p, UMODE_OPER))
650		return ERR_OPERONLYCHAN;
651
652		if (chptr->mode.mode & MODE_INVITEONLY)
653	<	if (!dlinkFind(&source_p->connection->invited, chptr))
654	<	if (!find_bmask(source_p, &chptr->invexlist))
653	>	if (!dlinkFind(&client_p->connection->invited, chptr))
654	>	if (!find_bmask(client_p, &chptr->invexlist))
655		return ERR_INVITEONLYCHAN;
656
657		if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
#	Line 658 | Line 661 | can_join(struct Client *source_p, const
661		chptr->mode.limit)
662		return ERR_CHANNELISFULL;
663
664	<	if (is_banned(chptr, source_p))
664	>	if (is_banned(chptr, client_p))
665		return ERR_BANNEDFROMCHAN;
666
667		return 0;
#	Line 727 | Line 730 | msg_has_ctrls(const char *message)
730
731		/*! Tests if a client can send to a channel
732		* \param chptr    Pointer to Channel struct
733	<	* \param source_p Pointer to Client struct
733	>	* \param client_p Pointer to Client struct
734		* \param member   Pointer to Membership struct (can be NULL)
735		* \param message  The actual message string the client wants to send
736		* \return CAN_SEND_OPV if op or voiced on channel\n
#	Line 735 | Line 738 | msg_has_ctrls(const char *message)
738		*         ERR_CANNOTSENDTOCHAN or ERR_NEEDREGGEDNICK if they cannot send to channel\n
739		*/
740		int
741	<	can_send(struct Channel *chptr, struct Client *source_p,
742	<	struct Membership *member, const char *message)
741	>	can_send(struct Channel *chptr, struct Client *client_p,
742	>	struct Membership *member, const char *message, int notice)
743		{
744		const struct MaskItem *conf = NULL;
745
746	<	if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
746	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
747		return CAN_SEND_OPV;
748
749	<	if (MyClient(source_p) && !IsExemptResv(source_p))
750	<	if (!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv))
751	<	if ((conf = match_find_resv(chptr->name)) && !resv_find_exempt(source_p, conf))
749	>	if (MyConnect(client_p) && !HasFlag(client_p, FLAGS_EXEMPTRESV))
750	>	if (!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)))
751	>	if ((conf = match_find_resv(chptr->name)) && !resv_find_exempt(client_p, conf))
752		return ERR_CANNOTSENDTOCHAN;
753
754		if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
755		return ERR_NOCTRLSONCHAN;
756
757		if (chptr->mode.mode & MODE_NOCTCP)
758	<	if (*message++ == '\001' && strncmp(message, "ACTION ", 7))
758	>	if (*message == '\001' && strncmp(message + 1, "ACTION ", 7))
759		return ERR_NOCTCP;
760
761	<	if (member || (member = find_channel_link(source_p, chptr)))
762	<	if (member->flags & (CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE))
761	>	if (member || (member = find_channel_link(client_p, chptr)))
762	>	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
763		return CAN_SEND_OPV;
764
765		if (!member && (chptr->mode.mode & MODE_NOPRIVMSGS))
#	Line 765 | Line 768 | can_send(struct Channel *chptr, struct C
768		if (chptr->mode.mode & MODE_MODERATED)
769		return ERR_CANNOTSENDTOCHAN;
770
771	<	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
771	>	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(client_p, UMODE_REGISTERED))
772		return ERR_NEEDREGGEDNICK;
773
774	+	if ((chptr->mode.mode & MODE_NONOTICE) && notice)
775	+	return ERR_CANNOTSENDTOCHAN;
776	+
777		/* Cache can send if banned */
778	<	if (MyClient(source_p))
778	>	if (MyConnect(client_p))
779		{
780		if (member)
781		{
#	Line 778 | Line 784 | can_send(struct Channel *chptr, struct C
784
785		if (!(member->flags & CHFL_BAN_CHECKED))
786		{
787	<	if (is_banned(chptr, source_p))
787	>	if (is_banned(chptr, client_p))
788		{
789	<	member->flags |= (CHFL_BAN_CHECKED|CHFL_BAN_SILENCED);
789	>	member->flags |= (CHFL_BAN_CHECKED | CHFL_BAN_SILENCED);
790		return ERR_CANNOTSENDTOCHAN;
791		}
792
793		member->flags |= CHFL_BAN_CHECKED;
794		}
795		}
796	<	else if (is_banned(chptr, source_p))
796	>	else if (is_banned(chptr, client_p))
797		return ERR_CANNOTSENDTOCHAN;
798		}
799
#	Line 797 | Line 803 | can_send(struct Channel *chptr, struct C
803		/*! \brief Updates the client's oper_warn_count_down, warns the
804		*         IRC operators if necessary, and updates
805		*         join_leave_countdown as needed.
806	<	* \param source_p Pointer to struct Client to check
806	>	* \param client_p Pointer to struct Client to check
807		* \param name     Channel name or NULL if this is a part.
808		*/
809		void
810	<	check_spambot_warning(struct Client *source_p, const char *name)
810	>	check_spambot_warning(struct Client *client_p, const char *name)
811		{
812		int t_delta = 0;
813		int decrement_count = 0;
814
815		if ((GlobalSetOptions.spam_num &&
816	<	(source_p->connection->join_leave_count >=
816	>	(client_p->connection->join_leave_count >=
817		GlobalSetOptions.spam_num)))
818		{
819	<	if (source_p->connection->oper_warn_count_down > 0)
820	<	source_p->connection->oper_warn_count_down--;
819	>	if (client_p->connection->oper_warn_count_down > 0)
820	>	client_p->connection->oper_warn_count_down--;
821		else
822	<	source_p->connection->oper_warn_count_down = 0;
822	>	client_p->connection->oper_warn_count_down = 0;
823
824	<	if (source_p->connection->oper_warn_count_down == 0)
824	>	if (client_p->connection->oper_warn_count_down == 0)
825		{
826		/* It's already known as a possible spambot */
827		if (name)
828		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
829		"User %s (%s@%s) trying to join %s is a possible spambot",
830	<	source_p->name, source_p->username,
831	<	source_p->host, name);
830	>	client_p->name, client_p->username,
831	>	client_p->host, name);
832		else
833		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
834		"User %s (%s@%s) is a possible spambot",
835	<	source_p->name, source_p->username,
836	<	source_p->host);
837	<	source_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
835	>	client_p->name, client_p->username,
836	>	client_p->host);
837	>	client_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
838		}
839		}
840		else
841		{
842	<	if ((t_delta = (CurrentTime - source_p->connection->last_leave_time)) >
842	>	if ((t_delta = (CurrentTime - client_p->connection->last_leave_time)) >
843		JOIN_LEAVE_COUNT_EXPIRE_TIME)
844		{
845		decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
846
847	<	if (decrement_count > source_p->connection->join_leave_count)
848	<	source_p->connection->join_leave_count = 0;
847	>	if (decrement_count > client_p->connection->join_leave_count)
848	>	client_p->connection->join_leave_count = 0;
849		else
850	<	source_p->connection->join_leave_count -= decrement_count;
850	>	client_p->connection->join_leave_count -= decrement_count;
851		}
852		else
853		{
854	<	if ((CurrentTime - (source_p->connection->last_join_time)) <
854	>	if ((CurrentTime - (client_p->connection->last_join_time)) <
855		GlobalSetOptions.spam_time)
856	<	source_p->connection->join_leave_count++;  /* It's a possible spambot */
856	>	client_p->connection->join_leave_count++;  /* It's a possible spambot */
857		}
858
859		if (name)
860	<	source_p->connection->last_join_time = CurrentTime;
860	>	client_p->connection->last_join_time = CurrentTime;
861		else
862	<	source_p->connection->last_leave_time = CurrentTime;
857	<	}
858	<	}
859	<
860	<	/*! \brief Compares usercount and servercount against their split
861	<	*         values and adjusts splitmode accordingly
862	<	* \param unused Unused address pointer
863	<	*/
864	<	void
865	<	check_splitmode(void *unused)
866	<	{
867	<	if (splitchecking && (ConfigChannel.no_join_on_split ||
868	<	ConfigChannel.no_create_on_split))
869	<	{
870	<	const unsigned int server = dlink_list_length(&global_server_list);
871	<
872	<	if (!splitmode && ((server < split_servers) || (Count.total < split_users)))
873	<	{
874	<	splitmode = 1;
875	<
876	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
877	<	"Network split, activating splitmode");
878	<	event_add(&splitmode_event, NULL);
879	<	}
880	<	else if (splitmode && (server >= split_servers) && (Count.total >= split_users))
881	<	{
882	<	splitmode = 0;
883	<
884	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
885	<	"Network rejoined, deactivating splitmode");
886	<	event_delete(&splitmode_event);
887	<	}
862	>	client_p->connection->last_leave_time = CurrentTime;
863		}
864		}
865
#	Line 918 | Line 893 | channel_set_topic(struct Channel *chptr,
893		*                anti spambot code.
894		*/
895		void
896	<	channel_do_join_0(struct Client *source_p)
896	>	channel_do_join_0(struct Client *client_p)
897		{
898	<	dlink_node *node = NULL, *node_next = NULL;
898	>	if (client_p->channel.head)
899	>	if (MyConnect(client_p) && !HasUMode(client_p, UMODE_OPER))
900	>	check_spambot_warning(client_p, NULL);
901
902	<	if (source_p->channel.head)
926	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
927	<	check_spambot_warning(source_p, NULL);
928	<
929	<	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
902	>	while (client_p->channel.head)
903		{
904	<	struct Channel *chptr = ((struct Membership *)node->data)->chptr;
904	>	struct Membership *member = client_p->channel.head->data;
905
906	<	sendto_server(source_p, 0, 0, ":%s PART %s",
907	<	source_p->id, chptr->name);
908	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
909	<	source_p->name, source_p->username,
910	<	source_p->host, chptr->name);
906	>	sendto_server(client_p, 0, 0, ":%s PART %s",
907	>	client_p->id, member->chptr->name);
908	>	sendto_channel_local(NULL, member->chptr, 0, 0, 0, ":%s!%s@%s PART %s",
909	>	client_p->name, client_p->username,
910	>	client_p->host, member->chptr->name);
911
912	<	remove_user_from_channel(node->data);
912	>	remove_user_from_channel(member);
913		}
914		}
915
916		static char *
917	<	channel_find_last0(struct Client *source_p, char *chanlist)
917	>	channel_find_last0(struct Client *client_p, char *chanlist)
918		{
919		int join0 = 0;
920
#	Line 966 | Line 939 | channel_find_last0(struct Client *source
939		}
940
941		if (join0)
942	<	channel_do_join_0(source_p);
942	>	channel_do_join_0(client_p);
943
944		return chanlist;
945		}
946
947		void
948	<	channel_do_join(struct Client *source_p, char *channel, char *key_list)
948	>	channel_do_join(struct Client *client_p, char *channel, char *key_list)
949		{
950		char *p = NULL;
951		char *chan = NULL;
952		char *chan_list = NULL;
953		struct Channel *chptr = NULL;
954		struct MaskItem *conf = NULL;
955	<	const struct ClassItem *const class = get_class_ptr(&source_p->connection->confs);
955	>	const struct ClassItem *const class = get_class_ptr(&client_p->connection->confs);
956		int i = 0;
957		unsigned int flags = 0;
958
959	<	chan_list = channel_find_last0(source_p, channel);
959	>	assert(IsClient(client_p));
960	>
961	>	chan_list = channel_find_last0(client_p, channel);
962
963	<	for (chan = strtoken(&p, chan_list, ","); chan;
964	<	chan = strtoken(&p,      NULL, ","))
963	>	for (chan = strtok_r(chan_list, ",", &p); chan;
964	>	chan = strtok_r(NULL,      ",", &p))
965		{
966		const char *key = NULL;
967
#	Line 998 | Line 973 | channel_do_join(struct Client *source_p,
973		if (key && *key == '\0')
974		key = NULL;
975
976	<	if (!check_channel_name(chan, 1))
976	>	if (!channel_check_name(chan, 1))
977		{
978	<	sendto_one_numeric(source_p, &me, ERR_BADCHANNAME, chan);
978	>	sendto_one_numeric(client_p, &me, ERR_BADCHANNAME, chan);
979		continue;
980		}
981
982	<	if (!IsExemptResv(source_p) &&
983	<	!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv) &&
984	<	((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
982	>	if (!HasFlag(client_p, FLAGS_EXEMPTRESV) &&
983	>	!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)) &&
984	>	((conf = match_find_resv(chan)) && !resv_find_exempt(client_p, conf)))
985		{
986		++conf->count;
987	<	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON,
1013	<	chan, conf->reason ? conf->reason : "Reserved channel");
987	>	sendto_one_numeric(client_p, &me, ERR_CHANBANREASON, chan, conf->reason);
988		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
989		"Forbidding reserved channel %s from user %s",
990	<	chan, get_client_name(source_p, HIDE_IP));
990	>	chan, get_client_name(client_p, HIDE_IP));
991		continue;
992		}
993
994	<	if (dlink_list_length(&source_p->channel) >=
994	>	if (dlink_list_length(&client_p->channel) >=
995		((class->max_channels) ? class->max_channels : ConfigChannel.max_channels))
996		{
997	<	sendto_one_numeric(source_p, &me, ERR_TOOMANYCHANNELS, chan);
997	>	sendto_one_numeric(client_p, &me, ERR_TOOMANYCHANNELS, chan);
998		break;
999		}
1000
1001		if ((chptr = hash_find_channel(chan)))
1002		{
1003	<	if (IsMember(source_p, chptr))
1003	>	if (IsMember(client_p, chptr))
1004		continue;
1005
1032	–	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1033	–	ConfigChannel.no_join_on_split)
1034	–	{
1035	–	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chptr->name);
1036	–	continue;
1037	–	}
1038	–
1006		/*
1007		* can_join checks for +i key, bans.
1008		*/
1009	<	if ((i = can_join(source_p, chptr, key)))
1009	>	if ((i = can_join(client_p, chptr, key)))
1010		{
1011	<	sendto_one_numeric(source_p, &me, i, chptr->name);
1011	>	sendto_one_numeric(client_p, &me, i, chptr->name);
1012		continue;
1013		}
1014
#	Line 1056 | Line 1023 | channel_do_join(struct Client *source_p,
1023		}
1024		else
1025		{
1059	–	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1060	–	(ConfigChannel.no_create_on_split || ConfigChannel.no_join_on_split))
1061	–	{
1062	–	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chan);
1063	–	continue;
1064	–	}
1065	–
1026		flags = CHFL_CHANOP;
1027	<	chptr = make_channel(chan);
1027	>	chptr = channel_make(chan);
1028		}
1029
1030	<	if (!HasUMode(source_p, UMODE_OPER))
1031	<	check_spambot_warning(source_p, chptr->name);
1030	>	if (!HasUMode(client_p, UMODE_OPER))
1031	>	check_spambot_warning(client_p, chptr->name);
1032
1033	<	add_user_to_channel(chptr, source_p, flags, 1);
1033	>	add_user_to_channel(chptr, client_p, flags, 1);
1034
1035		/*
1036	<	*  Set timestamp if appropriate, and propagate
1036	>	* Set timestamp if appropriate, and propagate
1037		*/
1038		if (flags == CHFL_CHANOP)
1039		{
#	Line 1081 | Line 1041 | channel_do_join(struct Client *source_p,
1041		chptr->mode.mode |= MODE_TOPICLIMIT;
1042		chptr->mode.mode |= MODE_NOPRIVMSGS;
1043
1044	<	sendto_server(source_p, 0, 0, ":%s SJOIN %lu %s +nt :@%s",
1045	<	me.id, (unsigned long)chptr->creationtime,
1046	<	chptr->name, source_p->id);
1044	>	sendto_server(client_p, 0, 0, ":%s SJOIN %ju %s +nt :@%s",
1045	>	me.id, chptr->creationtime,
1046	>	chptr->name, client_p->id);
1047
1048		/*
1049		* Notify all other users on the new channel
1050		*/
1051	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1052	<	source_p->name, source_p->username,
1053	<	source_p->host, chptr->name,
1054	<	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1055	<	source_p->info);
1056	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1057	<	source_p->name, source_p->username,
1098	<	source_p->host, chptr->name);
1099	<	sendto_channel_local(0, chptr, ":%s MODE %s +nt",
1051	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1052	>	client_p->name, client_p->username,
1053	>	client_p->host, chptr->name, client_p->account, client_p->info);
1054	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1055	>	client_p->name, client_p->username,
1056	>	client_p->host, chptr->name);
1057	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s MODE %s +nt",
1058		me.name, chptr->name);
1059
1060	<	if (source_p->away[0])
1061	<	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
1062	<	":%s!%s@%s AWAY :%s",
1063	<	source_p->name, source_p->username,
1064	<	source_p->host, source_p->away);
1060	>	if (client_p->away[0])
1061	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
1062	>	":%s!%s@%s AWAY :%s",
1063	>	client_p->name, client_p->username,
1064	>	client_p->host, client_p->away);
1065		}
1066		else
1067		{
1068	<	sendto_server(source_p, 0, 0, ":%s JOIN %lu %s +",
1069	<	source_p->id, (unsigned long)chptr->creationtime,
1068	>	sendto_server(client_p, 0, 0, ":%s JOIN %ju %s +",
1069	>	client_p->id, chptr->creationtime,
1070		chptr->name);
1071
1072	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1073	<	source_p->name, source_p->username,
1074	<	source_p->host, chptr->name,
1075	<	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1076	<	source_p->info);
1077	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1078	<	source_p->name, source_p->username,
1079	<	source_p->host, chptr->name);
1080	<
1081	<	if (source_p->away[0])
1082	<	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
1083	<	":%s!%s@%s AWAY :%s",
1126	<	source_p->name, source_p->username,
1127	<	source_p->host, source_p->away);
1072	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1073	>	client_p->name, client_p->username,
1074	>	client_p->host, chptr->name, client_p->account, client_p->info);
1075	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1076	>	client_p->name, client_p->username,
1077	>	client_p->host, chptr->name);
1078	>
1079	>	if (client_p->away[0])
1080	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
1081	>	":%s!%s@%s AWAY :%s",
1082	>	client_p->name, client_p->username,
1083	>	client_p->host, client_p->away);
1084		}
1085
1086	<	del_invite(chptr, source_p);
1086	>	del_invite(chptr, client_p);
1087
1088		if (chptr->topic[0])
1089		{
1090	<	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1091	<	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->name,
1090	>	sendto_one_numeric(client_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1091	>	sendto_one_numeric(client_p, &me, RPL_TOPICWHOTIME, chptr->name,
1092		chptr->topic_info, chptr->topic_time);
1093		}
1094
1095	<	channel_member_names(source_p, chptr, 1);
1095	>	channel_member_names(client_p, chptr, 1);
1096
1097	<	source_p->connection->last_join_time = CurrentTime;
1097	>	client_p->connection->last_join_time = CurrentTime;
1098		}
1099		}
1100
1101		/*! \brief Removes a client from a specific channel
1102	<	* \param source_p Pointer to source client to remove
1102	>	* \param client_p Pointer to source client to remove
1103		* \param name     Name of channel to remove from
1104		* \param reason   Part reason to show
1105		*/
1106		static void
1107	<	channel_part_one_client(struct Client *source_p, const char *name, const char *reason)
1107	>	channel_part_one_client(struct Client *client_p, const char *name, const char *reason)
1108		{
1109		struct Channel *chptr = NULL;
1110		struct Membership *member = NULL;
1111
1112		if ((chptr = hash_find_channel(name)) == NULL)
1113		{
1114	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, name);
1114	>	sendto_one_numeric(client_p, &me, ERR_NOSUCHCHANNEL, name);
1115		return;
1116		}
1117
1118	<	if ((member = find_channel_link(source_p, chptr)) == NULL)
1118	>	if ((member = find_channel_link(client_p, chptr)) == NULL)
1119		{
1120	<	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->name);
1120	>	sendto_one_numeric(client_p, &me, ERR_NOTONCHANNEL, chptr->name);
1121		return;
1122		}
1123
1124	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
1125	<	check_spambot_warning(source_p, NULL);
1124	>	if (MyConnect(client_p) && !HasUMode(client_p, UMODE_OPER))
1125	>	check_spambot_warning(client_p, NULL);
1126
1127		/*
1128		* Remove user from the old channel (if any)
1129		* only allow /part reasons in -m chans
1130		*/
1131	<	if (*reason && (!MyConnect(source_p) ||
1132	<	((can_send(chptr, source_p, member, reason) &&
1133	<	(source_p->connection->firsttime + ConfigGeneral.anti_spam_exit_message_time)
1134	<	< CurrentTime))))
1135	<	{
1136	<	sendto_server(source_p, 0, 0, ":%s PART %s :%s",
1137	<	source_p->id, chptr->name, reason);
1138	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s :%s",
1139	<	source_p->name, source_p->username,
1140	<	source_p->host, chptr->name, reason);
1131	>	if (*reason && (!MyConnect(client_p) ||
1132	>	((client_p->connection->firsttime +
1133	>	ConfigGeneral.anti_spam_exit_message_time) < CurrentTime &&
1134	>	can_send(chptr, client_p, member, reason, 0) < 0)))
1135	>	{
1136	>	sendto_server(client_p, 0, 0, ":%s PART %s :%s",
1137	>	client_p->id, chptr->name, reason);
1138	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s :%s",
1139	>	client_p->name, client_p->username,
1140	>	client_p->host, chptr->name, reason);
1141		}
1142		else
1143		{
1144	<	sendto_server(source_p, 0, 0, ":%s PART %s",
1145	<	source_p->id, chptr->name);
1146	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
1147	<	source_p->name, source_p->username,
1148	<	source_p->host, chptr->name);
1144	>	sendto_server(client_p, 0, 0, ":%s PART %s",
1145	>	client_p->id, chptr->name);
1146	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s",
1147	>	client_p->name, client_p->username,
1148	>	client_p->host, chptr->name);
1149		}
1150
1151		remove_user_from_channel(member);
1152		}
1153
1154		void
1155	<	channel_do_part(struct Client *source_p, char *channel, const char *reason)
1155	>	channel_do_part(struct Client *client_p, char *channel, const char *reason)
1156		{
1157		char *p = NULL, *name = NULL;
1158		char buf[KICKLEN + 1] = "";
1159
1160	+	assert(IsClient(client_p));
1161	+
1162		if (!EmptyString(reason))
1163		strlcpy(buf, reason, sizeof(buf));
1164
1165	<	for (name = strtoken(&p, channel, ","); name;
1166	<	name = strtoken(&p,    NULL, ","))
1167	<	channel_part_one_client(source_p, name, buf);
1165	>	for (name = strtok_r(channel, ",", &p); name;
1166	>	name = strtok_r(NULL,    ",", &p))
1167	>	channel_part_one_client(client_p, name, buf);
1168		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)