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 5983 by michael, Mon May 25 15:24:48 2015 UTC vs.
Revision 8702 by michael, Sat Dec 8 16:34:40 2018 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-2018 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 39 | Line 40
40		#include "send.h"
41		#include "event.h"
42		#include "memory.h"
42	–	#include "mempool.h"
43		#include "misc.h"
44	–	#include "resv.h"
44
45
46	<	dlink_list channel_list;
47	<	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	<
57	<	static mp_pool_t *member_pool, *channel_pool;
46	>	/** Doubly linked list containing a list of all channels. */
47	>	static dlink_list channel_list;
48
49
50	<	/*! \brief Initializes the channel blockheap, adds known channel CAPAB
50	>	/*! \brief Returns the channel_list as constant
51	>	* \return channel_list
52		*/
53	<	void
54	<	channel_init(void)
53	>	const dlink_list *
54	>	channel_get_list(void)
55		{
56	<	add_capability("EX", CAP_EX);
66	<	add_capability("IE", CAP_IE);
67	<
68	<	channel_pool = mp_pool_new(sizeof(struct Channel), MP_CHUNK_SIZE_CHANNEL);
69	<	ban_pool = mp_pool_new(sizeof(struct Ban), MP_CHUNK_SIZE_BAN);
70	<	member_pool = mp_pool_new(sizeof(struct Membership), MP_CHUNK_SIZE_MEMBER);
56	>	return &channel_list;
57		}
58
59		/*! \brief Adds a user to a channel by adding another link to the
60		*         channels member chain.
61		* \param chptr      Pointer to channel to add client to
62	<	* \param who        Pointer to client (who) to add
62	>	* \param client_p   Pointer to client (who) to add
63		* \param flags      Flags for chanops etc
64		* \param flood_ctrl Whether to count this join in flood calculations
65		*/
66		void
67	<	add_user_to_channel(struct Channel *chptr, struct Client *who,
68	<	unsigned int flags, int flood_ctrl)
67	>	add_user_to_channel(struct Channel *chptr, struct Client *client_p,
68	>	unsigned int flags, bool flood_ctrl)
69		{
70	<	struct Membership *member = NULL;
85	<
86	<	assert(IsClient(who));
70	>	assert(IsClient(client_p));
71
72	<	if (GlobalSetOptions.joinfloodtime > 0)
72	>	if (GlobalSetOptions.joinfloodtime)
73		{
74	<	if (flood_ctrl)
74	>	if (flood_ctrl == true)
75		++chptr->number_joined;
76
77		chptr->number_joined -= (CurrentTime - chptr->last_join_time) *
#	Line 108 | Line 92 | add_user_to_channel(struct Channel *chpt
92		SetJoinFloodNoticed(chptr);
93		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
94		"Possible Join Flooder %s on %s target: %s",
95	<	get_client_name(who, HIDE_IP),
96	<	who->servptr->name, chptr->name);
95	>	client_get_name(client_p, HIDE_IP),
96	>	client_p->servptr->name, chptr->name);
97		}
98		}
99
100		chptr->last_join_time = CurrentTime;
101		}
102
103	<	member = mp_pool_get(member_pool);
104	<	member->client_p = who;
103	>	struct Membership *member = xcalloc(sizeof(*member));
104	>	member->client_p = client_p;
105		member->chptr = chptr;
106		member->flags = flags;
107
108		dlinkAdd(member, &member->channode, &chptr->members);
109
110	<	if (MyConnect(who))
111	<	dlinkAdd(member, &member->locchannode, &chptr->locmembers);
110	>	if (MyConnect(client_p))
111	>	dlinkAdd(member, &member->locchannode, &chptr->members_local);
112
113	<	dlinkAdd(member, &member->usernode, &who->channel);
113	>	dlinkAdd(member, &member->usernode, &client_p->channel);
114		}
115
116		/*! \brief Deletes an user from a channel by removing a link in the
#	Line 142 | Line 126 | remove_user_from_channel(struct Membersh
126		dlinkDelete(&member->channode, &chptr->members);
127
128		if (MyConnect(client_p))
129	<	dlinkDelete(&member->locchannode, &chptr->locmembers);
129	>	dlinkDelete(&member->locchannode, &chptr->members_local);
130
131		dlinkDelete(&member->usernode, &client_p->channel);
132
133	<	mp_pool_release(member);
133	>	xfree(member);
134
135		if (chptr->members.head == NULL)
136	<	destroy_channel(chptr);
136	>	channel_free(chptr);
137		}
138
139	<	/* send_members()
139	>	/* channel_send_members()
140		*
141		* inputs       -
142		* output       - NONE
143		* side effects -
144		*/
145		static void
146	<	send_members(struct Client *client_p, const struct Channel *chptr,
147	<	char *modebuf, char *parabuf)
146	>	channel_send_members(struct Client *client_p, const struct Channel *chptr,
147	>	const char *modebuf, const char *parabuf)
148		{
149	+	dlink_node *node;
150		char buf[IRCD_BUFSIZE] = "";
166	–	const dlink_node *node = NULL;
151		int tlen;              /* length of text to append */
152		char *t, *start;       /* temp char pointer */
153
154	<	start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %lu %s %s %s:",
155	<	me.id, (unsigned long)chptr->creationtime,
154	>	start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %ju %s %s %s:",
155	>	me.id, chptr->creationtime,
156		chptr->name, modebuf, parabuf);
157
158		DLINK_FOREACH(node, chptr->members.head)
#	Line 210 | Line 194 | send_members(struct Client *client_p, co
194
195		/* Should always be non-NULL unless we have a kind of persistent channels */
196		if (chptr->members.head)
197	<	t--;  /* Take the space out */
197	>	--t;  /* Take the space out */
198		*t = '\0';
199		sendto_one(client_p, "%s", buf);
200		}
#	Line 222 | Line 206 | send_members(struct Client *client_p, co
206		* \param flag     Char flag flagging type of mode. Currently this can be 'b', e' or 'I'
207		*/
208		static void
209	<	send_mode_list(struct Client *client_p, const struct Channel *chptr,
210	<	const dlink_list *list, const char flag)
209	>	channel_send_mask_list(struct Client *client_p, const struct Channel *chptr,
210	>	const dlink_list *list, const char flag)
211		{
212	<	const dlink_node *node = NULL;
212	>	dlink_node *node;
213		char mbuf[IRCD_BUFSIZE] = "";
214		char pbuf[IRCD_BUFSIZE] = "";
215		int tlen, mlen, cur_len;
216		char *pp = pbuf;
217
218	<	if (!list->length)
218	>	if (dlink_list_length(list) == 0)
219		return;
220
221	<	mlen = snprintf(mbuf, sizeof(mbuf), ":%s BMASK %lu %s %c :", me.id,
222	<	(unsigned long)chptr->creationtime, chptr->name, flag);
221	>	mlen = snprintf(mbuf, sizeof(mbuf), ":%s BMASK %ju %s %c :", me.id,
222	>	chptr->creationtime, chptr->name, flag);
223		cur_len = mlen;
224
225		DLINK_FOREACH(node, list->head)
#	Line 269 | Line 253 | send_mode_list(struct Client *client_p,
253		* \param chptr    Pointer to channel pointer
254		*/
255		void
256	<	send_channel_modes(struct Client *client_p, struct Channel *chptr)
256	>	channel_send_modes(struct Client *client_p, const struct Channel *chptr)
257		{
258		char modebuf[MODEBUFLEN] = "";
259		char parabuf[MODEBUFLEN] = "";
260
261		channel_modes(chptr, client_p, modebuf, parabuf);
262	<	send_members(client_p, chptr, modebuf, parabuf);
262	>	channel_send_members(client_p, chptr, modebuf, parabuf);
263
264	<	send_mode_list(client_p, chptr, &chptr->banlist, 'b');
265	<	send_mode_list(client_p, chptr, &chptr->exceptlist, 'e');
266	<	send_mode_list(client_p, chptr, &chptr->invexlist, 'I');
264	>	channel_send_mask_list(client_p, chptr, &chptr->banlist, 'b');
265	>	channel_send_mask_list(client_p, chptr, &chptr->exceptlist, 'e');
266	>	channel_send_mask_list(client_p, chptr, &chptr->invexlist, 'I');
267		}
268
269		/*! \brief Check channel name for invalid characters
#	Line 287 | Line 271 | send_channel_modes(struct Client *client
271		* \param local Indicates whether it's a local or remote creation
272		* \return 0 if invalid, 1 otherwise
273		*/
274	<	int
275	<	check_channel_name(const char *name, const int local)
274	>	bool
275	>	channel_check_name(const char *name, bool local)
276		{
277		const char *p = name;
278
279		assert(!EmptyString(p));
280
281		if (!IsChanPrefix(*p))
282	<	return 0;
282	>	return false;
283
284	<	if (!local || !ConfigChannel.disable_fake_channels)
284	>	if (local == false || ConfigChannel.disable_fake_channels == 0)
285		{
286		while (*++p)
287		if (!IsChanChar(*p))
288	<	return 0;
288	>	return false;
289		}
290		else
291		{
292		while (*++p)
293		if (!IsVisibleChanChar(*p))
294	<	return 0;
294	>	return false;
295		}
296
297		return p - name <= CHANNELLEN;
#	Line 317 | Line 301 | void
301		remove_ban(struct Ban *ban, dlink_list *list)
302		{
303		dlinkDelete(&ban->node, list);
304	<	mp_pool_release(ban);
304	>	xfree(ban);
305		}
306
307	<	/* free_channel_list()
307	>	/* channel_free_mask_list()
308		*
309		* inputs       - pointer to dlink_list
310		* output       - NONE
311		* side effects -
312		*/
313	<	void
314	<	free_channel_list(dlink_list *list)
313	>	static void
314	>	channel_free_mask_list(dlink_list *list)
315		{
316	<	dlink_node *node = NULL, *node_next = NULL;
317	<
318	<	DLINK_FOREACH_SAFE(node, node_next, list->head)
319	<	remove_ban(node->data, list);
316	>	while (list->head)
317	>	{
318	>	struct Ban *ban = list->head->data;
319	>	remove_ban(ban, list);
320	>	}
321		}
322
323		/*! \brief Get Channel block for name (and allocate a new channel
#	Line 341 | Line 326 | free_channel_list(dlink_list *list)
326		* \return Channel block
327		*/
328		struct Channel *
329	<	make_channel(const char *name)
329	>	channel_make(const char *name)
330		{
346	–	struct Channel *chptr = NULL;
347	–
331		assert(!EmptyString(name));
332
333	<	chptr = mp_pool_get(channel_pool);
334	<
333	>	struct Channel *chptr = xcalloc(sizeof(*chptr));
334	>	chptr->hnextch = chptr;
335		/* Doesn't hurt to set it here */
336		chptr->creationtime = CurrentTime;
337		chptr->last_join_time = CurrentTime;
338
339	<	strlcpy(chptr->name, name, sizeof(chptr->name));
340	<	dlinkAdd(chptr, &chptr->node, &channel_list);
339	>	/* Cache channel name length to avoid repetitive strlen() calls. */
340	>	chptr->name_len = strlcpy(chptr->name, name, sizeof(chptr->name));
341	>	if (chptr->name_len >= sizeof(chptr->name))
342	>	chptr->name_len = sizeof(chptr->name) - 1;
343
344	+	dlinkAdd(chptr, &chptr->node, &channel_list);
345		hash_add_channel(chptr);
346
347		return chptr;
#	Line 365 | Line 351 | make_channel(const char *name)
351		* \param chptr Channel pointer
352		*/
353		void
354	<	destroy_channel(struct Channel *chptr)
354	>	channel_free(struct Channel *chptr)
355		{
356	<	clear_invites_channel(chptr);
356	>	clear_invite_list(&chptr->invites);
357
358		/* Free ban/exception/invex lists */
359	<	free_channel_list(&chptr->banlist);
360	<	free_channel_list(&chptr->exceptlist);
361	<	free_channel_list(&chptr->invexlist);
359	>	channel_free_mask_list(&chptr->banlist);
360	>	channel_free_mask_list(&chptr->exceptlist);
361	>	channel_free_mask_list(&chptr->invexlist);
362
363		dlinkDelete(&chptr->node, &channel_list);
364		hash_del_channel(chptr);
365
366	<	mp_pool_release(chptr);
366	>	assert(chptr->hnextch == chptr);
367	>
368	>	assert(chptr->node.prev == NULL);
369	>	assert(chptr->node.next == NULL);
370	>
371	>	assert(dlink_list_length(&chptr->members_local) == 0);
372	>	assert(chptr->members_local.head == NULL);
373	>	assert(chptr->members_local.tail == NULL);
374	>
375	>	assert(dlink_list_length(&chptr->members) == 0);
376	>	assert(chptr->members.head == NULL);
377	>	assert(chptr->members.tail == NULL);
378	>
379	>	assert(dlink_list_length(&chptr->invites) == 0);
380	>	assert(chptr->invites.head == NULL);
381	>	assert(chptr->invites.tail == NULL);
382	>
383	>	assert(dlink_list_length(&chptr->banlist) == 0);
384	>	assert(chptr->banlist.head == NULL);
385	>	assert(chptr->banlist.tail == NULL);
386	>
387	>	assert(dlink_list_length(&chptr->exceptlist) == 0);
388	>	assert(chptr->exceptlist.head == NULL);
389	>	assert(chptr->exceptlist.tail == NULL);
390	>
391	>	assert(dlink_list_length(&chptr->invexlist) == 0);
392	>	assert(chptr->invexlist.head == NULL);
393	>	assert(chptr->invexlist.tail == NULL);
394	>
395	>	xfree(chptr);
396		}
397
398		/*!
#	Line 395 | Line 410 | channel_pub_or_secret(const struct Chann
410		}
411
412		/*! \brief lists all names on given channel
413	<	* \param source_p Pointer to client struct requesting names
413	>	* \param client_p Pointer to client struct requesting names
414		* \param chptr    Pointer to channel block
415		* \param show_eon Show RPL_ENDOFNAMES numeric or not
416		*                 (don't want it with /names with no params)
417		*/
418		void
419	<	channel_member_names(struct Client *source_p, struct Channel *chptr,
405	<	int show_eon)
419	>	channel_member_names(struct Client *client_p, struct Channel *chptr, bool show_eon)
420		{
421	<	const dlink_node *node = NULL;
421	>	dlink_node *node;
422		char buf[IRCD_BUFSIZE + 1] = "";
423		char *t = NULL, *start = NULL;
424		int tlen = 0;
425	<	const int is_member = IsMember(source_p, chptr);
426	<	const int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
427	<	const int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
425	>	bool is_member = IsMember(client_p, chptr);
426	>	bool multi_prefix = HasCap(client_p, CAP_MULTI_PREFIX) != 0;
427	>	bool uhnames = HasCap(client_p, CAP_UHNAMES) != 0;
428
429	<	assert(IsClient(source_p));
429	>	assert(IsClient(client_p));
430
431	<	if (PubChannel(chptr) || is_member)
431	>	if (PubChannel(chptr) || is_member == true)
432		{
433		t = buf + snprintf(buf, sizeof(buf), numeric_form(RPL_NAMREPLY),
434	<	me.name, source_p->name,
434	>	me.name, client_p->name,
435		channel_pub_or_secret(chptr), chptr->name);
436		start = t;
437
#	Line 425 | Line 439 | channel_member_names(struct Client *sour
439		{
440		const struct Membership *member = node->data;
441
442	<	if (HasUMode(member->client_p, UMODE_INVISIBLE) && !is_member)
442	>	if (HasUMode(member->client_p, UMODE_INVISIBLE) && is_member == false)
443		continue;
444
445	<	if (!uhnames)
432	<	tlen = strlen(member->client_p->name) + 1;  /* +1 for space */
433	<	else
445	>	if (uhnames == true)
446		tlen = strlen(member->client_p->name) + strlen(member->client_p->username) +
447		strlen(member->client_p->host) + 3;  /* +3 for ! + @ + space */
436	–
437	–	if (!multi_prefix)
438	–	{
439	–	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
440	–	++tlen;
441	–	}
448		else
449	+	tlen = strlen(member->client_p->name) + 1;  /* +1 for space */
450	+
451	+	if (multi_prefix == true)
452		{
453		if (member->flags & CHFL_CHANOP)
454		++tlen;
#	Line 448 | Line 457 | channel_member_names(struct Client *sour
457		if (member->flags & CHFL_VOICE)
458		++tlen;
459		}
460	+	else
461	+	{
462	+	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
463	+	++tlen;
464	+	}
465
466		if (t + tlen - buf > IRCD_BUFSIZE - 2)
467		{
468		*(t - 1) = '\0';
469	<	sendto_one(source_p, "%s", buf);
469	>	sendto_one(client_p, "%s", buf);
470		t = start;
471		}
472
473	<	if (!uhnames)
460	<	t += sprintf(t, "%s%s ", get_member_status(member, multi_prefix),
461	<	member->client_p->name);
462	<	else
473	>	if (uhnames == true)
474		t += sprintf(t, "%s%s!%s@%s ", get_member_status(member, multi_prefix),
475		member->client_p->name, member->client_p->username,
476		member->client_p->host);
477	+	else
478	+	t += sprintf(t, "%s%s ", get_member_status(member, multi_prefix),
479	+	member->client_p->name);
480		}
481
482		if (tlen)
483		{
484		*(t - 1) = '\0';
485	<	sendto_one(source_p, "%s", buf);
485	>	sendto_one(client_p, "%s", buf);
486		}
487		}
488
489	<	if (show_eon)
490	<	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->name);
489	>	if (show_eon == true)
490	>	sendto_one_numeric(client_p, &me, RPL_ENDOFNAMES, chptr->name);
491		}
492
493	<	/*! \brief Adds client to invite list
494	<	* \param chptr Pointer to channel block
481	<	* \param who   Pointer to client to add invite to
482	<	*/
483	<	void
484	<	add_invite(struct Channel *chptr, struct Client *who)
493	>	static struct Invite *
494	>	find_invite(struct Channel *chptr, struct Client *client_p)
495		{
496	<	assert(IsClient(who));
496	>	dlink_node *node, *node_next;
497	>	dlink_list *list;
498
499	<	del_invite(chptr, who);
499	>	/* Take the shortest of the two lists */
500	>	if (dlink_list_length(&client_p->connection->invited) < dlink_list_length(&chptr->invites))
501	>	list = &client_p->connection->invited;
502	>	else
503	>	list = &chptr->invites;
504
505	<	/*
506	<	* Delete last link in chain if the list is max length
507	<	*/
493	<	if (dlink_list_length(&who->connection->invited) >=
494	<	ConfigChannel.max_channels)
495	<	del_invite(who->connection->invited.tail->data, who);
505	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
506	>	{
507	>	struct Invite *invite = node->data;
508
509	<	/* Add client to channel invite list */
510	<	dlinkAdd(who, make_dlink_node(), &chptr->invites);
509	>	if (ConfigChannel.invite_expire_time &&
510	>	ConfigChannel.invite_expire_time + invite->when < CurrentTime)
511	>	del_invite(invite);
512	>	else if (invite->chptr == chptr && invite->client_p == client_p)
513	>	return invite;
514	>	}
515
516	<	/* Add channel to the end of the client invite list */
501	<	dlinkAdd(chptr, make_dlink_node(), &who->connection->invited);
516	>	return NULL;
517		}
518
519	<	/*! \brief Delete Invite block from channel invite list
520	<	*         and client invite list
521	<	* \param chptr Pointer to Channel struct
507	<	* \param who   Pointer to client to remove invites from
519	>	/*! \brief Adds client to invite list
520	>	* \param chptr    Pointer to channel block
521	>	* \param client_p Pointer to client to add invite to
522		*/
523		void
524	<	del_invite(struct Channel *chptr, struct Client *who)
524	>	add_invite(struct Channel *chptr, struct Client *client_p)
525		{
526	<	dlink_node *node = NULL;
526	>	struct Invite *invite;
527	>	if ((invite = find_invite(chptr, client_p)))
528	>	del_invite(invite);
529	>
530	>	invite = xcalloc(sizeof(*invite));
531	>	invite->client_p = client_p;
532	>	invite->chptr = chptr;
533	>	invite->when = CurrentTime;
534	>
535	>	/* Delete last link in chain if the list is max length */
536	>	while (dlink_list_length(&client_p->connection->invited) &&
537	>	dlink_list_length(&client_p->connection->invited) >= ConfigChannel.max_invites)
538	>	del_invite(client_p->connection->invited.tail->data);
539
540	<	if ((node = dlinkFindDelete(&who->connection->invited, chptr)))
541	<	free_dlink_node(node);
540	>	/* Add client to channel invite list */
541	>	dlinkAdd(invite, &invite->chan_node, &chptr->invites);
542
543	<	if ((node = dlinkFindDelete(&chptr->invites, who)))
544	<	free_dlink_node(node);
543	>	/* Add channel to the end of the client invite list */
544	>	dlinkAdd(invite, &invite->user_node, &client_p->connection->invited);
545		}
546
547	<	/*! \brief Removes all invites of a specific channel
548	<	* \param chptr Pointer to Channel struct
547	>	/*! \brief Delete Invite block from channel invite list
548	>	*         and client invite list
549	>	* \param invite Pointer to Invite struct
550		*/
551		void
552	<	clear_invites_channel(struct Channel *chptr)
552	>	del_invite(struct Invite *invite)
553		{
554	<	dlink_node *node = NULL, *node_next = NULL;
554	>	dlinkDelete(&invite->user_node, &invite->client_p->connection->invited);
555	>	dlinkDelete(&invite->chan_node, &invite->chptr->invites);
556
557	<	DLINK_FOREACH_SAFE(node, node_next, chptr->invites.head)
558	<	del_invite(chptr, node->data);
557	>	/* Release memory pointed to by 'invite' */
558	>	xfree(invite);
559		}
560
561	<	/*! \brief Removes all invites of a specific client
562	<	* \param source_p Pointer to Client struct
561	>	/*! \brief Removes and frees all Invite blocks from a list
562	>	* \param list Pointer to a dlink_list
563		*/
564		void
565	<	clear_invites_client(struct Client *source_p)
565	>	clear_invite_list(dlink_list *list)
566		{
567	<	dlink_node *node = NULL, *node_next = NULL;
568	<
541	<	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
542	<	del_invite(node->data, source_p);
567	>	while (list->head)
568	>	del_invite(list->head->data);
569		}
570
571		/* get_member_status()
#	Line 551 | Line 577 | clear_invites_client(struct Client *sour
577		* side effects -
578		*
579		* NOTE: Returned string is usually a static buffer
580	<	* (like in get_client_name)
580	>	* (like in client_get_name)
581		*/
582		const char *
583	<	get_member_status(const struct Membership *member, const int combine)
583	>	get_member_status(const struct Membership *member, bool combine)
584		{
585	<	static char buffer[4];  /* 4 for @%+\0 */
585	>	static char buffer[CMEMBER_STATUS_FLAGS_LEN + 1];  /* +1 for \0 */
586		char *p = buffer;
587
588		if (member->flags & CHFL_CHANOP)
589		{
590	<	if (!combine)
590	>	if (combine == false)
591		return "@";
592		*p++ = '@';
593		}
594
595		if (member->flags & CHFL_HALFOP)
596		{
597	<	if (!combine)
597	>	if (combine == false)
598		return "%";
599		*p++ = '%';
600		}
#	Line 581 | Line 607 | get_member_status(const struct Membershi
607		}
608
609		/*!
610	<	* \param who  Pointer to Client to check
611	<	* \param list Pointer to ban list to search
610	>	* \param client_p Pointer to Client to check
611	>	* \param list     Pointer to ban list to search
612		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
613		*/
614	<	static int
615	<	find_bmask(const struct Client *who, const dlink_list *const list)
614	>	static bool
615	>	find_bmask(const struct Client *client_p, const dlink_list *list)
616		{
617	<	const dlink_node *node = NULL;
617	>	dlink_node *node;
618
619		DLINK_FOREACH(node, list->head)
620		{
621		const struct Ban *ban = node->data;
622
623	<	if (!match(ban->name, who->name) && !match(ban->user, who->username))
623	>	if (match(ban->name, client_p->name) == 0 && match(ban->user, client_p->username) == 0)
624		{
625		switch (ban->type)
626		{
627		case HM_HOST:
628	<	if (!match(ban->host, who->host) || !match(ban->host, who->sockhost))
629	<	return 1;
628	>	if (match(ban->host, client_p->host) == 0 || match(ban->host, client_p->sockhost) == 0)
629	>	return true;
630		break;
631		case HM_IPV4:
632	<	if (who->connection->aftype == AF_INET)
633	<	if (match_ipv4(&who->connection->ip, &ban->addr, ban->bits))
634	<	return 1;
632	>	if (client_p->ip.ss.ss_family == AF_INET)
633	>	if (match_ipv4(&client_p->ip, &ban->addr, ban->bits))
634	>	return true;
635		break;
636		case HM_IPV6:
637	<	if (who->connection->aftype == AF_INET6)
638	<	if (match_ipv6(&who->connection->ip, &ban->addr, ban->bits))
639	<	return 1;
637	>	if (client_p->ip.ss.ss_family == AF_INET6)
638	>	if (match_ipv6(&client_p->ip, &ban->addr, ban->bits))
639	>	return true;
640		break;
641		default:
642		assert(0);
#	Line 618 | Line 644 | find_bmask(const struct Client *who, con
644		}
645		}
646
647	<	return 0;
647	>	return false;
648		}
649
650		/*!
651	<	* \param chptr Pointer to channel block
652	<	* \param who   Pointer to client to check access fo
651	>	* \param chptr    Pointer to channel block
652	>	* \param client_p Pointer to client to check access fo
653		* \return 0 if not banned, 1 otherwise
654		*/
655	<	int
656	<	is_banned(const struct Channel *chptr, const struct Client *who)
655	>	bool
656	>	is_banned(const struct Channel *chptr, const struct Client *client_p)
657		{
658	<	if (find_bmask(who, &chptr->banlist))
659	<	if (!find_bmask(who, &chptr->exceptlist))
660	<	return 1;
658	>	if (find_bmask(client_p, &chptr->banlist) == true)
659	>	if (find_bmask(client_p, &chptr->exceptlist) == false)
660	>	return true;
661
662	<	return 0;
662	>	return false;
663		}
664
665		/*! Tests if a client can join a certain channel
666	<	* \param source_p Pointer to client attempting to join
666	>	* \param client_p Pointer to client attempting to join
667		* \param chptr    Pointer to channel
668		* \param key      Key sent by client attempting to join if present
669		* \return ERR_BANNEDFROMCHAN, ERR_INVITEONLYCHAN, ERR_CHANNELISFULL
670		*         or 0 if allowed to join.
671		*/
672	<	int
673	<	can_join(struct Client *source_p, const struct Channel *chptr, const char *key)
672	>	static int
673	>	can_join(struct Client *client_p, struct Channel *chptr, const char *key)
674		{
675	<	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
675	>	if (HasCMode(chptr, MODE_SSLONLY) && !HasUMode(client_p, UMODE_SSL))
676		return ERR_SSLONLYCHAN;
677
678	<	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(source_p, UMODE_REGISTERED))
678	>	if (HasCMode(chptr, MODE_REGONLY) && !HasUMode(client_p, UMODE_REGISTERED))
679		return ERR_NEEDREGGEDNICK;
680
681	<	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(source_p, UMODE_OPER))
681	>	if (HasCMode(chptr, MODE_OPERONLY) && !HasUMode(client_p, UMODE_OPER))
682		return ERR_OPERONLYCHAN;
683
684	<	if (chptr->mode.mode & MODE_INVITEONLY)
685	<	if (!dlinkFind(&source_p->connection->invited, chptr))
686	<	if (!find_bmask(source_p, &chptr->invexlist))
684	>	if (HasCMode(chptr, MODE_INVITEONLY))
685	>	if (find_invite(chptr, client_p) == NULL)
686	>	if (find_bmask(client_p, &chptr->invexlist) == false)
687		return ERR_INVITEONLYCHAN;
688
689	<	if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
689	>	if (chptr->mode.key[0] && (key == NULL || strcmp(chptr->mode.key, key)))
690		return ERR_BADCHANNELKEY;
691
692		if (chptr->mode.limit && dlink_list_length(&chptr->members) >=
693		chptr->mode.limit)
694		return ERR_CHANNELISFULL;
695
696	<	if (is_banned(chptr, source_p))
696	>	if (is_banned(chptr, client_p) == true)
697		return ERR_BANNEDFROMCHAN;
698
699		return 0;
#	Line 680 | Line 706 | has_member_flags(const struct Membership
706		}
707
708		struct Membership *
709	<	find_channel_link(struct Client *client_p, struct Channel *chptr)
709	>	find_channel_link(const struct Client *client_p, const struct Channel *chptr)
710		{
711	<	dlink_node *node = NULL;
711	>	dlink_node *node;
712
713		if (!IsClient(client_p))
714		return NULL;
715
716	+	/* Take the shortest of the two lists */
717		if (dlink_list_length(&chptr->members) < dlink_list_length(&client_p->channel))
718		{
719		DLINK_FOREACH(node, chptr->members.head)
#	Line 707 | Line 734 | find_channel_link(struct Client *client_
734		* \param message The actual message string the client wants to send
735		* \return 1 if the message does contain any control codes, 0 otherwise
736		*/
737	<	static int
737	>	static bool
738		msg_has_ctrls(const char *message)
739		{
740		const unsigned char *p = (const unsigned char *)message;
#	Line 728 | Line 755 | msg_has_ctrls(const char *message)
755		}
756		}
757
758	<	return 1;  /* Control code */
758	>	return true;  /* Control code */
759		}
760
761	<	return 0;  /* No control code found */
761	>	return false;  /* No control code found */
762		}
763
764		/*! Tests if a client can send to a channel
765		* \param chptr    Pointer to Channel struct
766	<	* \param source_p Pointer to Client struct
766	>	* \param client_p Pointer to Client struct
767		* \param member   Pointer to Membership struct (can be NULL)
768		* \param message  The actual message string the client wants to send
769		* \return CAN_SEND_OPV if op or voiced on channel\n
#	Line 744 | Line 771 | msg_has_ctrls(const char *message)
771		*         ERR_CANNOTSENDTOCHAN or ERR_NEEDREGGEDNICK if they cannot send to channel\n
772		*/
773		int
774	<	can_send(struct Channel *chptr, struct Client *source_p,
775	<	struct Membership *member, const char *message)
774	>	can_send(struct Channel *chptr, struct Client *client_p,
775	>	struct Membership *member, const char *message, bool notice)
776		{
777	<	const struct MaskItem *conf = NULL;
777	>	const struct ResvItem *resv = NULL;
778
779	<	if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
779	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
780		return CAN_SEND_OPV;
781
782	<	if (MyClient(source_p) && !IsExemptResv(source_p))
783	<	if (!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv))
784	<	if ((conf = match_find_resv(chptr->name)) && !resv_find_exempt(source_p, conf))
782	>	if (MyConnect(client_p) && !HasFlag(client_p, FLAGS_EXEMPTRESV))
783	>	if (!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)))
784	>	if ((resv = resv_find(chptr->name, match)) && resv_exempt_find(client_p, resv) == false)
785		return ERR_CANNOTSENDTOCHAN;
786
787	<	if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
787	>	if (HasCMode(chptr, MODE_NOCTRL) && msg_has_ctrls(message) == true)
788		return ERR_NOCTRLSONCHAN;
789
790	<	if (chptr->mode.mode & MODE_NOCTCP)
790	>	if (HasCMode(chptr, MODE_NOCTCP))
791		if (*message == '\001' && strncmp(message + 1, "ACTION ", 7))
792		return ERR_NOCTCP;
793
794	<	if (member || (member = find_channel_link(source_p, chptr)))
794	>	if (member || (member = find_channel_link(client_p, chptr)))
795		if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
796		return CAN_SEND_OPV;
797
798	<	if (!member && (chptr->mode.mode & MODE_NOPRIVMSGS))
798	>	if (member == NULL && HasCMode(chptr, MODE_NOPRIVMSGS))
799		return ERR_CANNOTSENDTOCHAN;
800
801	<	if (chptr->mode.mode & MODE_MODERATED)
801	>	if (HasCMode(chptr, MODE_MODERATED))
802		return ERR_CANNOTSENDTOCHAN;
803
804	<	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
804	>	if (HasCMode(chptr, MODE_MODREG) && !HasUMode(client_p, UMODE_REGISTERED))
805		return ERR_NEEDREGGEDNICK;
806
807	+	if (HasCMode(chptr, MODE_NONOTICE) && notice == true)
808	+	return ERR_CANNOTSENDTOCHAN;
809	+
810		/* Cache can send if banned */
811	<	if (MyClient(source_p))
811	>	if (MyConnect(client_p))
812		{
813		if (member)
814		{
#	Line 787 | Line 817 | can_send(struct Channel *chptr, struct C
817
818		if (!(member->flags & CHFL_BAN_CHECKED))
819		{
820	<	if (is_banned(chptr, source_p))
820	>	if (is_banned(chptr, client_p) == true)
821		{
822		member->flags |= (CHFL_BAN_CHECKED | CHFL_BAN_SILENCED);
823		return ERR_CANNOTSENDTOCHAN;
#	Line 796 | Line 826 | can_send(struct Channel *chptr, struct C
826		member->flags |= CHFL_BAN_CHECKED;
827		}
828		}
829	<	else if (is_banned(chptr, source_p))
829	>	else if (is_banned(chptr, client_p) == true)
830		return ERR_CANNOTSENDTOCHAN;
831		}
832
#	Line 806 | Line 836 | can_send(struct Channel *chptr, struct C
836		/*! \brief Updates the client's oper_warn_count_down, warns the
837		*         IRC operators if necessary, and updates
838		*         join_leave_countdown as needed.
839	<	* \param source_p Pointer to struct Client to check
839	>	* \param client_p Pointer to struct Client to check
840		* \param name     Channel name or NULL if this is a part.
841		*/
842		void
843	<	check_spambot_warning(struct Client *source_p, const char *name)
843	>	check_spambot_warning(struct Client *client_p, const char *name)
844		{
845	<	int t_delta = 0;
846	<	int decrement_count = 0;
817	<
818	<	if ((GlobalSetOptions.spam_num &&
819	<	(source_p->connection->join_leave_count >=
820	<	GlobalSetOptions.spam_num)))
845	>	if (GlobalSetOptions.spam_num &&
846	>	(client_p->connection->join_leave_count >= GlobalSetOptions.spam_num))
847		{
848	<	if (source_p->connection->oper_warn_count_down > 0)
849	<	source_p->connection->oper_warn_count_down--;
848	>	if (client_p->connection->oper_warn_count_down > 0)
849	>	client_p->connection->oper_warn_count_down--;
850		else
851	<	source_p->connection->oper_warn_count_down = 0;
851	>	client_p->connection->oper_warn_count_down = 0;
852
853	<	if (source_p->connection->oper_warn_count_down == 0)
853	>	if (client_p->connection->oper_warn_count_down == 0)
854		{
855		/* It's already known as a possible spambot */
856		if (name)
857		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
858		"User %s (%s@%s) trying to join %s is a possible spambot",
859	<	source_p->name, source_p->username,
860	<	source_p->host, name);
859	>	client_p->name, client_p->username,
860	>	client_p->host, name);
861		else
862		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
863		"User %s (%s@%s) is a possible spambot",
864	<	source_p->name, source_p->username,
865	<	source_p->host);
866	<	source_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
864	>	client_p->name, client_p->username,
865	>	client_p->host);
866	>	client_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
867		}
868		}
869		else
870		{
871	<	if ((t_delta = (CurrentTime - source_p->connection->last_leave_time)) >
872	<	JOIN_LEAVE_COUNT_EXPIRE_TIME)
871	>	int t_delta = CurrentTime - client_p->connection->last_leave_time;
872	>	if (t_delta > JOIN_LEAVE_COUNT_EXPIRE_TIME)
873		{
874	<	decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
875	<
876	<	if (decrement_count > source_p->connection->join_leave_count)
851	<	source_p->connection->join_leave_count = 0;
874	>	int decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
875	>	if (decrement_count > client_p->connection->join_leave_count)
876	>	client_p->connection->join_leave_count = 0;
877		else
878	<	source_p->connection->join_leave_count -= decrement_count;
878	>	client_p->connection->join_leave_count -= decrement_count;
879		}
880		else
881		{
882	<	if ((CurrentTime - (source_p->connection->last_join_time)) <
882	>	if ((CurrentTime - (client_p->connection->last_join_time)) <
883		GlobalSetOptions.spam_time)
884	<	source_p->connection->join_leave_count++;  /* It's a possible spambot */
884	>	client_p->connection->join_leave_count++;  /* It's a possible spambot */
885		}
886
887		if (name)
888	<	source_p->connection->last_join_time = CurrentTime;
888	>	client_p->connection->last_join_time = CurrentTime;
889		else
890	<	source_p->connection->last_leave_time = CurrentTime;
866	<	}
867	<	}
868	<
869	<	/*! \brief Compares usercount and servercount against their split
870	<	*         values and adjusts splitmode accordingly
871	<	* \param unused Unused address pointer
872	<	*/
873	<	void
874	<	check_splitmode(void *unused)
875	<	{
876	<	if (splitchecking && (ConfigChannel.no_join_on_split ||
877	<	ConfigChannel.no_create_on_split))
878	<	{
879	<	const unsigned int server = dlink_list_length(&global_server_list);
880	<
881	<	if (!splitmode && ((server < split_servers) || (Count.total < split_users)))
882	<	{
883	<	splitmode = 1;
884	<
885	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
886	<	"Network split, activating splitmode");
887	<	event_add(&splitmode_event, NULL);
888	<	}
889	<	else if (splitmode && (server >= split_servers) && (Count.total >= split_users))
890	<	{
891	<	splitmode = 0;
892	<
893	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
894	<	"Network rejoined, deactivating splitmode");
895	<	event_delete(&splitmode_event);
896	<	}
890	>	client_p->connection->last_leave_time = CurrentTime;
891		}
892		}
893
#	Line 906 | Line 900 | check_splitmode(void *unused)
900		*/
901		void
902		channel_set_topic(struct Channel *chptr, const char *topic,
903	<	const char *topic_info, time_t topicts, int local)
903	>	const char *topic_info, uintmax_t topicts, bool local)
904		{
905	<	if (local)
905	>	if (local == true)
906		strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ConfigServerInfo.max_topic_length + 1));
907		else
908		strlcpy(chptr->topic, topic, sizeof(chptr->topic));
#	Line 917 | Line 911 | channel_set_topic(struct Channel *chptr,
911		chptr->topic_time = topicts;
912		}
913
920	–	/* do_join_0()
921	–	*
922	–	* inputs       - pointer to client doing join 0
923	–	* output       - NONE
924	–	* side effects - Use has decided to join 0. This is legacy
925	–	*                from the days when channels were numbers not names. *sigh*
926	–	*                There is a bunch of evilness necessary here due to
927	–	*                anti spambot code.
928	–	*/
914		void
915	<	channel_do_join_0(struct Client *source_p)
931	<	{
932	<	dlink_node *node = NULL, *node_next = NULL;
933	<
934	<	if (source_p->channel.head)
935	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
936	<	check_spambot_warning(source_p, NULL);
937	<
938	<	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
939	<	{
940	<	struct Channel *chptr = ((struct Membership *)node->data)->chptr;
941	<
942	<	sendto_server(source_p, 0, 0, ":%s PART %s",
943	<	source_p->id, chptr->name);
944	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
945	<	source_p->name, source_p->username,
946	<	source_p->host, chptr->name);
947	<
948	<	remove_user_from_channel(node->data);
949	<	}
950	<	}
951	<
952	<	static char *
953	<	channel_find_last0(struct Client *source_p, char *chanlist)
954	<	{
955	<	int join0 = 0;
956	<
957	<	for (char *p = chanlist; *p; ++p)  /* Find last "JOIN 0" */
958	<	{
959	<	if (*p == '0' && (*(p + 1) == ',' || *(p + 1) == '\0'))
960	<	{
961	<	if (*(p + 1) == ',')
962	<	++p;
963	<
964	<	chanlist = p + 1;
965	<	join0 = 1;
966	<	}
967	<	else
968	<	{
969	<	while (*p != ',' && *p != '\0')  /* Skip past channel name */
970	<	++p;
971	<
972	<	if (*p == '\0')  /* Hit the end */
973	<	break;
974	<	}
975	<	}
976	<
977	<	if (join0)
978	<	channel_do_join_0(source_p);
979	<
980	<	return chanlist;
981	<	}
982	<
983	<	void
984	<	channel_do_join(struct Client *source_p, char *channel, char *key_list)
915	>	channel_do_join(struct Client *client_p, char *chan_list, char *key_list)
916		{
917		char *p = NULL;
918	<	char *chan = NULL;
919	<	char *chan_list = NULL;
989	<	struct Channel *chptr = NULL;
990	<	struct MaskItem *conf = NULL;
991	<	const struct ClassItem *const class = get_class_ptr(&source_p->connection->confs);
992	<	int i = 0;
918	>	const struct ResvItem *resv = NULL;
919	>	const struct ClassItem *const class = class_get_ptr(&client_p->connection->confs);
920		unsigned int flags = 0;
921
922	<	assert(IsClient(source_p));
996	<
997	<	chan_list = channel_find_last0(source_p, channel);
922	>	assert(MyClient(client_p));
923
924	<	for (chan = strtoken(&p, chan_list, ","); chan;
925	<	chan = strtoken(&p,      NULL, ","))
924	>	for (const char *name = strtok_r(chan_list, ",", &p); name;
925	>	name = strtok_r(NULL,      ",", &p))
926		{
927		const char *key = NULL;
928
#	Line 1009 | Line 934 | channel_do_join(struct Client *source_p,
934		if (key && *key == '\0')
935		key = NULL;
936
937	<	if (!check_channel_name(chan, 1))
937	>	if (channel_check_name(name, true) == false)
938		{
939	<	sendto_one_numeric(source_p, &me, ERR_BADCHANNAME, chan);
939	>	sendto_one_numeric(client_p, &me, ERR_BADCHANNAME, name);
940		continue;
941		}
942
943	<	if (!IsExemptResv(source_p) &&
944	<	!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv) &&
945	<	((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
943	>	if (!HasFlag(client_p, FLAGS_EXEMPTRESV) &&
944	>	!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)) &&
945	>	((resv = resv_find(name, match)) && resv_exempt_find(client_p, resv) == false))
946		{
947	<	++conf->count;
1023	<	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON, chan, conf->reason);
947	>	sendto_one_numeric(client_p, &me, ERR_CHANBANREASON, name, resv->reason);
948		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
949		"Forbidding reserved channel %s from user %s",
950	<	chan, get_client_name(source_p, HIDE_IP));
950	>	name, client_get_name(client_p, HIDE_IP));
951		continue;
952		}
953
954	<	if (dlink_list_length(&source_p->channel) >=
954	>	if (dlink_list_length(&client_p->channel) >=
955		((class->max_channels) ? class->max_channels : ConfigChannel.max_channels))
956		{
957	<	sendto_one_numeric(source_p, &me, ERR_TOOMANYCHANNELS, chan);
957	>	sendto_one_numeric(client_p, &me, ERR_TOOMANYCHANNELS, name);
958		break;
959		}
960
961	<	if ((chptr = hash_find_channel(chan)))
961	>	struct Channel *chptr;
962	>	if ((chptr = hash_find_channel(name)))
963		{
964	<	if (IsMember(source_p, chptr))
964	>	if (IsMember(client_p, chptr))
965		continue;
966
967	<	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
968	<	ConfigChannel.no_join_on_split)
969	<	{
1045	<	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chptr->name);
1046	<	continue;
1047	<	}
1048	<
1049	<	/*
1050	<	* can_join checks for +i key, bans.
1051	<	*/
1052	<	if ((i = can_join(source_p, chptr, key)))
967	>	/* can_join() checks for +i, +l, key, bans, etc. */
968	>	int ret = can_join(client_p, chptr, key);
969	>	if (ret)
970		{
971	<	sendto_one_numeric(source_p, &me, i, chptr->name);
971	>	sendto_one_numeric(client_p, &me, ret, chptr->name);
972		continue;
973		}
974
#	Line 1059 | Line 976 | channel_do_join(struct Client *source_p,
976		* This should never be the case unless there is some sort of
977		* persistant channels.
978		*/
979	<	if (!dlink_list_length(&chptr->members))
979	>	if (dlink_list_length(&chptr->members) == 0)
980		flags = CHFL_CHANOP;
981		else
982		flags = 0;
983		}
984		else
985		{
1069	–	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1070	–	(ConfigChannel.no_create_on_split || ConfigChannel.no_join_on_split))
1071	–	{
1072	–	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chan);
1073	–	continue;
1074	–	}
1075	–
986		flags = CHFL_CHANOP;
987	<	chptr = make_channel(chan);
987	>	chptr = channel_make(name);
988		}
989
990	<	if (!HasUMode(source_p, UMODE_OPER))
991	<	check_spambot_warning(source_p, chptr->name);
990	>	if (!HasUMode(client_p, UMODE_OPER))
991	>	check_spambot_warning(client_p, chptr->name);
992
993	<	add_user_to_channel(chptr, source_p, flags, 1);
993	>	add_user_to_channel(chptr, client_p, flags, true);
994
995		/*
996		* Set timestamp if appropriate, and propagate
#	Line 1088 | Line 998 | channel_do_join(struct Client *source_p,
998		if (flags == CHFL_CHANOP)
999		{
1000		chptr->creationtime = CurrentTime;
1001	<	chptr->mode.mode |= MODE_TOPICLIMIT;
1002	<	chptr->mode.mode |= MODE_NOPRIVMSGS;
1001	>	AddCMode(chptr, MODE_TOPICLIMIT);
1002	>	AddCMode(chptr, MODE_NOPRIVMSGS);
1003
1004	<	sendto_server(source_p, 0, 0, ":%s SJOIN %lu %s +nt :@%s",
1005	<	me.id, (unsigned long)chptr->creationtime,
1006	<	chptr->name, source_p->id);
1004	>	sendto_server(NULL, 0, 0, ":%s SJOIN %ju %s +nt :@%s",
1005	>	me.id, chptr->creationtime,
1006	>	chptr->name, client_p->id);
1007
1008		/*
1009		* Notify all other users on the new channel
1010		*/
1011	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1012	<	source_p->name, source_p->username,
1013	<	source_p->host, chptr->name,
1014	<	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1015	<	source_p->info);
1016	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1017	<	source_p->name, source_p->username,
1108	<	source_p->host, chptr->name);
1109	<	sendto_channel_local(0, chptr, ":%s MODE %s +nt",
1011	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1012	>	client_p->name, client_p->username,
1013	>	client_p->host, chptr->name, client_p->account, client_p->info);
1014	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1015	>	client_p->name, client_p->username,
1016	>	client_p->host, chptr->name);
1017	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s MODE %s +nt",
1018		me.name, chptr->name);
1111	–
1112	–	if (source_p->away[0])
1113	–	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
1114	–	":%s!%s@%s AWAY :%s",
1115	–	source_p->name, source_p->username,
1116	–	source_p->host, source_p->away);
1019		}
1020		else
1021		{
1022	<	sendto_server(source_p, 0, 0, ":%s JOIN %lu %s +",
1023	<	source_p->id, (unsigned long)chptr->creationtime,
1022	>	sendto_server(NULL, 0, 0, ":%s JOIN %ju %s +",
1023	>	client_p->id, chptr->creationtime,
1024		chptr->name);
1025
1026	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1027	<	source_p->name, source_p->username,
1028	<	source_p->host, chptr->name,
1029	<	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1030	<	source_p->info);
1031	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1032	<	source_p->name, source_p->username,
1033	<	source_p->host, chptr->name);
1034	<
1035	<	if (source_p->away[0])
1036	<	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
1037	<	":%s!%s@%s AWAY :%s",
1038	<	source_p->name, source_p->username,
1039	<	source_p->host, source_p->away);
1040	<	}
1041	<
1042	<	del_invite(chptr, source_p);
1026	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1027	>	client_p->name, client_p->username,
1028	>	client_p->host, chptr->name, client_p->account, client_p->info);
1029	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1030	>	client_p->name, client_p->username,
1031	>	client_p->host, chptr->name);
1032	>	}
1033	>
1034	>	if (client_p->away[0])
1035	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
1036	>	":%s!%s@%s AWAY :%s",
1037	>	client_p->name, client_p->username,
1038	>	client_p->host, client_p->away);
1039	>
1040	>	struct Invite *invite;
1041	>	if ((invite = find_invite(chptr, client_p)))
1042	>	del_invite(invite);
1043
1044		if (chptr->topic[0])
1045		{
1046	<	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1047	<	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->name,
1046	>	sendto_one_numeric(client_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1047	>	sendto_one_numeric(client_p, &me, RPL_TOPICWHOTIME, chptr->name,
1048		chptr->topic_info, chptr->topic_time);
1049		}
1050
1051	<	channel_member_names(source_p, chptr, 1);
1051	>	channel_member_names(client_p, chptr, true);
1052
1053	<	source_p->connection->last_join_time = CurrentTime;
1053	>	client_p->connection->last_join_time = CurrentTime;
1054		}
1055		}
1056
1057		/*! \brief Removes a client from a specific channel
1058	<	* \param source_p Pointer to source client to remove
1058	>	* \param client_p Pointer to client to remove
1059		* \param name     Name of channel to remove from
1060		* \param reason   Part reason to show
1061		*/
1062		static void
1063	<	channel_part_one_client(struct Client *source_p, const char *name, const char *reason)
1063	>	channel_part_one_client(struct Client *client_p, const char *name, const char *reason)
1064		{
1065		struct Channel *chptr = NULL;
1066		struct Membership *member = NULL;
1067
1068		if ((chptr = hash_find_channel(name)) == NULL)
1069		{
1070	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, name);
1070	>	sendto_one_numeric(client_p, &me, ERR_NOSUCHCHANNEL, name);
1071		return;
1072		}
1073
1074	<	if ((member = find_channel_link(source_p, chptr)) == NULL)
1074	>	if ((member = find_channel_link(client_p, chptr)) == NULL)
1075		{
1076	<	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->name);
1076	>	sendto_one_numeric(client_p, &me, ERR_NOTONCHANNEL, chptr->name);
1077		return;
1078		}
1079
1080	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
1081	<	check_spambot_warning(source_p, NULL);
1080	>	if (MyConnect(client_p) && !HasUMode(client_p, UMODE_OPER))
1081	>	check_spambot_warning(client_p, NULL);
1082
1083		/*
1084		* Remove user from the old channel (if any)
1085		* only allow /part reasons in -m chans
1086		*/
1087	<	if (*reason && (!MyConnect(source_p) ||
1088	<	((can_send(chptr, source_p, member, reason) &&
1089	<	(source_p->connection->firsttime + ConfigGeneral.anti_spam_exit_message_time)
1090	<	< CurrentTime))))
1091	<	{
1092	<	sendto_server(source_p, 0, 0, ":%s PART %s :%s",
1093	<	source_p->id, chptr->name, reason);
1094	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s :%s",
1095	<	source_p->name, source_p->username,
1096	<	source_p->host, chptr->name, reason);
1087	>	if (*reason && (!MyConnect(client_p) ||
1088	>	((client_p->connection->firsttime +
1089	>	ConfigGeneral.anti_spam_exit_message_time) < CurrentTime &&
1090	>	can_send(chptr, client_p, member, reason, false) < 0)))
1091	>	{
1092	>	sendto_server(client_p, 0, 0, ":%s PART %s :%s",
1093	>	client_p->id, chptr->name, reason);
1094	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s :%s",
1095	>	client_p->name, client_p->username,
1096	>	client_p->host, chptr->name, reason);
1097		}
1098		else
1099		{
1100	<	sendto_server(source_p, 0, 0, ":%s PART %s",
1101	<	source_p->id, chptr->name);
1102	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
1103	<	source_p->name, source_p->username,
1104	<	source_p->host, chptr->name);
1100	>	sendto_server(client_p, 0, 0, ":%s PART %s",
1101	>	client_p->id, chptr->name);
1102	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s",
1103	>	client_p->name, client_p->username,
1104	>	client_p->host, chptr->name);
1105		}
1106
1107		remove_user_from_channel(member);
1108		}
1109
1110		void
1111	<	channel_do_part(struct Client *source_p, char *channel, const char *reason)
1111	>	channel_do_part(struct Client *client_p, char *channel, const char *reason)
1112		{
1113	<	char *p = NULL, *name = NULL;
1113	>	char *p = NULL;
1114		char buf[KICKLEN + 1] = "";
1115
1116	<	assert(IsClient(source_p));
1116	>	assert(IsClient(client_p));
1117
1118		if (!EmptyString(reason))
1119		strlcpy(buf, reason, sizeof(buf));
1120
1121	<	for (name = strtoken(&p, channel, ","); name;
1122	<	name = strtoken(&p,    NULL, ","))
1123	<	channel_part_one_client(source_p, name, buf);
1121	>	for (const char *name = strtok_r(channel, ",", &p); name;
1122	>	name = strtok_r(NULL,    ",", &p))
1123	>	channel_part_one_client(client_p, name, buf);
1124		}

Comparing ircd-hybrid/trunk/src/channel.c (property svn:keywords):
Revision 5983 by michael, Mon May 25 15:24:48 2015 UTC vs.
Revision 8702 by michael, Sat Dec 8 16:34:40 2018 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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