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 6375 by michael, Fri Aug 21 10:34:16 2015 UTC vs.
Revision 8512 by michael, Fri Apr 6 19:28:05 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 */
46	>	/** Doubly linked list containing a list of all channels. */
47	>	static dlink_list channel_list;
48
50	–	static mp_pool_t *member_pool, *channel_pool;
49
50	<
51	<	/*! \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", 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);
63	<	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,
67	>	add_user_to_channel(struct Channel *chptr, struct Client *client_p,
68		unsigned int flags, int flood_ctrl)
69		{
70	<	struct Membership *member = NULL;
70	>	assert(IsClient(client_p));
71
72	<	assert(IsClient(who));
80	<
81	<	if (GlobalSetOptions.joinfloodtime > 0)
72	>	if (GlobalSetOptions.joinfloodtime)
73		{
74		if (flood_ctrl)
75		++chptr->number_joined;
#	Line 101 | 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))
110	>	if (MyConnect(client_p))
111		dlinkAdd(member, &member->locchannode, &chptr->locmembers);
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 139 | Line 130 | remove_user_from_channel(struct Membersh
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		channel_free(chptr);
#	Line 153 | Line 144 | remove_user_from_channel(struct Membersh
144		*/
145		static void
146		channel_send_members(struct Client *client_p, const struct Channel *chptr,
147	<	char *modebuf, char *parabuf)
147	>	const char *modebuf, const char *parabuf)
148		{
149	+	dlink_node *node;
150		char buf[IRCD_BUFSIZE] = "";
159	–	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 203 | Line 194 | channel_send_members(struct Client *clie
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 218 | Line 209 | static void
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 262 | Line 253 | channel_send_mask_list(struct Client *cl
253		* \param chptr    Pointer to channel pointer
254		*/
255		void
256	<	channel_send_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] = "";
#	Line 310 | 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		/* channel_free_mask_list()
#	Line 322 | Line 313 | remove_ban(struct Ban *ban, dlink_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 336 | Line 328 | channel_free_mask_list(dlink_list *list)
328		struct Channel *
329		channel_make(const char *name)
330		{
339	–	struct Channel *chptr = NULL;
340	–
331		assert(!EmptyString(name));
332
333	<	chptr = mp_pool_get(channel_pool);
344	<
333	>	struct Channel *chptr = xcalloc(sizeof(*chptr));
334		/* Doesn't hurt to set it here */
335		chptr->creationtime = CurrentTime;
336		chptr->last_join_time = CurrentTime;
337
338	<	strlcpy(chptr->name, name, sizeof(chptr->name));
339	<	dlinkAdd(chptr, &chptr->node, &channel_list);
338	>	/* Cache channel name length to avoid repetitive strlen() calls. */
339	>	chptr->name_len = strlcpy(chptr->name, name, sizeof(chptr->name));
340	>	if (chptr->name_len >= sizeof(chptr->name))
341	>	chptr->name_len = sizeof(chptr->name) - 1;
342
343	+	dlinkAdd(chptr, &chptr->node, &channel_list);
344		hash_add_channel(chptr);
345
346		return chptr;
#	Line 360 | Line 352 | channel_make(const char *name)
352		void
353		channel_free(struct Channel *chptr)
354		{
355	<	clear_invites_channel(chptr);
355	>	clear_invite_list(&chptr->invites);
356
357		/* Free ban/exception/invex lists */
358		channel_free_mask_list(&chptr->banlist);
#	Line 370 | Line 362 | channel_free(struct Channel *chptr)
362		dlinkDelete(&chptr->node, &channel_list);
363		hash_del_channel(chptr);
364
365	<	mp_pool_release(chptr);
365	>	xfree(chptr);
366		}
367
368		/*!
#	Line 388 | Line 380 | channel_pub_or_secret(const struct Chann
380		}
381
382		/*! \brief lists all names on given channel
383	<	* \param source_p Pointer to client struct requesting names
383	>	* \param client_p Pointer to client struct requesting names
384		* \param chptr    Pointer to channel block
385		* \param show_eon Show RPL_ENDOFNAMES numeric or not
386		*                 (don't want it with /names with no params)
387		*/
388		void
389	<	channel_member_names(struct Client *source_p, struct Channel *chptr,
398	<	int show_eon)
389	>	channel_member_names(struct Client *client_p, struct Channel *chptr, int show_eon)
390		{
391	<	const dlink_node *node = NULL;
391	>	dlink_node *node;
392		char buf[IRCD_BUFSIZE + 1] = "";
393		char *t = NULL, *start = NULL;
394		int tlen = 0;
395	<	const int is_member = IsMember(source_p, chptr);
396	<	const int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
397	<	const int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
395	>	const int is_member = IsMember(client_p, chptr);
396	>	const int multi_prefix = HasCap(client_p, CAP_MULTI_PREFIX) != 0;
397	>	const int uhnames = HasCap(client_p, CAP_UHNAMES) != 0;
398
399	<	assert(IsClient(source_p));
399	>	assert(IsClient(client_p));
400
401		if (PubChannel(chptr) || is_member)
402		{
403		t = buf + snprintf(buf, sizeof(buf), numeric_form(RPL_NAMREPLY),
404	<	me.name, source_p->name,
404	>	me.name, client_p->name,
405		channel_pub_or_secret(chptr), chptr->name);
406		start = t;
407
#	Line 421 | Line 412 | channel_member_names(struct Client *sour
412		if (HasUMode(member->client_p, UMODE_INVISIBLE) && !is_member)
413		continue;
414
415	<	if (!uhnames)
425	<	tlen = strlen(member->client_p->name) + 1;  /* +1 for space */
426	<	else
415	>	if (uhnames)
416		tlen = strlen(member->client_p->name) + strlen(member->client_p->username) +
417		strlen(member->client_p->host) + 3;  /* +3 for ! + @ + space */
429	–
430	–	if (!multi_prefix)
431	–	{
432	–	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
433	–	++tlen;
434	–	}
418		else
419	+	tlen = strlen(member->client_p->name) + 1;  /* +1 for space */
420	+
421	+	if (multi_prefix)
422		{
423		if (member->flags & CHFL_CHANOP)
424		++tlen;
#	Line 441 | Line 427 | channel_member_names(struct Client *sour
427		if (member->flags & CHFL_VOICE)
428		++tlen;
429		}
430	+	else
431	+	{
432	+	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
433	+	++tlen;
434	+	}
435
436		if (t + tlen - buf > IRCD_BUFSIZE - 2)
437		{
438		*(t - 1) = '\0';
439	<	sendto_one(source_p, "%s", buf);
439	>	sendto_one(client_p, "%s", buf);
440		t = start;
441		}
442
443	<	if (!uhnames)
453	<	t += sprintf(t, "%s%s ", get_member_status(member, multi_prefix),
454	<	member->client_p->name);
455	<	else
443	>	if (uhnames)
444		t += sprintf(t, "%s%s!%s@%s ", get_member_status(member, multi_prefix),
445		member->client_p->name, member->client_p->username,
446		member->client_p->host);
447	+	else
448	+	t += sprintf(t, "%s%s ", get_member_status(member, multi_prefix),
449	+	member->client_p->name);
450		}
451
452		if (tlen)
453		{
454		*(t - 1) = '\0';
455	<	sendto_one(source_p, "%s", buf);
455	>	sendto_one(client_p, "%s", buf);
456		}
457		}
458
459		if (show_eon)
460	<	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->name);
460	>	sendto_one_numeric(client_p, &me, RPL_ENDOFNAMES, chptr->name);
461		}
462
463	<	/*! \brief Adds client to invite list
464	<	* \param chptr Pointer to channel block
474	<	* \param who   Pointer to client to add invite to
475	<	*/
476	<	void
477	<	add_invite(struct Channel *chptr, struct Client *who)
463	>	static struct Invite *
464	>	find_invite(struct Channel *chptr, struct Client *client_p)
465		{
466	<	assert(IsClient(who));
466	>	dlink_node *node, *node_next;
467	>	dlink_list *list;
468
469	<	del_invite(chptr, who);
469	>	/* Take the shortest of the two lists */
470	>	if (dlink_list_length(&client_p->connection->invited) < dlink_list_length(&chptr->invites))
471	>	list = &client_p->connection->invited;
472	>	else
473	>	list = &chptr->invites;
474
475	<	/*
476	<	* Delete last link in chain if the list is max length
477	<	*/
486	<	if (dlink_list_length(&who->connection->invited) >=
487	<	ConfigChannel.max_channels)
488	<	del_invite(who->connection->invited.tail->data, who);
475	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
476	>	{
477	>	struct Invite *invite = node->data;
478
479	<	/* Add client to channel invite list */
480	<	dlinkAdd(who, make_dlink_node(), &chptr->invites);
479	>	if (ConfigChannel.invite_expire_time &&
480	>	ConfigChannel.invite_expire_time + invite->when < CurrentTime)
481	>	del_invite(invite);
482	>	else if (invite->chptr == chptr && invite->client_p == client_p)
483	>	return invite;
484	>	}
485
486	<	/* Add channel to the end of the client invite list */
494	<	dlinkAdd(chptr, make_dlink_node(), &who->connection->invited);
486	>	return NULL;
487		}
488
489	<	/*! \brief Delete Invite block from channel invite list
490	<	*         and client invite list
491	<	* \param chptr Pointer to Channel struct
500	<	* \param who   Pointer to client to remove invites from
489	>	/*! \brief Adds client to invite list
490	>	* \param chptr    Pointer to channel block
491	>	* \param client_p Pointer to client to add invite to
492		*/
493		void
494	<	del_invite(struct Channel *chptr, struct Client *who)
494	>	add_invite(struct Channel *chptr, struct Client *client_p)
495		{
496	<	dlink_node *node = NULL;
496	>	struct Invite *invite;
497	>	if ((invite = find_invite(chptr, client_p)))
498	>	del_invite(invite);
499	>
500	>	invite = xcalloc(sizeof(*invite));
501	>	invite->client_p = client_p;
502	>	invite->chptr = chptr;
503	>	invite->when = CurrentTime;
504	>
505	>	/* Delete last link in chain if the list is max length */
506	>	while (dlink_list_length(&client_p->connection->invited) &&
507	>	dlink_list_length(&client_p->connection->invited) >= ConfigChannel.max_invites)
508	>	del_invite(client_p->connection->invited.tail->data);
509
510	<	if ((node = dlinkFindDelete(&who->connection->invited, chptr)))
511	<	free_dlink_node(node);
510	>	/* Add client to channel invite list */
511	>	dlinkAdd(invite, &invite->chan_node, &chptr->invites);
512
513	<	if ((node = dlinkFindDelete(&chptr->invites, who)))
514	<	free_dlink_node(node);
513	>	/* Add channel to the end of the client invite list */
514	>	dlinkAdd(invite, &invite->user_node, &client_p->connection->invited);
515		}
516
517	<	/*! \brief Removes all invites of a specific channel
518	<	* \param chptr Pointer to Channel struct
517	>	/*! \brief Delete Invite block from channel invite list
518	>	*         and client invite list
519	>	* \param invite Pointer to Invite struct
520		*/
521		void
522	<	clear_invites_channel(struct Channel *chptr)
522	>	del_invite(struct Invite *invite)
523		{
524	<	dlink_node *node = NULL, *node_next = NULL;
524	>	dlinkDelete(&invite->user_node, &invite->client_p->connection->invited);
525	>	dlinkDelete(&invite->chan_node, &invite->chptr->invites);
526
527	<	DLINK_FOREACH_SAFE(node, node_next, chptr->invites.head)
528	<	del_invite(chptr, node->data);
527	>	/* Release memory pointed to by 'invite' */
528	>	xfree(invite);
529		}
530
531	<	/*! \brief Removes all invites of a specific client
532	<	* \param source_p Pointer to Client struct
531	>	/*! \brief Removes and frees all Invite blocks from a list
532	>	* \param list Pointer to a dlink_list
533		*/
534		void
535	<	clear_invites_client(struct Client *source_p)
535	>	clear_invite_list(dlink_list *list)
536		{
537	<	dlink_node *node = NULL, *node_next = NULL;
538	<
534	<	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
535	<	del_invite(node->data, source_p);
537	>	while (list->head)
538	>	del_invite(list->head->data);
539		}
540
541		/* get_member_status()
#	Line 544 | Line 547 | clear_invites_client(struct Client *sour
547		* side effects -
548		*
549		* NOTE: Returned string is usually a static buffer
550	<	* (like in get_client_name)
550	>	* (like in client_get_name)
551		*/
552		const char *
553		get_member_status(const struct Membership *member, const int combine)
554		{
555	<	static char buffer[4];  /* 4 for @%+\0 */
555	>	static char buffer[CMEMBER_STATUS_FLAGS_LEN + 1];  /* +1 for \0 */
556		char *p = buffer;
557
558		if (member->flags & CHFL_CHANOP)
#	Line 574 | Line 577 | get_member_status(const struct Membershi
577		}
578
579		/*!
580	<	* \param who  Pointer to Client to check
581	<	* \param list Pointer to ban list to search
580	>	* \param client_p Pointer to Client to check
581	>	* \param list     Pointer to ban list to search
582		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
583		*/
584		static int
585	<	find_bmask(const struct Client *who, const dlink_list *const list)
585	>	find_bmask(const struct Client *client_p, const dlink_list *list)
586		{
587	<	const dlink_node *node = NULL;
587	>	dlink_node *node;
588
589		DLINK_FOREACH(node, list->head)
590		{
591		const struct Ban *ban = node->data;
592
593	<	if (!match(ban->name, who->name) && !match(ban->user, who->username))
593	>	if (!match(ban->name, client_p->name) && !match(ban->user, client_p->username))
594		{
595		switch (ban->type)
596		{
597		case HM_HOST:
598	<	if (!match(ban->host, who->host) || !match(ban->host, who->sockhost))
598	>	if (!match(ban->host, client_p->host) || !match(ban->host, client_p->sockhost))
599		return 1;
600		break;
601		case HM_IPV4:
602	<	if (who->connection->aftype == AF_INET)
603	<	if (match_ipv4(&who->connection->ip, &ban->addr, ban->bits))
602	>	if (client_p->ip.ss.ss_family == AF_INET)
603	>	if (match_ipv4(&client_p->ip, &ban->addr, ban->bits))
604		return 1;
605		break;
606		case HM_IPV6:
607	<	if (who->connection->aftype == AF_INET6)
608	<	if (match_ipv6(&who->connection->ip, &ban->addr, ban->bits))
607	>	if (client_p->ip.ss.ss_family == AF_INET6)
608	>	if (match_ipv6(&client_p->ip, &ban->addr, ban->bits))
609		return 1;
610		break;
611		default:
#	Line 615 | Line 618 | find_bmask(const struct Client *who, con
618		}
619
620		/*!
621	<	* \param chptr Pointer to channel block
622	<	* \param who   Pointer to client to check access fo
621	>	* \param chptr    Pointer to channel block
622	>	* \param client_p Pointer to client to check access fo
623		* \return 0 if not banned, 1 otherwise
624		*/
625		int
626	<	is_banned(const struct Channel *chptr, const struct Client *who)
626	>	is_banned(const struct Channel *chptr, const struct Client *client_p)
627		{
628	<	if (find_bmask(who, &chptr->banlist))
629	<	if (!find_bmask(who, &chptr->exceptlist))
628	>	if (find_bmask(client_p, &chptr->banlist))
629	>	if (!find_bmask(client_p, &chptr->exceptlist))
630		return 1;
631
632		return 0;
633		}
634
635		/*! Tests if a client can join a certain channel
636	<	* \param source_p Pointer to client attempting to join
636	>	* \param client_p Pointer to client attempting to join
637		* \param chptr    Pointer to channel
638		* \param key      Key sent by client attempting to join if present
639		* \return ERR_BANNEDFROMCHAN, ERR_INVITEONLYCHAN, ERR_CHANNELISFULL
640		*         or 0 if allowed to join.
641		*/
642	<	int
643	<	can_join(struct Client *source_p, const struct Channel *chptr, const char *key)
642	>	static int
643	>	can_join(struct Client *client_p, struct Channel *chptr, const char *key)
644		{
645	<	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
645	>	if (HasCMode(chptr, MODE_SSLONLY) && !HasUMode(client_p, UMODE_SSL))
646		return ERR_SSLONLYCHAN;
647
648	<	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(source_p, UMODE_REGISTERED))
648	>	if (HasCMode(chptr, MODE_REGONLY) && !HasUMode(client_p, UMODE_REGISTERED))
649		return ERR_NEEDREGGEDNICK;
650
651	<	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(source_p, UMODE_OPER))
651	>	if (HasCMode(chptr, MODE_OPERONLY) && !HasUMode(client_p, UMODE_OPER))
652		return ERR_OPERONLYCHAN;
653
654	<	if (chptr->mode.mode & MODE_INVITEONLY)
655	<	if (!dlinkFind(&source_p->connection->invited, chptr))
656	<	if (!find_bmask(source_p, &chptr->invexlist))
654	>	if (HasCMode(chptr, MODE_INVITEONLY))
655	>	if (!find_invite(chptr, client_p))
656	>	if (!find_bmask(client_p, &chptr->invexlist))
657		return ERR_INVITEONLYCHAN;
658
659		if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
#	Line 660 | Line 663 | can_join(struct Client *source_p, const
663		chptr->mode.limit)
664		return ERR_CHANNELISFULL;
665
666	<	if (is_banned(chptr, source_p))
666	>	if (is_banned(chptr, client_p))
667		return ERR_BANNEDFROMCHAN;
668
669		return 0;
#	Line 673 | Line 676 | has_member_flags(const struct Membership
676		}
677
678		struct Membership *
679	<	find_channel_link(struct Client *client_p, struct Channel *chptr)
679	>	find_channel_link(const struct Client *client_p, const struct Channel *chptr)
680		{
681	<	dlink_node *node = NULL;
681	>	dlink_node *node;
682
683		if (!IsClient(client_p))
684		return NULL;
685
686	+	/* Take the shortest of the two lists */
687		if (dlink_list_length(&chptr->members) < dlink_list_length(&client_p->channel))
688		{
689		DLINK_FOREACH(node, chptr->members.head)
#	Line 729 | Line 733 | msg_has_ctrls(const char *message)
733
734		/*! Tests if a client can send to a channel
735		* \param chptr    Pointer to Channel struct
736	<	* \param source_p Pointer to Client struct
736	>	* \param client_p Pointer to Client struct
737		* \param member   Pointer to Membership struct (can be NULL)
738		* \param message  The actual message string the client wants to send
739		* \return CAN_SEND_OPV if op or voiced on channel\n
#	Line 737 | Line 741 | msg_has_ctrls(const char *message)
741		*         ERR_CANNOTSENDTOCHAN or ERR_NEEDREGGEDNICK if they cannot send to channel\n
742		*/
743		int
744	<	can_send(struct Channel *chptr, struct Client *source_p,
745	<	struct Membership *member, const char *message)
744	>	can_send(struct Channel *chptr, struct Client *client_p,
745	>	struct Membership *member, const char *message, int notice)
746		{
747	<	const struct MaskItem *conf = NULL;
747	>	const struct ResvItem *resv = NULL;
748
749	<	if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
749	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
750		return CAN_SEND_OPV;
751
752	<	if (MyClient(source_p) && !HasFlag(source_p, FLAGS_EXEMPTRESV))
753	<	if (!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv))
754	<	if ((conf = match_find_resv(chptr->name)) && !resv_find_exempt(source_p, conf))
752	>	if (MyConnect(client_p) && !HasFlag(client_p, FLAGS_EXEMPTRESV))
753	>	if (!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)))
754	>	if ((resv = resv_find(chptr->name, match)) && !resv_exempt_find(client_p, resv))
755		return ERR_CANNOTSENDTOCHAN;
756
757	<	if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
757	>	if (HasCMode(chptr, MODE_NOCTRL) && msg_has_ctrls(message))
758		return ERR_NOCTRLSONCHAN;
759
760	<	if (chptr->mode.mode & MODE_NOCTCP)
760	>	if (HasCMode(chptr, MODE_NOCTCP))
761		if (*message == '\001' && strncmp(message + 1, "ACTION ", 7))
762		return ERR_NOCTCP;
763
764	<	if (member || (member = find_channel_link(source_p, chptr)))
764	>	if (member || (member = find_channel_link(client_p, chptr)))
765		if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
766		return CAN_SEND_OPV;
767
768	<	if (!member && (chptr->mode.mode & MODE_NOPRIVMSGS))
768	>	if (member == NULL && HasCMode(chptr, MODE_NOPRIVMSGS))
769		return ERR_CANNOTSENDTOCHAN;
770
771	<	if (chptr->mode.mode & MODE_MODERATED)
771	>	if (HasCMode(chptr, MODE_MODERATED))
772		return ERR_CANNOTSENDTOCHAN;
773
774	<	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
774	>	if (HasCMode(chptr, MODE_MODREG) && !HasUMode(client_p, UMODE_REGISTERED))
775		return ERR_NEEDREGGEDNICK;
776
777	+	if (HasCMode(chptr, MODE_NONOTICE) && notice)
778	+	return ERR_CANNOTSENDTOCHAN;
779	+
780		/* Cache can send if banned */
781	<	if (MyClient(source_p))
781	>	if (MyConnect(client_p))
782		{
783		if (member)
784		{
#	Line 780 | Line 787 | can_send(struct Channel *chptr, struct C
787
788		if (!(member->flags & CHFL_BAN_CHECKED))
789		{
790	<	if (is_banned(chptr, source_p))
790	>	if (is_banned(chptr, client_p))
791		{
792		member->flags |= (CHFL_BAN_CHECKED | CHFL_BAN_SILENCED);
793		return ERR_CANNOTSENDTOCHAN;
#	Line 789 | Line 796 | can_send(struct Channel *chptr, struct C
796		member->flags |= CHFL_BAN_CHECKED;
797		}
798		}
799	<	else if (is_banned(chptr, source_p))
799	>	else if (is_banned(chptr, client_p))
800		return ERR_CANNOTSENDTOCHAN;
801		}
802
#	Line 799 | Line 806 | can_send(struct Channel *chptr, struct C
806		/*! \brief Updates the client's oper_warn_count_down, warns the
807		*         IRC operators if necessary, and updates
808		*         join_leave_countdown as needed.
809	<	* \param source_p Pointer to struct Client to check
809	>	* \param client_p Pointer to struct Client to check
810		* \param name     Channel name or NULL if this is a part.
811		*/
812		void
813	<	check_spambot_warning(struct Client *source_p, const char *name)
813	>	check_spambot_warning(struct Client *client_p, const char *name)
814		{
815	<	int t_delta = 0;
816	<	int decrement_count = 0;
810	<
811	<	if ((GlobalSetOptions.spam_num &&
812	<	(source_p->connection->join_leave_count >=
813	<	GlobalSetOptions.spam_num)))
815	>	if (GlobalSetOptions.spam_num &&
816	>	(client_p->connection->join_leave_count >= GlobalSetOptions.spam_num))
817		{
818	<	if (source_p->connection->oper_warn_count_down > 0)
819	<	source_p->connection->oper_warn_count_down--;
818	>	if (client_p->connection->oper_warn_count_down > 0)
819	>	client_p->connection->oper_warn_count_down--;
820		else
821	<	source_p->connection->oper_warn_count_down = 0;
821	>	client_p->connection->oper_warn_count_down = 0;
822
823	<	if (source_p->connection->oper_warn_count_down == 0)
823	>	if (client_p->connection->oper_warn_count_down == 0)
824		{
825		/* It's already known as a possible spambot */
826		if (name)
827		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
828		"User %s (%s@%s) trying to join %s is a possible spambot",
829	<	source_p->name, source_p->username,
830	<	source_p->host, name);
829	>	client_p->name, client_p->username,
830	>	client_p->host, name);
831		else
832		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
833		"User %s (%s@%s) is a possible spambot",
834	<	source_p->name, source_p->username,
835	<	source_p->host);
836	<	source_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
834	>	client_p->name, client_p->username,
835	>	client_p->host);
836	>	client_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
837		}
838		}
839		else
840		{
841	<	if ((t_delta = (CurrentTime - source_p->connection->last_leave_time)) >
842	<	JOIN_LEAVE_COUNT_EXPIRE_TIME)
841	>	int t_delta = CurrentTime - client_p->connection->last_leave_time;
842	>	if (t_delta > JOIN_LEAVE_COUNT_EXPIRE_TIME)
843		{
844	<	decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
845	<
846	<	if (decrement_count > source_p->connection->join_leave_count)
844	<	source_p->connection->join_leave_count = 0;
844	>	int decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
845	>	if (decrement_count > client_p->connection->join_leave_count)
846	>	client_p->connection->join_leave_count = 0;
847		else
848	<	source_p->connection->join_leave_count -= decrement_count;
848	>	client_p->connection->join_leave_count -= decrement_count;
849		}
850		else
851		{
852	<	if ((CurrentTime - (source_p->connection->last_join_time)) <
852	>	if ((CurrentTime - (client_p->connection->last_join_time)) <
853		GlobalSetOptions.spam_time)
854	<	source_p->connection->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->connection->last_join_time = CurrentTime;
858	>	client_p->connection->last_join_time = CurrentTime;
859		else
860	<	source_p->connection->last_leave_time = CurrentTime;
860	>	client_p->connection->last_leave_time = CurrentTime;
861		}
862		}
863
#	Line 868 | Line 870 | check_spambot_warning(struct Client *sou
870		*/
871		void
872		channel_set_topic(struct Channel *chptr, const char *topic,
873	<	const char *topic_info, time_t topicts, int local)
873	>	const char *topic_info, uintmax_t topicts, int local)
874		{
875		if (local)
876		strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ConfigServerInfo.max_topic_length + 1));
#	Line 879 | Line 881 | channel_set_topic(struct Channel *chptr,
881		chptr->topic_time = topicts;
882		}
883
882	–	/* do_join_0()
883	–	*
884	–	* inputs       - pointer to client doing join 0
885	–	* output       - NONE
886	–	* side effects - Use has decided to join 0. This is legacy
887	–	*                from the days when channels were numbers not names. *sigh*
888	–	*                There is a bunch of evilness necessary here due to
889	–	*                anti spambot code.
890	–	*/
891	–	void
892	–	channel_do_join_0(struct Client *source_p)
893	–	{
894	–	dlink_node *node = NULL, *node_next = NULL;
895	–
896	–	if (source_p->channel.head)
897	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
898	–	check_spambot_warning(source_p, NULL);
899	–
900	–	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
901	–	{
902	–	struct Channel *chptr = ((struct Membership *)node->data)->chptr;
903	–
904	–	sendto_server(source_p, 0, 0, ":%s PART %s",
905	–	source_p->id, chptr->name);
906	–	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
907	–	source_p->name, source_p->username,
908	–	source_p->host, chptr->name);
909	–
910	–	remove_user_from_channel(node->data);
911	–	}
912	–	}
913	–
914	–	static char *
915	–	channel_find_last0(struct Client *source_p, char *chanlist)
916	–	{
917	–	int join0 = 0;
918	–
919	–	for (char *p = chanlist; *p; ++p)  /* Find last "JOIN 0" */
920	–	{
921	–	if (*p == '0' && (*(p + 1) == ',' || *(p + 1) == '\0'))
922	–	{
923	–	if (*(p + 1) == ',')
924	–	++p;
925	–
926	–	chanlist = p + 1;
927	–	join0 = 1;
928	–	}
929	–	else
930	–	{
931	–	while (*p != ',' && *p != '\0')  /* Skip past channel name */
932	–	++p;
933	–
934	–	if (*p == '\0')  /* Hit the end */
935	–	break;
936	–	}
937	–	}
938	–
939	–	if (join0)
940	–	channel_do_join_0(source_p);
941	–
942	–	return chanlist;
943	–	}
944	–
884		void
885	<	channel_do_join(struct Client *source_p, char *channel, char *key_list)
885	>	channel_do_join(struct Client *client_p, char *chan_list, char *key_list)
886		{
887		char *p = NULL;
888	<	char *chan = NULL;
889	<	char *chan_list = NULL;
951	<	struct Channel *chptr = NULL;
952	<	struct MaskItem *conf = NULL;
953	<	const struct ClassItem *const class = get_class_ptr(&source_p->connection->confs);
954	<	int i = 0;
888	>	const struct ResvItem *resv = NULL;
889	>	const struct ClassItem *const class = class_get_ptr(&client_p->connection->confs);
890		unsigned int flags = 0;
891
892	<	assert(IsClient(source_p));
892	>	assert(IsClient(client_p));
893
894	<	chan_list = channel_find_last0(source_p, channel);
895	<
961	<	for (chan = strtoken(&p, chan_list, ","); chan;
962	<	chan = strtoken(&p,      NULL, ","))
894	>	for (const char *name = strtok_r(chan_list, ",", &p); name;
895	>	name = strtok_r(NULL,      ",", &p))
896		{
897		const char *key = NULL;
898
#	Line 971 | Line 904 | channel_do_join(struct Client *source_p,
904		if (key && *key == '\0')
905		key = NULL;
906
907	<	if (!channel_check_name(chan, 1))
907	>	if (channel_check_name(name, 1) == 0)
908		{
909	<	sendto_one_numeric(source_p, &me, ERR_BADCHANNAME, chan);
909	>	sendto_one_numeric(client_p, &me, ERR_BADCHANNAME, name);
910		continue;
911		}
912
913	<	if (!HasFlag(source_p, FLAGS_EXEMPTRESV) &&
914	<	!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv) &&
915	<	((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
913	>	if (!HasFlag(client_p, FLAGS_EXEMPTRESV) &&
914	>	!(HasUMode(client_p, UMODE_OPER) && HasOFlag(client_p, OPER_FLAG_JOIN_RESV)) &&
915	>	((resv = resv_find(name, match)) && !resv_exempt_find(client_p, resv)))
916		{
917	<	++conf->count;
985	<	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON, chan, conf->reason);
917	>	sendto_one_numeric(client_p, &me, ERR_CHANBANREASON, name, resv->reason);
918		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
919		"Forbidding reserved channel %s from user %s",
920	<	chan, get_client_name(source_p, HIDE_IP));
920	>	name, client_get_name(client_p, HIDE_IP));
921		continue;
922		}
923
924	<	if (dlink_list_length(&source_p->channel) >=
924	>	if (dlink_list_length(&client_p->channel) >=
925		((class->max_channels) ? class->max_channels : ConfigChannel.max_channels))
926		{
927	<	sendto_one_numeric(source_p, &me, ERR_TOOMANYCHANNELS, chan);
927	>	sendto_one_numeric(client_p, &me, ERR_TOOMANYCHANNELS, name);
928		break;
929		}
930
931	<	if ((chptr = hash_find_channel(chan)))
931	>	struct Channel *chptr;
932	>	if ((chptr = hash_find_channel(name)))
933		{
934	<	if (IsMember(source_p, chptr))
934	>	if (IsMember(client_p, chptr))
935		continue;
936
937	<	/*
938	<	* can_join checks for +i key, bans.
939	<	*/
1007	<	if ((i = can_join(source_p, chptr, key)))
937	>	/* can_join() checks for +i, +l, key, bans, etc. */
938	>	int ret = can_join(client_p, chptr, key);
939	>	if (ret)
940		{
941	<	sendto_one_numeric(source_p, &me, i, chptr->name);
941	>	sendto_one_numeric(client_p, &me, ret, chptr->name);
942		continue;
943		}
944
#	Line 1014 | Line 946 | channel_do_join(struct Client *source_p,
946		* This should never be the case unless there is some sort of
947		* persistant channels.
948		*/
949	<	if (!dlink_list_length(&chptr->members))
949	>	if (dlink_list_length(&chptr->members) == 0)
950		flags = CHFL_CHANOP;
951		else
952		flags = 0;
#	Line 1022 | Line 954 | channel_do_join(struct Client *source_p,
954		else
955		{
956		flags = CHFL_CHANOP;
957	<	chptr = channel_make(chan);
957	>	chptr = channel_make(name);
958		}
959
960	<	if (!HasUMode(source_p, UMODE_OPER))
961	<	check_spambot_warning(source_p, chptr->name);
960	>	if (!HasUMode(client_p, UMODE_OPER))
961	>	check_spambot_warning(client_p, chptr->name);
962
963	<	add_user_to_channel(chptr, source_p, flags, 1);
963	>	add_user_to_channel(chptr, client_p, flags, 1);
964
965		/*
966		* Set timestamp if appropriate, and propagate
#	Line 1036 | Line 968 | channel_do_join(struct Client *source_p,
968		if (flags == CHFL_CHANOP)
969		{
970		chptr->creationtime = CurrentTime;
971	<	chptr->mode.mode |= MODE_TOPICLIMIT;
972	<	chptr->mode.mode |= MODE_NOPRIVMSGS;
971	>	AddCMode(chptr, MODE_TOPICLIMIT);
972	>	AddCMode(chptr, MODE_NOPRIVMSGS);
973
974	<	sendto_server(source_p, 0, 0, ":%s SJOIN %lu %s +nt :@%s",
975	<	me.id, (unsigned long)chptr->creationtime,
976	<	chptr->name, source_p->id);
974	>	sendto_server(client_p, 0, 0, ":%s SJOIN %ju %s +nt :@%s",
975	>	me.id, chptr->creationtime,
976	>	chptr->name, client_p->id);
977
978		/*
979		* Notify all other users on the new channel
980		*/
981	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
982	<	source_p->name, source_p->username,
983	<	source_p->host, chptr->name,
984	<	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
985	<	source_p->info);
986	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
987	<	source_p->name, source_p->username,
1056	<	source_p->host, chptr->name);
1057	<	sendto_channel_local(0, chptr, ":%s MODE %s +nt",
981	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
982	>	client_p->name, client_p->username,
983	>	client_p->host, chptr->name, client_p->account, client_p->info);
984	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
985	>	client_p->name, client_p->username,
986	>	client_p->host, chptr->name);
987	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s MODE %s +nt",
988		me.name, chptr->name);
989
990	<	if (source_p->away[0])
991	<	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
992	<	":%s!%s@%s AWAY :%s",
993	<	source_p->name, source_p->username,
994	<	source_p->host, source_p->away);
990	>	if (client_p->away[0])
991	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
992	>	":%s!%s@%s AWAY :%s",
993	>	client_p->name, client_p->username,
994	>	client_p->host, client_p->away);
995		}
996		else
997		{
998	<	sendto_server(source_p, 0, 0, ":%s JOIN %lu %s +",
999	<	source_p->id, (unsigned long)chptr->creationtime,
998	>	sendto_server(client_p, 0, 0, ":%s JOIN %ju %s +",
999	>	client_p->id, chptr->creationtime,
1000		chptr->name);
1001
1002	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1003	<	source_p->name, source_p->username,
1004	<	source_p->host, chptr->name,
1005	<	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1006	<	source_p->info);
1007	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1008	<	source_p->name, source_p->username,
1009	<	source_p->host, chptr->name);
1010	<
1011	<	if (source_p->away[0])
1012	<	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
1013	<	":%s!%s@%s AWAY :%s",
1014	<	source_p->name, source_p->username,
1015	<	source_p->host, source_p->away);
1016	<	}
1017	<
1018	<	del_invite(chptr, source_p);
1002	>	sendto_channel_local(NULL, chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
1003	>	client_p->name, client_p->username,
1004	>	client_p->host, chptr->name, client_p->account, client_p->info);
1005	>	sendto_channel_local(NULL, chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
1006	>	client_p->name, client_p->username,
1007	>	client_p->host, chptr->name);
1008	>
1009	>	if (client_p->away[0])
1010	>	sendto_channel_local(client_p, chptr, 0, CAP_AWAY_NOTIFY, 0,
1011	>	":%s!%s@%s AWAY :%s",
1012	>	client_p->name, client_p->username,
1013	>	client_p->host, client_p->away);
1014	>	}
1015	>
1016	>	struct Invite *invite;
1017	>	if ((invite = find_invite(chptr, client_p)))
1018	>	del_invite(invite);
1019
1020		if (chptr->topic[0])
1021		{
1022	<	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1023	<	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->name,
1022	>	sendto_one_numeric(client_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1023	>	sendto_one_numeric(client_p, &me, RPL_TOPICWHOTIME, chptr->name,
1024		chptr->topic_info, chptr->topic_time);
1025		}
1026
1027	<	channel_member_names(source_p, chptr, 1);
1027	>	channel_member_names(client_p, chptr, 1);
1028
1029	<	source_p->connection->last_join_time = CurrentTime;
1029	>	client_p->connection->last_join_time = CurrentTime;
1030		}
1031		}
1032
1033		/*! \brief Removes a client from a specific channel
1034	<	* \param source_p Pointer to source client to remove
1034	>	* \param client_p Pointer to client to remove
1035		* \param name     Name of channel to remove from
1036		* \param reason   Part reason to show
1037		*/
1038		static void
1039	<	channel_part_one_client(struct Client *source_p, const char *name, const char *reason)
1039	>	channel_part_one_client(struct Client *client_p, const char *name, const char *reason)
1040		{
1041		struct Channel *chptr = NULL;
1042		struct Membership *member = NULL;
1043
1044		if ((chptr = hash_find_channel(name)) == NULL)
1045		{
1046	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, name);
1046	>	sendto_one_numeric(client_p, &me, ERR_NOSUCHCHANNEL, name);
1047		return;
1048		}
1049
1050	<	if ((member = find_channel_link(source_p, chptr)) == NULL)
1050	>	if ((member = find_channel_link(client_p, chptr)) == NULL)
1051		{
1052	<	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->name);
1052	>	sendto_one_numeric(client_p, &me, ERR_NOTONCHANNEL, chptr->name);
1053		return;
1054		}
1055
1056	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
1057	<	check_spambot_warning(source_p, NULL);
1056	>	if (MyConnect(client_p) && !HasUMode(client_p, UMODE_OPER))
1057	>	check_spambot_warning(client_p, NULL);
1058
1059		/*
1060		* Remove user from the old channel (if any)
1061		* only allow /part reasons in -m chans
1062		*/
1063	<	if (*reason && (!MyConnect(source_p) ||
1064	<	((can_send(chptr, source_p, member, reason) &&
1065	<	(source_p->connection->firsttime + ConfigGeneral.anti_spam_exit_message_time)
1066	<	< CurrentTime))))
1067	<	{
1068	<	sendto_server(source_p, 0, 0, ":%s PART %s :%s",
1069	<	source_p->id, chptr->name, reason);
1070	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s :%s",
1071	<	source_p->name, source_p->username,
1072	<	source_p->host, chptr->name, reason);
1063	>	if (*reason && (!MyConnect(client_p) ||
1064	>	((client_p->connection->firsttime +
1065	>	ConfigGeneral.anti_spam_exit_message_time) < CurrentTime &&
1066	>	can_send(chptr, client_p, member, reason, 0) < 0)))
1067	>	{
1068	>	sendto_server(client_p, 0, 0, ":%s PART %s :%s",
1069	>	client_p->id, chptr->name, reason);
1070	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s :%s",
1071	>	client_p->name, client_p->username,
1072	>	client_p->host, chptr->name, reason);
1073		}
1074		else
1075		{
1076	<	sendto_server(source_p, 0, 0, ":%s PART %s",
1077	<	source_p->id, chptr->name);
1078	<	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
1079	<	source_p->name, source_p->username,
1080	<	source_p->host, chptr->name);
1076	>	sendto_server(client_p, 0, 0, ":%s PART %s",
1077	>	client_p->id, chptr->name);
1078	>	sendto_channel_local(NULL, chptr, 0, 0, 0, ":%s!%s@%s PART %s",
1079	>	client_p->name, client_p->username,
1080	>	client_p->host, chptr->name);
1081		}
1082
1083		remove_user_from_channel(member);
1084		}
1085
1086		void
1087	<	channel_do_part(struct Client *source_p, char *channel, const char *reason)
1087	>	channel_do_part(struct Client *client_p, char *channel, const char *reason)
1088		{
1089	<	char *p = NULL, *name = NULL;
1089	>	char *p = NULL;
1090		char buf[KICKLEN + 1] = "";
1091
1092	<	assert(IsClient(source_p));
1092	>	assert(IsClient(client_p));
1093
1094		if (!EmptyString(reason))
1095		strlcpy(buf, reason, sizeof(buf));
1096
1097	<	for (name = strtoken(&p, channel, ","); name;
1098	<	name = strtoken(&p,    NULL, ","))
1099	<	channel_part_one_client(source_p, name, buf);
1097	>	for (const char *name = strtok_r(channel, ",", &p); name;
1098	>	name = strtok_r(NULL,    ",", &p))
1099	>	channel_part_one_client(client_p, name, buf);
1100		}

Comparing ircd-hybrid/trunk/src/channel.c (property svn:keywords):
Revision 6375 by michael, Fri Aug 21 10:34:16 2015 UTC vs.
Revision 8512 by michael, Fri Apr 6 19:28:05 2018 UTC

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

Diff Legend

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