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 3937 by michael, Tue Jun 10 19:01:12 2014 UTC vs.
Revision 7544 by michael, Thu Apr 21 11:16:14 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 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 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	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 global_channel_list;
47	>	dlink_list channel_list;
48		mp_pool_t *ban_pool;    /*! \todo ban_pool shouldn't be a global var */
49
50		static mp_pool_t *member_pool, *channel_pool;
51	–	static char buf[IRCD_BUFSIZE];
51
52
53		/*! \brief Initializes the channel blockheap, adds known channel CAPAB
#	Line 56 | Line 55 | static char buf[IRCD_BUFSIZE];
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 67 | 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 *ms = NULL;
77	>	assert(IsClient(client_p));
78
79		if (GlobalSetOptions.joinfloodtime > 0)
80		{
#	Line 100 | 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->chname);
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	<	ms = mp_pool_get(member_pool);
111	<	memset(ms, 0, sizeof(*ms));
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	<	ms->client_p = who;
115	<	ms->chptr = chptr;
116	<	ms->flags = flags;
115	>	dlinkAdd(member, &member->channode, &chptr->members);
116
117	<	dlinkAdd(ms, &ms->channode, &chptr->members);
118	<	dlinkAdd(ms, &ms->usernode, &who->channel);
117	>	if (MyConnect(client_p))
118	>	dlinkAdd(member, &member->locchannode, &chptr->locmembers);
119	>
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 126 | Line 127 | add_user_to_channel(struct Channel *chpt
127		void
128		remove_user_from_channel(struct Membership *member)
129		{
130	<	struct Client *client_p = member->client_p;
131	<	struct Channel *chptr = member->chptr;
130	>	struct Client *const client_p = member->client_p;
131	>	struct Channel *const chptr = member->chptr;
132
133		dlinkDelete(&member->channode, &chptr->members);
134	+
135	+	if (MyConnect(client_p))
136	+	dlinkDelete(&member->locchannode, &chptr->locmembers);
137	+
138		dlinkDelete(&member->usernode, &client_p->channel);
139
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, 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	<	const dlink_node *ptr = NULL;
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->channelts,
163	<	chptr->chname, modebuf, parabuf);
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(ptr, chptr->members.head)
165	>	DLINK_FOREACH(node, chptr->members.head)
166		{
167	<	const struct Membership *ms = ptr->data;
167	>	const struct Membership *member = node->data;
168
169	<	tlen = strlen(ms->client_p->id) + 1;  /* nick + space */
169	>	tlen = strlen(member->client_p->id) + 1;  /* +1 for space */
170
171	<	if (ms->flags & CHFL_CHANOP)
171	>	if (member->flags & CHFL_CHANOP)
172		++tlen;
173	<	if (ms->flags & CHFL_HALFOP)
173	>	if (member->flags & CHFL_HALFOP)
174		++tlen;
175	<	if (ms->flags & CHFL_VOICE)
175	>	if (member->flags & CHFL_VOICE)
176		++tlen;
177
178		/*
#	Line 180 | Line 186 | send_members(struct Client *client_p, st
186		t = start;
187		}
188
189	<	if (ms->flags & CHFL_CHANOP)
189	>	if (member->flags & CHFL_CHANOP)
190		*t++ = '@';
191	<	if (ms->flags & CHFL_HALFOP)
191	>	if (member->flags & CHFL_HALFOP)
192		*t++ = '%';
193	<	if (ms->flags & CHFL_VOICE)
193	>	if (member->flags & CHFL_VOICE)
194		*t++ = '+';
195
196	<	strcpy(t, ms->client_p->id);
196	>	strcpy(t, member->client_p->id);
197
198		t += strlen(t);
199		*t++ = ' ';
#	Line 203 | Line 209 | send_members(struct Client *client_p, st
209		/*! \brief Sends +b/+e/+I
210		* \param client_p Client pointer to server
211		* \param chptr    Pointer to channel
212	<	* \param top      Pointer to top of mode link list to send
212	>	* \param list     Pointer to list of modes to send
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, struct Channel *chptr,
217	<	const dlink_list *top, 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 *ptr = NULL;
219	>	const dlink_node *node = NULL;
220	>	char mbuf[IRCD_BUFSIZE] = "";
221		char pbuf[IRCD_BUFSIZE] = "";
222		int tlen, mlen, cur_len;
223		char *pp = pbuf;
224
225	<	if (top->length == 0)
225	>	if (!dlink_list_length(list))
226		return;
227
228	<	mlen = snprintf(buf, sizeof(buf), ":%s BMASK %lu %s %c :", me.id,
229	<	(unsigned long)chptr->channelts, chptr->chname, 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(ptr, top->head)
232	>	DLINK_FOREACH(node, list->head)
233		{
234	<	const struct Ban *banptr = ptr->data;
234	>	const struct Ban *ban = node->data;
235
236	<	tlen = banptr->len + 3;
236	>	tlen = ban->len + 3;  /* +3 for ! + @ + space */
237
238		/*
239	<	* Send buffer and start over if we cannot fit another ban,
233	<	* or if the target is non-ts6 and we have too many modes in
234	<	* in this line.
239	>	* Send buffer and start over if we cannot fit another ban
240		*/
241		if (cur_len + (tlen - 1) > IRCD_BUFSIZE - 2)
242		{
243		*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
244	<	sendto_one(client_p, "%s%s", buf, pbuf);
244	>	sendto_one(client_p, "%s%s", mbuf, pbuf);
245
246		cur_len = mlen;
247		pp = pbuf;
248		}
249
250	<	pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->user,
246	<	banptr->host);
250	>	pp += sprintf(pp, "%s!%s@%s ", ban->name, ban->user, ban->host);
251		cur_len += tlen;
252		}
253
254		*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
255	<	sendto_one(client_p, "%s%s", buf, pbuf);
255	>	sendto_one(client_p, "%s%s", mbuf, pbuf);
256		}
257
258		/*! \brief Send "client_p" a full list of the modes for channel chptr
#	Line 256 | 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 275 | 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(name != NULL);
286	>	assert(!EmptyString(p));
287
288		if (!IsChanPrefix(*p))
289		return 0;
#	Line 301 | Line 305 | check_channel_name(const char *name, con
305		}
306
307		void
308	<	remove_ban(struct Ban *bptr, dlink_list *list)
308	>	remove_ban(struct Ban *ban, dlink_list *list)
309		{
310	<	dlinkDelete(&bptr->node, list);
311	<
308	<	MyFree(bptr->name);
309	<	MyFree(bptr->user);
310	<	MyFree(bptr->host);
311	<	MyFree(bptr->who);
312	<
313	<	mp_pool_release(bptr);
310	>	dlinkDelete(&ban->node, list);
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 *ptr = NULL, *ptr_next = NULL;
324	<
325	<	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
326	<	remove_ban(ptr->data, list);
327	<
330	<	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 chname (and allocate a new channel
330	>	/*! \brief Get Channel block for name (and allocate a new channel
331		*         block, if it didn't exist before)
332	<	* \param chname Channel name
332	>	* \param name Channel name
333		* \return Channel block
334		*/
335		struct Channel *
336	<	make_channel(const char *chname)
336	>	channel_make(const char *name)
337		{
338		struct Channel *chptr = NULL;
339
340	<	assert(!EmptyString(chname));
340	>	assert(!EmptyString(name));
341
342		chptr = mp_pool_get(channel_pool);
343
347	–	memset(chptr, 0, sizeof(*chptr));
348	–
344		/* Doesn't hurt to set it here */
345	<	chptr->channelts = CurrentTime;
345	>	chptr->creationtime = CurrentTime;
346		chptr->last_join_time = CurrentTime;
347
348	<	strlcpy(chptr->chname, chname, sizeof(chptr->chname));
349	<	dlinkAdd(chptr, &chptr->node, &global_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 362 | Line 359 | make_channel(const char *chname)
359		* \param chptr Channel pointer
360		*/
361		void
362	<	destroy_channel(struct Channel *chptr)
362	>	channel_free(struct Channel *chptr)
363		{
364	<	dlink_node *ptr = NULL, *ptr_next = NULL;
368	<
369	<	DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->invites.head)
370	<	del_invite(chptr, ptr->data);
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, &global_channel_list);
371	>	dlinkDelete(&chptr->node, &channel_list);
372		hash_del_channel(chptr);
373
374		mp_pool_release(chptr);
#	Line 395 | 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 *ptr = NULL;
402	<	char lbuf[IRCD_BUFSIZE + 1] = "";
401	>	const dlink_node *node = NULL;
402	>	char buf[IRCD_BUFSIZE + 1] = "";
403		char *t = NULL, *start = NULL;
404		int tlen = 0;
405	<	int is_member = IsMember(source_p, chptr);
406	<	int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
407	<	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 = lbuf + snprintf(lbuf, sizeof(lbuf), numeric_form(RPL_NAMREPLY),
414	<	me.name, source_p->name,
415	<	channel_pub_or_secret(chptr), chptr->chname);
413	>	t = buf + snprintf(buf, sizeof(buf), numeric_form(RPL_NAMREPLY),
414	>	me.name, client_p->name,
415	>	channel_pub_or_secret(chptr), chptr->name);
416		start = t;
417
418	<	DLINK_FOREACH(ptr, chptr->members.head)
418	>	DLINK_FOREACH(node, chptr->members.head)
419		{
420	<	const struct Membership *ms = ptr->data;
420	>	const struct Membership *member = node->data;
421
422	<	if (HasUMode(ms->client_p, UMODE_INVISIBLE) && !is_member)
422	>	if (HasUMode(member->client_p, UMODE_INVISIBLE) && !is_member)
423		continue;
424
425		if (!uhnames)
426	<	tlen = strlen(ms->client_p->name) + 1;  /* nick + space */
426	>	tlen = strlen(member->client_p->name) + 1;  /* +1 for space */
427		else
428	<	tlen = strlen(ms->client_p->name) + strlen(ms->client_p->username) +
429	<	strlen(ms->client_p->host) + 3;
428	>	tlen = strlen(member->client_p->name) + strlen(member->client_p->username) +
429	>	strlen(member->client_p->host) + 3;  /* +3 for ! + @ + space */
430
431		if (!multi_prefix)
432		{
433	<	if (ms->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
433	>	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
434		++tlen;
435		}
436		else
437		{
438	<	if (ms->flags & CHFL_CHANOP)
438	>	if (member->flags & CHFL_CHANOP)
439		++tlen;
440	<	if (ms->flags & CHFL_HALFOP)
440	>	if (member->flags & CHFL_HALFOP)
441		++tlen;
442	<	if (ms->flags & CHFL_VOICE)
442	>	if (member->flags & CHFL_VOICE)
443		++tlen;
444		}
445
446	<	if (t + tlen - lbuf > IRCD_BUFSIZE - 2)
446	>	if (t + tlen - buf > IRCD_BUFSIZE - 2)
447		{
448		*(t - 1) = '\0';
449	<	sendto_one(source_p, "%s", lbuf);
449	>	sendto_one(client_p, "%s", buf);
450		t = start;
451		}
452
453		if (!uhnames)
454	<	t += sprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
455	<	ms->client_p->name);
454	>	t += sprintf(t, "%s%s ", get_member_status(member, multi_prefix),
455	>	member->client_p->name);
456		else
457	<	t += sprintf(t, "%s%s!%s@%s ", get_member_status(ms, multi_prefix),
458	<	ms->client_p->name, ms->client_p->username,
459	<	ms->client_p->host);
457	>	t += sprintf(t, "%s%s!%s@%s ", get_member_status(member, multi_prefix),
458	>	member->client_p->name, member->client_p->username,
459	>	member->client_p->host);
460		}
461
462		if (tlen)
463		{
464		*(t - 1) = '\0';
465	<	sendto_one(source_p, "%s", lbuf);
465	>	sendto_one(client_p, "%s", buf);
466		}
467		}
468
469		if (show_eon)
470	<	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->chname);
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	<	/*
483	<	* Delete last link in chain if the list is max length
484	<	*/
485	<	if (dlink_list_length(&who->localClient->invited) >=
486	<	ConfigChannel.max_channels)
487	<	del_invite(who->localClient->invited.tail->data, who);
482	>	del_invite(chptr, client_p);
483	>
484	>	/* Delete last link in chain if the list is max length */
485	>	while (dlink_list_length(&client_p->connection->invited) &&
486	>	dlink_list_length(&client_p->connection->invited) >= ConfigChannel.max_channels)
487	>	del_invite(client_p->connection->invited.tail->data, client_p);
488
489		/* Add client to channel invite list */
490	<	dlinkAdd(who, make_dlink_node(), &chptr->invites);
490	>	dlinkAdd(client_p, make_dlink_node(), &chptr->invites);
491
492		/* Add channel to the end of the client invite list */
493	<	dlinkAdd(chptr, make_dlink_node(), &who->localClient->invited);
493	>	dlinkAdd(chptr, make_dlink_node(), &client_p->connection->invited);
494		}
495
496		/*! \brief Delete Invite block from channel invite list
497		*         and client invite list
498	+	* \param chptr    Pointer to Channel struct
499	+	* \param client_p Pointer to client to remove invites from
500	+	*/
501	+	void
502	+	del_invite(struct Channel *chptr, struct Client *client_p)
503	+	{
504	+	dlink_node *node = NULL;
505	+
506	+	if ((node = dlinkFindDelete(&client_p->connection->invited, chptr)))
507	+	free_dlink_node(node);
508	+
509	+	if ((node = dlinkFindDelete(&chptr->invites, client_p)))
510	+	free_dlink_node(node);
511	+	}
512	+
513	+	/*! \brief Removes all invites of a specific channel
514		* \param chptr Pointer to Channel struct
503	–	* \param who   Pointer to client to remove invites from
515		*/
516		void
517	<	del_invite(struct Channel *chptr, struct Client *who)
517	>	clear_invites_channel(struct Channel *chptr)
518		{
519	<	dlink_node *ptr = NULL;
519	>	dlink_node *node = NULL, *node_next = NULL;
520
521	<	if ((ptr = dlinkFindDelete(&who->localClient->invited, chptr)))
522	<	free_dlink_node(ptr);
521	>	DLINK_FOREACH_SAFE(node, node_next, chptr->invites.head)
522	>	del_invite(chptr, node->data);
523	>	}
524	>
525	>	/*! \brief Removes all invites of a specific client
526	>	* \param client_p Pointer to Client struct
527	>	*/
528	>	void
529	>	clear_invites_client(struct Client *client_p)
530	>	{
531	>	dlink_node *node = NULL, *node_next = NULL;
532
533	<	if ((ptr = dlinkFindDelete(&chptr->invites, who)))
534	<	free_dlink_node(ptr);
533	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->invited.head)
534	>	del_invite(node->data, client_p);
535		}
536
537		/* get_member_status()
#	Line 526 | Line 546 | del_invite(struct Channel *chptr, struct
546		* (like in get_client_name)
547		*/
548		const char *
549	<	get_member_status(const struct Membership *ms, const int combine)
549	>	get_member_status(const struct Membership *member, const int combine)
550		{
551	<	static char buffer[4];
551	>	static char buffer[CMEMBER_STATUS_FLAGS_LEN + 1];  /* +1 for \0 */
552		char *p = buffer;
553
554	<	if (ms->flags & CHFL_CHANOP)
554	>	if (member->flags & CHFL_CHANOP)
555		{
556		if (!combine)
557		return "@";
558		*p++ = '@';
559		}
560
561	<	if (ms->flags & CHFL_HALFOP)
561	>	if (member->flags & CHFL_HALFOP)
562		{
563		if (!combine)
564		return "%";
565		*p++ = '%';
566		}
567
568	<	if (ms->flags & CHFL_VOICE)
568	>	if (member->flags & CHFL_VOICE)
569		*p++ = '+';
570		*p = '\0';
571
#	Line 553 | Line 573 | get_member_status(const struct Membershi
573		}
574
575		/*!
576	<	* \param who  Pointer to Client to check
577	<	* \param list Pointer to ban list to search
576	>	* \param client_p Pointer to Client to check
577	>	* \param list     Pointer to ban list to search
578		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
559	–	*
579		*/
580		static int
581	<	find_bmask(const struct Client *who, const dlink_list *const list)
581	>	find_bmask(const struct Client *client_p, const dlink_list *list)
582		{
583	<	const dlink_node *ptr = NULL;
583	>	const dlink_node *node = NULL;
584
585	<	DLINK_FOREACH(ptr, list->head)
585	>	DLINK_FOREACH(node, list->head)
586		{
587	<	const struct Ban *bp = ptr->data;
587	>	const struct Ban *ban = node->data;
588
589	<	if (!match(bp->name, who->name) && !match(bp->user, who->username))
589	>	if (!match(ban->name, client_p->name) && !match(ban->user, client_p->username))
590		{
591	<	switch (bp->type)
591	>	switch (ban->type)
592		{
593		case HM_HOST:
594	<	if (!match(bp->host, who->host) || !match(bp->host, who->sockhost))
594	>	if (!match(ban->host, client_p->host) || !match(ban->host, client_p->sockhost))
595		return 1;
596		break;
597		case HM_IPV4:
598	<	if (who->localClient->aftype == AF_INET)
599	<	if (match_ipv4(&who->localClient->ip, &bp->addr, bp->bits))
598	>	if (client_p->connection->aftype == AF_INET)
599	>	if (match_ipv4(&client_p->connection->ip, &ban->addr, ban->bits))
600		return 1;
601		break;
583	–	#ifdef IPV6
602		case HM_IPV6:
603	<	if (who->localClient->aftype == AF_INET6)
604	<	if (match_ipv6(&who->localClient->ip, &bp->addr, bp->bits))
603	>	if (client_p->connection->aftype == AF_INET6)
604	>	if (match_ipv6(&client_p->connection->ip, &ban->addr, ban->bits))
605		return 1;
606		break;
589	–	#endif
607		default:
608		assert(0);
609		}
#	Line 597 | Line 614 | find_bmask(const struct Client *who, con
614		}
615
616		/*!
617	<	* \param chptr Pointer to channel block
618	<	* \param who   Pointer to client to check access fo
617	>	* \param chptr    Pointer to channel block
618	>	* \param client_p Pointer to client to check access fo
619		* \return 0 if not banned, 1 otherwise
620		*/
621		int
622	<	is_banned(const struct Channel *chptr, const struct Client *who)
622	>	is_banned(const struct Channel *chptr, const struct Client *client_p)
623		{
624	<	if (find_bmask(who, &chptr->banlist))
625	<	if (!find_bmask(who, &chptr->exceptlist))
624	>	if (find_bmask(client_p, &chptr->banlist))
625	>	if (!find_bmask(client_p, &chptr->exceptlist))
626		return 1;
627
628		return 0;
629		}
630
631		/*! Tests if a client can join a certain channel
632	<	* \param source_p Pointer to client attempting to join
632	>	* \param client_p Pointer to client attempting to join
633		* \param chptr    Pointer to channel
634		* \param key      Key sent by client attempting to join if present
635		* \return ERR_BANNEDFROMCHAN, ERR_INVITEONLYCHAN, ERR_CHANNELISFULL
636		*         or 0 if allowed to join.
637		*/
638	<	int
639	<	can_join(struct Client *source_p, struct Channel *chptr, const char *key)
638	>	static int
639	>	can_join(struct Client *client_p, const struct Channel *chptr, const char *key)
640		{
641	<	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
641	>	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(client_p, UMODE_SSL))
642		return ERR_SSLONLYCHAN;
643
644	<	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(source_p, UMODE_REGISTERED))
644	>	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(client_p, UMODE_REGISTERED))
645		return ERR_NEEDREGGEDNICK;
646
647	<	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(source_p, UMODE_OPER))
647	>	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(client_p, UMODE_OPER))
648		return ERR_OPERONLYCHAN;
649
650		if (chptr->mode.mode & MODE_INVITEONLY)
651	<	if (!dlinkFind(&source_p->localClient->invited, chptr))
652	<	if (!find_bmask(source_p, &chptr->invexlist))
651	>	if (!dlinkFind(&client_p->connection->invited, chptr))
652	>	if (!find_bmask(client_p, &chptr->invexlist))
653		return ERR_INVITEONLYCHAN;
654
655		if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
#	Line 642 | Line 659 | can_join(struct Client *source_p, struct
659		chptr->mode.limit)
660		return ERR_CHANNELISFULL;
661
662	<	if (is_banned(chptr, source_p))
662	>	if (is_banned(chptr, client_p))
663		return ERR_BANNEDFROMCHAN;
664
665		return 0;
666		}
667
668		int
669	<	has_member_flags(const struct Membership *ms, const unsigned int flags)
669	>	has_member_flags(const struct Membership *member, const unsigned int flags)
670		{
671	<	return ms && (ms->flags & flags);
671	>	return member && (member->flags & flags);
672		}
673
674		struct Membership *
675		find_channel_link(struct Client *client_p, struct Channel *chptr)
676		{
677	<	dlink_node *ptr = NULL;
677	>	dlink_node *node = NULL;
678
679		if (!IsClient(client_p))
680		return NULL;
681
682		if (dlink_list_length(&chptr->members) < dlink_list_length(&client_p->channel))
683		{
684	<	DLINK_FOREACH(ptr, chptr->members.head)
685	<	if (((struct Membership *)ptr->data)->client_p == client_p)
686	<	return ptr->data;
684	>	DLINK_FOREACH(node, chptr->members.head)
685	>	if (((struct Membership *)node->data)->client_p == client_p)
686	>	return node->data;
687		}
688		else
689		{
690	<	DLINK_FOREACH(ptr, client_p->channel.head)
691	<	if (((struct Membership *)ptr->data)->chptr == chptr)
692	<	return ptr->data;
690	>	DLINK_FOREACH(node, client_p->channel.head)
691	>	if (((struct Membership *)node->data)->chptr == chptr)
692	>	return node->data;
693		}
694
695		return NULL;
696		}
697
698	<	/*! Tests if a client can send to a channel
698	>	/*! Checks if a message contains control codes
699		* \param message The actual message string the client wants to send
700		* \return 1 if the message does contain any control codes, 0 otherwise
701		*/
#	Line 690 | Line 707 | msg_has_ctrls(const char *message)
707		for (; *p; ++p)
708		{
709		if (*p > 31 || *p == 1)
710	<	continue;  /* CTCP or no control code */
710	>	continue;  /* No control code or CTCP */
711
712		if (*p == 27)  /* Escape */
713		{
#	Line 706 | Line 723 | msg_has_ctrls(const char *message)
723		return 1;  /* Control code */
724		}
725
726	<	return 0;
726	>	return 0;  /* No control code found */
727		}
728
729		/*! Tests if a client can send to a channel
730		* \param chptr    Pointer to Channel struct
731	<	* \param source_p Pointer to Client struct
732	<	* \param ms       Pointer to Membership struct (can be NULL)
731	>	* \param client_p Pointer to Client struct
732	>	* \param member   Pointer to Membership struct (can be NULL)
733		* \param message  The actual message string the client wants to send
734		* \return CAN_SEND_OPV if op or voiced on channel\n
735		*         CAN_SEND_NONOP if can send to channel but is not an op\n
736		*         ERR_CANNOTSENDTOCHAN or ERR_NEEDREGGEDNICK if they cannot send to channel\n
737		*/
738		int
739	<	can_send(struct Channel *chptr, struct Client *source_p,
740	<	struct Membership *ms, const char *message)
739	>	can_send(struct Channel *chptr, struct Client *client_p,
740	>	struct Membership *member, const char *message, int notice)
741		{
742	<	struct MaskItem *conf = NULL;
742	>	const struct ResvItem *resv = NULL;
743
744	<	if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
744	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
745		return CAN_SEND_OPV;
746
747	<	if (MyClient(source_p) && !IsExemptResv(source_p))
748	<	if (!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv))
749	<	if ((conf = match_find_resv(chptr->chname)) && !resv_find_exempt(source_p, conf))
747	>	if (MyConnect(client_p) && !HasFlag(client_p, FLAGS_EXEMPTRESV))
748	>	if (!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)))
749	>	if ((resv = resv_find(chptr->name, match)) && !resv_exempt_find(client_p, resv))
750		return ERR_CANNOTSENDTOCHAN;
751
752		if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
753		return ERR_NOCTRLSONCHAN;
754	<	if (ms || (ms = find_channel_link(source_p, chptr)))
755	<	if (ms->flags & (CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE))
754	>
755	>	if (chptr->mode.mode & MODE_NOCTCP)
756	>	if (*message == '\001' && strncmp(message + 1, "ACTION ", 7))
757	>	return ERR_NOCTCP;
758	>
759	>	if (member || (member = find_channel_link(client_p, chptr)))
760	>	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
761		return CAN_SEND_OPV;
762	<	if (!ms && (chptr->mode.mode & MODE_NOPRIVMSGS))
762	>
763	>	if (!member && (chptr->mode.mode & MODE_NOPRIVMSGS))
764		return ERR_CANNOTSENDTOCHAN;
765	+
766		if (chptr->mode.mode & MODE_MODERATED)
767		return ERR_CANNOTSENDTOCHAN;
768	<	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
768	>
769	>	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(client_p, UMODE_REGISTERED))
770		return ERR_NEEDREGGEDNICK;
771
772	+	if ((chptr->mode.mode & MODE_NONOTICE) && notice)
773	+	return ERR_CANNOTSENDTOCHAN;
774	+
775		/* Cache can send if banned */
776	<	if (MyClient(source_p))
776	>	if (MyConnect(client_p))
777		{
778	<	if (ms)
778	>	if (member)
779		{
780	<	if (ms->flags & CHFL_BAN_SILENCED)
780	>	if (member->flags & CHFL_BAN_SILENCED)
781		return ERR_CANNOTSENDTOCHAN;
782
783	<	if (!(ms->flags & CHFL_BAN_CHECKED))
783	>	if (!(member->flags & CHFL_BAN_CHECKED))
784		{
785	<	if (is_banned(chptr, source_p))
785	>	if (is_banned(chptr, client_p))
786		{
787	<	ms->flags |= (CHFL_BAN_CHECKED|CHFL_BAN_SILENCED);
787	>	member->flags |= (CHFL_BAN_CHECKED | CHFL_BAN_SILENCED);
788		return ERR_CANNOTSENDTOCHAN;
789		}
790
791	<	ms->flags |= CHFL_BAN_CHECKED;
791	>	member->flags |= CHFL_BAN_CHECKED;
792		}
793		}
794	<	else if (is_banned(chptr, source_p))
794	>	else if (is_banned(chptr, client_p))
795		return ERR_CANNOTSENDTOCHAN;
796		}
797
#	Line 773 | Line 801 | can_send(struct Channel *chptr, struct C
801		/*! \brief Updates the client's oper_warn_count_down, warns the
802		*         IRC operators if necessary, and updates
803		*         join_leave_countdown as needed.
804	<	* \param source_p Pointer to struct Client to check
804	>	* \param client_p Pointer to struct Client to check
805		* \param name     Channel name or NULL if this is a part.
806		*/
807		void
808	<	check_spambot_warning(struct Client *source_p, const char *name)
808	>	check_spambot_warning(struct Client *client_p, const char *name)
809		{
810		int t_delta = 0;
811		int decrement_count = 0;
812
813		if ((GlobalSetOptions.spam_num &&
814	<	(source_p->localClient->join_leave_count >=
814	>	(client_p->connection->join_leave_count >=
815		GlobalSetOptions.spam_num)))
816		{
817	<	if (source_p->localClient->oper_warn_count_down > 0)
818	<	source_p->localClient->oper_warn_count_down--;
817	>	if (client_p->connection->oper_warn_count_down > 0)
818	>	client_p->connection->oper_warn_count_down--;
819		else
820	<	source_p->localClient->oper_warn_count_down = 0;
820	>	client_p->connection->oper_warn_count_down = 0;
821
822	<	if (source_p->localClient->oper_warn_count_down == 0)
822	>	if (client_p->connection->oper_warn_count_down == 0)
823		{
824		/* It's already known as a possible spambot */
825		if (name)
826		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
827		"User %s (%s@%s) trying to join %s is a possible spambot",
828	<	source_p->name, source_p->username,
829	<	source_p->host, name);
828	>	client_p->name, client_p->username,
829	>	client_p->host, name);
830		else
831		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
832		"User %s (%s@%s) is a possible spambot",
833	<	source_p->name, source_p->username,
834	<	source_p->host);
835	<	source_p->localClient->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
833	>	client_p->name, client_p->username,
834	>	client_p->host);
835	>	client_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
836		}
837		}
838		else
839		{
840	<	if ((t_delta = (CurrentTime - source_p->localClient->last_leave_time)) >
840	>	if ((t_delta = (CurrentTime - client_p->connection->last_leave_time)) >
841		JOIN_LEAVE_COUNT_EXPIRE_TIME)
842		{
843		decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
844	<	if (decrement_count > source_p->localClient->join_leave_count)
845	<	source_p->localClient->join_leave_count = 0;
844	>
845	>	if (decrement_count > client_p->connection->join_leave_count)
846	>	client_p->connection->join_leave_count = 0;
847		else
848	<	source_p->localClient->join_leave_count -= decrement_count;
848	>	client_p->connection->join_leave_count -= decrement_count;
849		}
850		else
851		{
852	<	if ((CurrentTime - (source_p->localClient->last_join_time)) <
852	>	if ((CurrentTime - (client_p->connection->last_join_time)) <
853		GlobalSetOptions.spam_time)
854	<	source_p->localClient->join_leave_count++;  /* It's a possible spambot */
854	>	client_p->connection->join_leave_count++;  /* It's a possible spambot */
855		}
856
857		if (name)
858	<	source_p->localClient->last_join_time = CurrentTime;
858	>	client_p->connection->last_join_time = CurrentTime;
859		else
860	<	source_p->localClient->last_leave_time = CurrentTime;
832	<	}
833	<	}
834	<
835	<	/*! \brief Compares usercount and servercount against their split
836	<	*         values and adjusts splitmode accordingly
837	<	* \param unused Unused address pointer
838	<	*/
839	<	void
840	<	check_splitmode(void *unused)
841	<	{
842	<	if (splitchecking && (ConfigChannel.no_join_on_split ||
843	<	ConfigChannel.no_create_on_split))
844	<	{
845	<	const unsigned int server = dlink_list_length(&global_serv_list);
846	<
847	<	if (!splitmode && ((server < split_servers) || (Count.total < split_users)))
848	<	{
849	<	splitmode = 1;
850	<
851	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
852	<	"Network split, activating splitmode");
853	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 10);
854	<	}
855	<	else if (splitmode && (server > split_servers) && (Count.total > split_users))
856	<	{
857	<	splitmode = 0;
858	<
859	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
860	<	"Network rejoined, deactivating splitmode");
861	<	eventDelete(check_splitmode, NULL);
862	<	}
860	>	client_p->connection->last_leave_time = CurrentTime;
861		}
862		}
863
#	Line 871 | Line 869 | check_splitmode(void *unused)
869		* \param local      Whether the topic is set by a local client
870		*/
871		void
872	<	set_channel_topic(struct Channel *chptr, const char *topic,
873	<	const char *topic_info, time_t topicts, int local)
872	>	channel_set_topic(struct Channel *chptr, const char *topic,
873	>	const char *topic_info, uintmax_t topicts, int local)
874		{
875		if (local)
876	<	strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ServerInfo.max_topic_length + 1));
876	>	strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ConfigServerInfo.max_topic_length + 1));
877		else
878		strlcpy(chptr->topic, topic, sizeof(chptr->topic));
879
#	Line 893 | Line 891 | set_channel_topic(struct Channel *chptr,
891		*                anti spambot code.
892		*/
893		void
894	<	channel_do_join_0(struct Client *source_p)
894	>	channel_do_join_0(struct Client *client_p)
895		{
896	<	dlink_node *ptr = NULL, *ptr_next = NULL;
897	<
898	<	if (source_p->channel.head)
901	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
902	<	check_spambot_warning(source_p, NULL);
896	>	if (client_p->channel.head)
897	>	if (MyConnect(client_p) && !HasUMode(client_p, UMODE_OPER))
898	>	check_spambot_warning(client_p, NULL);
899
900	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
900	>	while (client_p->channel.head)
901		{
902	<	struct Channel *chptr = ((struct Membership *)ptr->data)->chptr;
902	>	struct Membership *member = client_p->channel.head->data;
903
904	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s",
905	<	source_p->id, chptr->chname);
906	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s",
907	<	source_p->name, source_p->username,
908	<	source_p->host, chptr->chname);
904	>	sendto_server(client_p, 0, 0, ":%s PART %s",
905	>	client_p->id, member->chptr->name);
906	>	sendto_channel_local(NULL, member->chptr, 0, 0, 0, ":%s!%s@%s PART %s",
907	>	client_p->name, client_p->username,
908	>	client_p->host, member->chptr->name);
909
910	<	remove_user_from_channel(ptr->data);
910	>	remove_user_from_channel(member);
911		}
912		}
913
914		static char *
915	<	channel_find_last0(struct Client *source_p, char *chanlist)
915	>	channel_find_last0(struct Client *client_p, char *chanlist)
916		{
917		int join0 = 0;
918
#	Line 924 | Line 920 | channel_find_last0(struct Client *source
920		{
921		if (*p == '0' && (*(p + 1) == ',' || *(p + 1) == '\0'))
922		{
923	<	if ((*p + 1) == ',')
923	>	if (*(p + 1) == ',')
924		++p;
925
926		chanlist = p + 1;
#	Line 941 | Line 937 | channel_find_last0(struct Client *source
937		}
938
939		if (join0)
940	<	channel_do_join_0(source_p);
940	>	channel_do_join_0(client_p);
941
942		return chanlist;
943		}
944
945		void
946	<	channel_do_join(struct Client *source_p, char *channel, char *key_list)
946	>	channel_do_join(struct Client *client_p, char *channel, char *key_list)
947		{
948		char *p = NULL;
953	–	char *chan = NULL;
949		char *chan_list = NULL;
950		struct Channel *chptr = NULL;
951	<	struct MaskItem *conf = NULL;
952	<	const struct ClassItem *class = get_class_ptr(&source_p->localClient->confs);
951	>	const struct ResvItem *resv = NULL;
952	>	const struct ClassItem *const class = get_class_ptr(&client_p->connection->confs);
953		int i = 0;
954		unsigned int flags = 0;
955
956	<	chan_list = channel_find_last0(source_p, channel);
956	>	assert(IsClient(client_p));
957
958	<	for (chan = strtoken(&p, chan_list, ","); chan;
959	<	chan = strtoken(&p,      NULL, ","))
958	>	chan_list = channel_find_last0(client_p, channel);
959	>
960	>	for (const char *chan = strtok_r(chan_list, ",", &p); chan;
961	>	chan = strtok_r(NULL,      ",", &p))
962		{
963		const char *key = NULL;
964
#	Line 973 | Line 970 | channel_do_join(struct Client *source_p,
970		if (key && *key == '\0')
971		key = NULL;
972
973	<	if (!check_channel_name(chan, 1))
973	>	if (!channel_check_name(chan, 1))
974		{
975	<	sendto_one_numeric(source_p, &me, ERR_BADCHANNAME, chan);
975	>	sendto_one_numeric(client_p, &me, ERR_BADCHANNAME, chan);
976		continue;
977		}
978
979	<	if (!IsExemptResv(source_p) &&
980	<	!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv) &&
981	<	((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
982	<	{
983	<	++conf->count;
984	<	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON,
988	<	chan, conf->reason ? conf->reason : "Reserved channel");
989	<	sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
979	>	if (!HasFlag(client_p, FLAGS_EXEMPTRESV) &&
980	>	!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)) &&
981	>	((resv = resv_find(chan, match)) && !resv_exempt_find(client_p, resv)))
982	>	{
983	>	sendto_one_numeric(client_p, &me, ERR_CHANBANREASON, chan, resv->reason);
984	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
985		"Forbidding reserved channel %s from user %s",
986	<	chan, get_client_name(source_p, HIDE_IP));
986	>	chan, get_client_name(client_p, HIDE_IP));
987		continue;
988		}
989
990	<	if (dlink_list_length(&source_p->channel) >=
990	>	if (dlink_list_length(&client_p->channel) >=
991		((class->max_channels) ? class->max_channels : ConfigChannel.max_channels))
992		{
993	<	sendto_one_numeric(source_p, &me, ERR_TOOMANYCHANNELS, chan);
993	>	sendto_one_numeric(client_p, &me, ERR_TOOMANYCHANNELS, chan);
994		break;
995		}
996
997		if ((chptr = hash_find_channel(chan)))
998		{
999	<	if (IsMember(source_p, chptr))
999	>	if (IsMember(client_p, chptr))
1000		continue;
1001
1007	–	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1008	–	ConfigChannel.no_join_on_split)
1009	–	{
1010	–	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chan);
1011	–	continue;
1012	–	}
1013	–
1002		/*
1003		* can_join checks for +i key, bans.
1004		*/
1005	<	if ((i = can_join(source_p, chptr, key)))
1005	>	if ((i = can_join(client_p, chptr, key)))
1006		{
1007	<	sendto_one_numeric(source_p, &me, i, chptr->chname);
1007	>	sendto_one_numeric(client_p, &me, i, chptr->name);
1008		continue;
1009		}
1010
#	Line 1024 | Line 1012 | channel_do_join(struct Client *source_p,
1012		* This should never be the case unless there is some sort of
1013		* persistant channels.
1014		*/
1015	<	if (dlink_list_length(&chptr->members) == 0)
1015	>	if (!dlink_list_length(&chptr->members))
1016		flags = CHFL_CHANOP;
1017		else
1018		flags = 0;
1019		}
1020		else
1021		{
1034	–	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1035	–	(ConfigChannel.no_create_on_split || ConfigChannel.no_join_on_split))
1036	–	{
1037	–	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chan);
1038	–	continue;
1039	–	}
1040	–
1022		flags = CHFL_CHANOP;
1023	<	chptr = make_channel(chan);
1023	>	chptr = channel_make(chan);
1024		}
1025
1026	<	if (!HasUMode(source_p, UMODE_OPER))
1027	<	check_spambot_warning(source_p, chptr->chname);
1026	>	if (!HasUMode(client_p, UMODE_OPER))
1027	>	check_spambot_warning(client_p, chptr->name);
1028
1029	<	add_user_to_channel(chptr, source_p, flags, 1);
1029	>	add_user_to_channel(chptr, client_p, flags, 1);
1030
1031		/*
1032	<	*  Set timestamp if appropriate, and propagate
1032	>	* Set timestamp if appropriate, and propagate
1033		*/
1034		if (flags == CHFL_CHANOP)
1035		{
1036	<	chptr->channelts = CurrentTime;
1036	>	chptr->creationtime = CurrentTime;
1037		chptr->mode.mode |= MODE_TOPICLIMIT;
1038		chptr->mode.mode |= MODE_NOPRIVMSGS;
1039
1040	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s SJOIN %lu %s +nt :@%s",
1041	<	me.id, (unsigned long)chptr->channelts,
1042	<	chptr->chname, source_p->id);
1040	>	sendto_server(client_p, 0, 0, ":%s SJOIN %ju %s +nt :@%s",
1041	>	me.id, chptr->creationtime,
1042	>	chptr->name, client_p->id);
1043
1044		/*
1045		* Notify all other users on the new channel
1046		*/
1047	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s JOIN :%s",
1048	<	source_p->name, source_p->username,
1049	<	source_p->host, chptr->chname);
1050	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s MODE %s +nt",
1051	<	me.name, chptr->chname);
1052	<
1053	<	if (source_p->away[0])
1054	<	sendto_channel_local_butone(source_p, 0, CAP_AWAY_NOTIFY, chptr,
1055	<	":%s!%s@%s AWAY :%s",
1056	<	source_p->name, source_p->username,
1057	<	source_p->host, source_p->away);
1047	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1048	>	client_p->name, client_p->username,
1049	>	client_p->host, chptr->name, client_p->account, client_p->info);
1050	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1051	>	client_p->name, client_p->username,
1052	>	client_p->host, chptr->name);
1053	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s MODE %s +nt",
1054	>	me.name, chptr->name);
1055	>
1056	>	if (client_p->away[0])
1057	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
1058	>	":%s!%s@%s AWAY :%s",
1059	>	client_p->name, client_p->username,
1060	>	client_p->host, client_p->away);
1061		}
1062		else
1063		{
1064	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s JOIN %lu %s +",
1065	<	source_p->id, (unsigned long)chptr->channelts,
1066	<	chptr->chname);
1067	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s JOIN :%s",
1068	<	source_p->name, source_p->username,
1069	<	source_p->host, chptr->chname);
1070	<
1071	<	if (source_p->away[0])
1072	<	sendto_channel_local_butone(source_p, 0, CAP_AWAY_NOTIFY, chptr,
1073	<	":%s!%s@%s AWAY :%s",
1074	<	source_p->name, source_p->username,
1075	<	source_p->host, source_p->away);
1064	>	sendto_server(client_p, 0, 0, ":%s JOIN %ju %s +",
1065	>	client_p->id, chptr->creationtime,
1066	>	chptr->name);
1067	>
1068	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1069	>	client_p->name, client_p->username,
1070	>	client_p->host, chptr->name, client_p->account, client_p->info);
1071	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1072	>	client_p->name, client_p->username,
1073	>	client_p->host, chptr->name);
1074	>
1075	>	if (client_p->away[0])
1076	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
1077	>	":%s!%s@%s AWAY :%s",
1078	>	client_p->name, client_p->username,
1079	>	client_p->host, client_p->away);
1080		}
1081
1082	<	del_invite(chptr, source_p);
1082	>	del_invite(chptr, client_p);
1083
1084		if (chptr->topic[0])
1085		{
1086	<	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->chname, chptr->topic);
1087	<	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->chname,
1086	>	sendto_one_numeric(client_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1087	>	sendto_one_numeric(client_p, &me, RPL_TOPICWHOTIME, chptr->name,
1088		chptr->topic_info, chptr->topic_time);
1089		}
1090
1091	<	channel_member_names(source_p, chptr, 1);
1091	>	channel_member_names(client_p, chptr, 1);
1092
1093	<	source_p->localClient->last_join_time = CurrentTime;
1093	>	client_p->connection->last_join_time = CurrentTime;
1094		}
1095		}
1096
1097		/*! \brief Removes a client from a specific channel
1098	<	* \param source_p Pointer to source client to remove
1098	>	* \param client_p Pointer to source client to remove
1099		* \param name     Name of channel to remove from
1100		* \param reason   Part reason to show
1101		*/
1102		static void
1103	<	channel_part_one_client(struct Client *source_p, const char *name, const char *reason)
1103	>	channel_part_one_client(struct Client *client_p, const char *name, const char *reason)
1104		{
1105		struct Channel *chptr = NULL;
1106	<	struct Membership *ms = NULL;
1106	>	struct Membership *member = NULL;
1107
1108		if ((chptr = hash_find_channel(name)) == NULL)
1109		{
1110	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, name);
1110	>	sendto_one_numeric(client_p, &me, ERR_NOSUCHCHANNEL, name);
1111		return;
1112		}
1113
1114	<	if ((ms = find_channel_link(source_p, chptr)) == NULL)
1114	>	if ((member = find_channel_link(client_p, chptr)) == NULL)
1115		{
1116	<	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->chname);
1116	>	sendto_one_numeric(client_p, &me, ERR_NOTONCHANNEL, chptr->name);
1117		return;
1118		}
1119
1120	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
1121	<	check_spambot_warning(source_p, NULL);
1120	>	if (MyConnect(client_p) && !HasUMode(client_p, UMODE_OPER))
1121	>	check_spambot_warning(client_p, NULL);
1122
1123		/*
1124		* Remove user from the old channel (if any)
1125		* only allow /part reasons in -m chans
1126		*/
1127	<	if (*reason && (!MyConnect(source_p) ||
1128	<	((can_send(chptr, source_p, ms, reason) &&
1129	<	(source_p->localClient->firsttime + ConfigFileEntry.anti_spam_exit_message_time)
1130	<	< CurrentTime))))
1131	<	{
1132	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s :%s",
1133	<	source_p->id, chptr->chname, reason);
1134	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s :%s",
1135	<	source_p->name, source_p->username,
1136	<	source_p->host, chptr->chname, reason);
1127	>	if (*reason && (!MyConnect(client_p) ||
1128	>	((client_p->connection->firsttime +
1129	>	ConfigGeneral.anti_spam_exit_message_time) < CurrentTime &&
1130	>	can_send(chptr, client_p, member, reason, 0) < 0)))
1131	>	{
1132	>	sendto_server(client_p, 0, 0, ":%s PART %s :%s",
1133	>	client_p->id, chptr->name, reason);
1134	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s :%s",
1135	>	client_p->name, client_p->username,
1136	>	client_p->host, chptr->name, reason);
1137		}
1138		else
1139		{
1140	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s",
1141	<	source_p->id, chptr->chname);
1142	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s",
1143	<	source_p->name, source_p->username,
1144	<	source_p->host, chptr->chname);
1140	>	sendto_server(client_p, 0, 0, ":%s PART %s",
1141	>	client_p->id, chptr->name);
1142	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s",
1143	>	client_p->name, client_p->username,
1144	>	client_p->host, chptr->name);
1145		}
1146
1147	<	remove_user_from_channel(ms);
1147	>	remove_user_from_channel(member);
1148		}
1149
1150		void
1151	<	channel_do_part(struct Client *source_p, char *channel, char *reason)
1151	>	channel_do_part(struct Client *client_p, char *channel, const char *reason)
1152		{
1153		char *p = NULL, *name = NULL;
1154	<	char reasonbuf[KICKLEN + 1] = "";
1154	>	char buf[KICKLEN + 1] = "";
1155	>
1156	>	assert(IsClient(client_p));
1157
1158		if (!EmptyString(reason))
1159	<	strlcpy(reasonbuf, reason, sizeof(reasonbuf));
1159	>	strlcpy(buf, reason, sizeof(buf));
1160
1161	<	for (name = strtoken(&p, channel, ","); name;
1162	<	name = strtoken(&p,    NULL, ","))
1163	<	channel_part_one_client(source_p, name, reasonbuf);
1161	>	for (name = strtok_r(channel, ",", &p); name;
1162	>	name = strtok_r(NULL,    ",", &p))
1163	>	channel_part_one_client(client_p, name, buf);
1164		}

Diff Legend

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