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 4094 by michael, Sun Jun 29 11:48:50 2014 UTC vs.
Revision 5983 by michael, Mon May 25 15:24:48 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 51 | Line 51 | struct event splitmode_event =
51		{
52		.name = "check_splitmode",
53		.handler = check_splitmode,
54	<	.when = 10
54	>	.when = 5
55		};
56
57		static mp_pool_t *member_pool, *channel_pool;
58	–	static char buf[IRCD_BUFSIZE];
58
59
60		/*! \brief Initializes the channel blockheap, adds known channel CAPAB
#	Line 63 | Line 62 | static char buf[IRCD_BUFSIZE];
62		void
63		channel_init(void)
64		{
65	<	add_capability("EX", CAP_EX, 1);
66	<	add_capability("IE", CAP_IE, 1);
65	>	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);
#	Line 82 | Line 81 | void
81		add_user_to_channel(struct Channel *chptr, struct Client *who,
82		unsigned int flags, int flood_ctrl)
83		{
84	<	struct Membership *ms = NULL;
84	>	struct Membership *member = NULL;
85	>
86	>	assert(IsClient(who));
87
88		if (GlobalSetOptions.joinfloodtime > 0)
89		{
#	Line 108 | Line 109 | add_user_to_channel(struct Channel *chpt
109		sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
110		"Possible Join Flooder %s on %s target: %s",
111		get_client_name(who, HIDE_IP),
112	<	who->servptr->name, chptr->chname);
112	>	who->servptr->name, chptr->name);
113		}
114		}
115
116		chptr->last_join_time = CurrentTime;
117		}
118
119	<	ms = mp_pool_get(member_pool);
120	<	ms->client_p = who;
121	<	ms->chptr = chptr;
122	<	ms->flags = flags;
119	>	member = mp_pool_get(member_pool);
120	>	member->client_p = who;
121	>	member->chptr = chptr;
122	>	member->flags = flags;
123	>
124	>	dlinkAdd(member, &member->channode, &chptr->members);
125	>
126	>	if (MyConnect(who))
127	>	dlinkAdd(member, &member->locchannode, &chptr->locmembers);
128
129	<	dlinkAdd(ms, &ms->channode, &chptr->members);
124	<	dlinkAdd(ms, &ms->usernode, &who->channel);
129	>	dlinkAdd(member, &member->usernode, &who->channel);
130		}
131
132		/*! \brief Deletes an user from a channel by removing a link in the
#	Line 131 | Line 136 | add_user_to_channel(struct Channel *chpt
136		void
137		remove_user_from_channel(struct Membership *member)
138		{
139	<	struct Client *client_p = member->client_p;
140	<	struct Channel *chptr = member->chptr;
139	>	struct Client *const client_p = member->client_p;
140	>	struct Channel *const chptr = member->chptr;
141
142		dlinkDelete(&member->channode, &chptr->members);
143	+
144	+	if (MyConnect(client_p))
145	+	dlinkDelete(&member->locchannode, &chptr->locmembers);
146	+
147		dlinkDelete(&member->usernode, &client_p->channel);
148
149		mp_pool_release(member);
#	Line 150 | Line 159 | remove_user_from_channel(struct Membersh
159		* side effects -
160		*/
161		static void
162	<	send_members(struct Client *client_p, struct Channel *chptr,
162	>	send_members(struct Client *client_p, const struct Channel *chptr,
163		char *modebuf, char *parabuf)
164		{
165	<	const dlink_node *ptr = NULL;
165	>	char buf[IRCD_BUFSIZE] = "";
166	>	const dlink_node *node = NULL;
167		int tlen;              /* length of text to append */
168		char *t, *start;       /* temp char pointer */
169
170		start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %lu %s %s %s:",
171	<	me.id, (unsigned long)chptr->channelts,
172	<	chptr->chname, modebuf, parabuf);
171	>	me.id, (unsigned long)chptr->creationtime,
172	>	chptr->name, modebuf, parabuf);
173
174	<	DLINK_FOREACH(ptr, chptr->members.head)
174	>	DLINK_FOREACH(node, chptr->members.head)
175		{
176	<	const struct Membership *ms = ptr->data;
176	>	const struct Membership *member = node->data;
177
178	<	tlen = strlen(ms->client_p->id) + 1;  /* +1 for space */
178	>	tlen = strlen(member->client_p->id) + 1;  /* +1 for space */
179
180	<	if (ms->flags & CHFL_CHANOP)
180	>	if (member->flags & CHFL_CHANOP)
181		++tlen;
182	<	if (ms->flags & CHFL_HALFOP)
182	>	if (member->flags & CHFL_HALFOP)
183		++tlen;
184	<	if (ms->flags & CHFL_VOICE)
184	>	if (member->flags & CHFL_VOICE)
185		++tlen;
186
187		/*
#	Line 185 | Line 195 | send_members(struct Client *client_p, st
195		t = start;
196		}
197
198	<	if (ms->flags & CHFL_CHANOP)
198	>	if (member->flags & CHFL_CHANOP)
199		*t++ = '@';
200	<	if (ms->flags & CHFL_HALFOP)
200	>	if (member->flags & CHFL_HALFOP)
201		*t++ = '%';
202	<	if (ms->flags & CHFL_VOICE)
202	>	if (member->flags & CHFL_VOICE)
203		*t++ = '+';
204
205	<	strcpy(t, ms->client_p->id);
205	>	strcpy(t, member->client_p->id);
206
207		t += strlen(t);
208		*t++ = ' ';
#	Line 212 | Line 222 | send_members(struct Client *client_p, st
222		* \param flag     Char flag flagging type of mode. Currently this can be 'b', e' or 'I'
223		*/
224		static void
225	<	send_mode_list(struct Client *client_p, struct Channel *chptr,
226	<	const dlink_list *list, char flag)
225	>	send_mode_list(struct Client *client_p, const struct Channel *chptr,
226	>	const dlink_list *list, const char flag)
227		{
228	<	const dlink_node *ptr = NULL;
228	>	const dlink_node *node = NULL;
229	>	char mbuf[IRCD_BUFSIZE] = "";
230		char pbuf[IRCD_BUFSIZE] = "";
231		int tlen, mlen, cur_len;
232		char *pp = pbuf;
233
234	<	if (list->length == 0)
234	>	if (!list->length)
235		return;
236
237	<	mlen = snprintf(buf, sizeof(buf), ":%s BMASK %lu %s %c :", me.id,
238	<	(unsigned long)chptr->channelts, chptr->chname, flag);
237	>	mlen = snprintf(mbuf, sizeof(mbuf), ":%s BMASK %lu %s %c :", me.id,
238	>	(unsigned long)chptr->creationtime, chptr->name, flag);
239		cur_len = mlen;
240
241	<	DLINK_FOREACH(ptr, list->head)
241	>	DLINK_FOREACH(node, list->head)
242		{
243	<	const struct Ban *banptr = ptr->data;
243	>	const struct Ban *ban = node->data;
244
245	<	tlen = banptr->len + 3;  /* +3 for ! + @ + space */
245	>	tlen = ban->len + 3;  /* +3 for ! + @ + space */
246
247		/*
248		* Send buffer and start over if we cannot fit another ban
#	Line 239 | Line 250 | send_mode_list(struct Client *client_p,
250		if (cur_len + (tlen - 1) > IRCD_BUFSIZE - 2)
251		{
252		*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
253	<	sendto_one(client_p, "%s%s", buf, pbuf);
253	>	sendto_one(client_p, "%s%s", mbuf, pbuf);
254
255		cur_len = mlen;
256		pp = pbuf;
257		}
258
259	<	pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->user,
249	<	banptr->host);
259	>	pp += sprintf(pp, "%s!%s@%s ", ban->name, ban->user, ban->host);
260		cur_len += tlen;
261		}
262
263		*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
264	<	sendto_one(client_p, "%s%s", buf, pbuf);
264	>	sendto_one(client_p, "%s%s", mbuf, pbuf);
265		}
266
267		/*! \brief Send "client_p" a full list of the modes for channel chptr
#	Line 282 | Line 292 | check_channel_name(const char *name, con
292		{
293		const char *p = name;
294
295	<	assert(name != NULL);
295	>	assert(!EmptyString(p));
296
297		if (!IsChanPrefix(*p))
298		return 0;
#	Line 304 | Line 314 | check_channel_name(const char *name, con
314		}
315
316		void
317	<	remove_ban(struct Ban *bptr, dlink_list *list)
317	>	remove_ban(struct Ban *ban, dlink_list *list)
318		{
319	<	dlinkDelete(&bptr->node, list);
320	<
311	<	MyFree(bptr->name);
312	<	MyFree(bptr->user);
313	<	MyFree(bptr->host);
314	<	MyFree(bptr->who);
315	<
316	<	mp_pool_release(bptr);
319	>	dlinkDelete(&ban->node, list);
320	>	mp_pool_release(ban);
321		}
322
323		/* free_channel_list()
#	Line 325 | Line 329 | remove_ban(struct Ban *bptr, dlink_list
329		void
330		free_channel_list(dlink_list *list)
331		{
332	<	dlink_node *ptr = NULL, *ptr_next = NULL;
329	<
330	<	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
331	<	remove_ban(ptr->data, list);
332	>	dlink_node *node = NULL, *node_next = NULL;
333
334	<	assert(list->tail == NULL && list->head == NULL);
334	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
335	>	remove_ban(node->data, list);
336		}
337
338	<	/*! \brief Get Channel block for chname (and allocate a new channel
338	>	/*! \brief Get Channel block for name (and allocate a new channel
339		*         block, if it didn't exist before)
340	<	* \param chname Channel name
340	>	* \param name Channel name
341		* \return Channel block
342		*/
343		struct Channel *
344	<	make_channel(const char *chname)
344	>	make_channel(const char *name)
345		{
346		struct Channel *chptr = NULL;
347
348	<	assert(!EmptyString(chname));
348	>	assert(!EmptyString(name));
349
350		chptr = mp_pool_get(channel_pool);
351
352		/* Doesn't hurt to set it here */
353	<	chptr->channelts = CurrentTime;
353	>	chptr->creationtime = CurrentTime;
354		chptr->last_join_time = CurrentTime;
355
356	<	strlcpy(chptr->chname, chname, sizeof(chptr->chname));
356	>	strlcpy(chptr->name, name, sizeof(chptr->name));
357		dlinkAdd(chptr, &chptr->node, &channel_list);
358
359		hash_add_channel(chptr);
#	Line 365 | Line 367 | make_channel(const char *chname)
367		void
368		destroy_channel(struct Channel *chptr)
369		{
370	<	dlink_node *ptr = NULL, *ptr_next = NULL;
369	<
370	<	DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->invites.head)
371	<	del_invite(chptr, ptr->data);
370	>	clear_invites_channel(chptr);
371
372		/* Free ban/exception/invex lists */
373		free_channel_list(&chptr->banlist);
#	Line 405 | Line 404 | void
404		channel_member_names(struct Client *source_p, struct Channel *chptr,
405		int show_eon)
406		{
407	<	const dlink_node *ptr = NULL;
408	<	char lbuf[IRCD_BUFSIZE + 1] = "";
407	>	const dlink_node *node = NULL;
408	>	char buf[IRCD_BUFSIZE + 1] = "";
409		char *t = NULL, *start = NULL;
410		int tlen = 0;
411	<	int is_member = IsMember(source_p, chptr);
412	<	int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
413	<	int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
411	>	const int is_member = IsMember(source_p, chptr);
412	>	const int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
413	>	const int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
414	>
415	>	assert(IsClient(source_p));
416
417		if (PubChannel(chptr) || is_member)
418		{
419	<	t = lbuf + snprintf(lbuf, sizeof(lbuf), numeric_form(RPL_NAMREPLY),
420	<	me.name, source_p->name,
421	<	channel_pub_or_secret(chptr), chptr->chname);
419	>	t = buf + snprintf(buf, sizeof(buf), numeric_form(RPL_NAMREPLY),
420	>	me.name, source_p->name,
421	>	channel_pub_or_secret(chptr), chptr->name);
422		start = t;
423
424	<	DLINK_FOREACH(ptr, chptr->members.head)
424	>	DLINK_FOREACH(node, chptr->members.head)
425		{
426	<	const struct Membership *ms = ptr->data;
426	>	const struct Membership *member = node->data;
427
428	<	if (HasUMode(ms->client_p, UMODE_INVISIBLE) && !is_member)
428	>	if (HasUMode(member->client_p, UMODE_INVISIBLE) && !is_member)
429		continue;
430
431		if (!uhnames)
432	<	tlen = strlen(ms->client_p->name) + 1;  /* +1 for space */
432	>	tlen = strlen(member->client_p->name) + 1;  /* +1 for space */
433		else
434	<	tlen = strlen(ms->client_p->name) + strlen(ms->client_p->username) +
435	<	strlen(ms->client_p->host) + 3;  /* +3 for ! + @ + space */
434	>	tlen = strlen(member->client_p->name) + strlen(member->client_p->username) +
435	>	strlen(member->client_p->host) + 3;  /* +3 for ! + @ + space */
436
437		if (!multi_prefix)
438		{
439	<	if (ms->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
439	>	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
440		++tlen;
441		}
442		else
443		{
444	<	if (ms->flags & CHFL_CHANOP)
444	>	if (member->flags & CHFL_CHANOP)
445		++tlen;
446	<	if (ms->flags & CHFL_HALFOP)
446	>	if (member->flags & CHFL_HALFOP)
447		++tlen;
448	<	if (ms->flags & CHFL_VOICE)
448	>	if (member->flags & CHFL_VOICE)
449		++tlen;
450		}
451
452	<	if (t + tlen - lbuf > IRCD_BUFSIZE - 2)
452	>	if (t + tlen - buf > IRCD_BUFSIZE - 2)
453		{
454		*(t - 1) = '\0';
455	<	sendto_one(source_p, "%s", lbuf);
455	>	sendto_one(source_p, "%s", buf);
456		t = start;
457		}
458
459		if (!uhnames)
460	<	t += sprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
461	<	ms->client_p->name);
460	>	t += sprintf(t, "%s%s ", get_member_status(member, multi_prefix),
461	>	member->client_p->name);
462		else
463	<	t += sprintf(t, "%s%s!%s@%s ", get_member_status(ms, multi_prefix),
464	<	ms->client_p->name, ms->client_p->username,
465	<	ms->client_p->host);
463	>	t += sprintf(t, "%s%s!%s@%s ", get_member_status(member, multi_prefix),
464	>	member->client_p->name, member->client_p->username,
465	>	member->client_p->host);
466		}
467
468		if (tlen)
469		{
470		*(t - 1) = '\0';
471	<	sendto_one(source_p, "%s", lbuf);
471	>	sendto_one(source_p, "%s", buf);
472		}
473		}
474
475		if (show_eon)
476	<	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->chname);
476	>	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->name);
477		}
478
479		/*! \brief Adds client to invite list
#	Line 482 | Line 483 | channel_member_names(struct Client *sour
483		void
484		add_invite(struct Channel *chptr, struct Client *who)
485		{
486	+	assert(IsClient(who));
487	+
488		del_invite(chptr, who);
489
490		/*
491		* Delete last link in chain if the list is max length
492		*/
493	<	if (dlink_list_length(&who->localClient->invited) >=
493	>	if (dlink_list_length(&who->connection->invited) >=
494		ConfigChannel.max_channels)
495	<	del_invite(who->localClient->invited.tail->data, who);
495	>	del_invite(who->connection->invited.tail->data, who);
496
497		/* Add client to channel invite list */
498		dlinkAdd(who, make_dlink_node(), &chptr->invites);
499
500		/* Add channel to the end of the client invite list */
501	<	dlinkAdd(chptr, make_dlink_node(), &who->localClient->invited);
501	>	dlinkAdd(chptr, make_dlink_node(), &who->connection->invited);
502		}
503
504		/*! \brief Delete Invite block from channel invite list
#	Line 506 | Line 509 | add_invite(struct Channel *chptr, struct
509		void
510		del_invite(struct Channel *chptr, struct Client *who)
511		{
512	<	dlink_node *ptr = NULL;
512	>	dlink_node *node = NULL;
513
514	<	if ((ptr = dlinkFindDelete(&who->localClient->invited, chptr)))
515	<	free_dlink_node(ptr);
514	>	if ((node = dlinkFindDelete(&who->connection->invited, chptr)))
515	>	free_dlink_node(node);
516
517	<	if ((ptr = dlinkFindDelete(&chptr->invites, who)))
518	<	free_dlink_node(ptr);
517	>	if ((node = dlinkFindDelete(&chptr->invites, who)))
518	>	free_dlink_node(node);
519	>	}
520	>
521	>	/*! \brief Removes all invites of a specific channel
522	>	* \param chptr Pointer to Channel struct
523	>	*/
524	>	void
525	>	clear_invites_channel(struct Channel *chptr)
526	>	{
527	>	dlink_node *node = NULL, *node_next = NULL;
528	>
529	>	DLINK_FOREACH_SAFE(node, node_next, chptr->invites.head)
530	>	del_invite(chptr, node->data);
531	>	}
532	>
533	>	/*! \brief Removes all invites of a specific client
534	>	* \param source_p Pointer to Client struct
535	>	*/
536	>	void
537	>	clear_invites_client(struct Client *source_p)
538	>	{
539	>	dlink_node *node = NULL, *node_next = NULL;
540	>
541	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
542	>	del_invite(node->data, source_p);
543		}
544
545		/* get_member_status()
#	Line 527 | Line 554 | del_invite(struct Channel *chptr, struct
554		* (like in get_client_name)
555		*/
556		const char *
557	<	get_member_status(const struct Membership *ms, const int combine)
557	>	get_member_status(const struct Membership *member, const int combine)
558		{
559		static char buffer[4];  /* 4 for @%+\0 */
560		char *p = buffer;
561
562	<	if (ms->flags & CHFL_CHANOP)
562	>	if (member->flags & CHFL_CHANOP)
563		{
564		if (!combine)
565		return "@";
566		*p++ = '@';
567		}
568
569	<	if (ms->flags & CHFL_HALFOP)
569	>	if (member->flags & CHFL_HALFOP)
570		{
571		if (!combine)
572		return "%";
573		*p++ = '%';
574		}
575
576	<	if (ms->flags & CHFL_VOICE)
576	>	if (member->flags & CHFL_VOICE)
577		*p++ = '+';
578		*p = '\0';
579
#	Line 557 | Line 584 | get_member_status(const struct Membershi
584		* \param who  Pointer to Client to check
585		* \param list Pointer to ban list to search
586		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
560	–	*
587		*/
588		static int
589		find_bmask(const struct Client *who, const dlink_list *const list)
590		{
591	<	const dlink_node *ptr = NULL;
591	>	const dlink_node *node = NULL;
592
593	<	DLINK_FOREACH(ptr, list->head)
593	>	DLINK_FOREACH(node, list->head)
594		{
595	<	const struct Ban *bp = ptr->data;
595	>	const struct Ban *ban = node->data;
596
597	<	if (!match(bp->name, who->name) && !match(bp->user, who->username))
597	>	if (!match(ban->name, who->name) && !match(ban->user, who->username))
598		{
599	<	switch (bp->type)
599	>	switch (ban->type)
600		{
601		case HM_HOST:
602	<	if (!match(bp->host, who->host) || !match(bp->host, who->sockhost))
602	>	if (!match(ban->host, who->host) || !match(ban->host, who->sockhost))
603		return 1;
604		break;
605		case HM_IPV4:
606	<	if (who->localClient->aftype == AF_INET)
607	<	if (match_ipv4(&who->localClient->ip, &bp->addr, bp->bits))
606	>	if (who->connection->aftype == AF_INET)
607	>	if (match_ipv4(&who->connection->ip, &ban->addr, ban->bits))
608		return 1;
609		break;
584	–	#ifdef IPV6
610		case HM_IPV6:
611	<	if (who->localClient->aftype == AF_INET6)
612	<	if (match_ipv6(&who->localClient->ip, &bp->addr, bp->bits))
611	>	if (who->connection->aftype == AF_INET6)
612	>	if (match_ipv6(&who->connection->ip, &ban->addr, ban->bits))
613		return 1;
614		break;
590	–	#endif
615		default:
616		assert(0);
617		}
#	Line 620 | Line 644 | is_banned(const struct Channel *chptr, c
644		*         or 0 if allowed to join.
645		*/
646		int
647	<	can_join(struct Client *source_p, struct Channel *chptr, const char *key)
647	>	can_join(struct Client *source_p, const struct Channel *chptr, const char *key)
648		{
649		if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
650		return ERR_SSLONLYCHAN;
#	Line 632 | Line 656 | can_join(struct Client *source_p, struct
656		return ERR_OPERONLYCHAN;
657
658		if (chptr->mode.mode & MODE_INVITEONLY)
659	<	if (!dlinkFind(&source_p->localClient->invited, chptr))
659	>	if (!dlinkFind(&source_p->connection->invited, chptr))
660		if (!find_bmask(source_p, &chptr->invexlist))
661		return ERR_INVITEONLYCHAN;
662
#	Line 650 | Line 674 | can_join(struct Client *source_p, struct
674		}
675
676		int
677	<	has_member_flags(const struct Membership *ms, const unsigned int flags)
677	>	has_member_flags(const struct Membership *member, const unsigned int flags)
678		{
679	<	return ms && (ms->flags & flags);
679	>	return member && (member->flags & flags);
680		}
681
682		struct Membership *
683		find_channel_link(struct Client *client_p, struct Channel *chptr)
684		{
685	<	dlink_node *ptr = NULL;
685	>	dlink_node *node = NULL;
686
687		if (!IsClient(client_p))
688		return NULL;
689
690		if (dlink_list_length(&chptr->members) < dlink_list_length(&client_p->channel))
691		{
692	<	DLINK_FOREACH(ptr, chptr->members.head)
693	<	if (((struct Membership *)ptr->data)->client_p == client_p)
694	<	return ptr->data;
692	>	DLINK_FOREACH(node, chptr->members.head)
693	>	if (((struct Membership *)node->data)->client_p == client_p)
694	>	return node->data;
695		}
696		else
697		{
698	<	DLINK_FOREACH(ptr, client_p->channel.head)
699	<	if (((struct Membership *)ptr->data)->chptr == chptr)
700	<	return ptr->data;
698	>	DLINK_FOREACH(node, client_p->channel.head)
699	>	if (((struct Membership *)node->data)->chptr == chptr)
700	>	return node->data;
701		}
702
703		return NULL;
704		}
705
706	<	/*! Tests if a client can send to a channel
706	>	/*! Checks if a message contains control codes
707		* \param message The actual message string the client wants to send
708		* \return 1 if the message does contain any control codes, 0 otherwise
709		*/
#	Line 707 | Line 731 | msg_has_ctrls(const char *message)
731		return 1;  /* Control code */
732		}
733
734	<	return 0;
734	>	return 0;  /* No control code found */
735		}
736
737		/*! Tests if a client can send to a channel
738		* \param chptr    Pointer to Channel struct
739		* \param source_p Pointer to Client struct
740	<	* \param ms       Pointer to Membership struct (can be NULL)
740	>	* \param member   Pointer to Membership struct (can be NULL)
741		* \param message  The actual message string the client wants to send
742		* \return CAN_SEND_OPV if op or voiced on channel\n
743		*         CAN_SEND_NONOP if can send to channel but is not an op\n
#	Line 721 | Line 745 | msg_has_ctrls(const char *message)
745		*/
746		int
747		can_send(struct Channel *chptr, struct Client *source_p,
748	<	struct Membership *ms, const char *message)
748	>	struct Membership *member, const char *message)
749		{
750	<	struct MaskItem *conf = NULL;
750	>	const struct MaskItem *conf = NULL;
751
752		if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
753		return CAN_SEND_OPV;
754
755		if (MyClient(source_p) && !IsExemptResv(source_p))
756	<	if (!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv))
757	<	if ((conf = match_find_resv(chptr->chname)) && !resv_find_exempt(source_p, conf))
756	>	if (!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv))
757	>	if ((conf = match_find_resv(chptr->name)) && !resv_find_exempt(source_p, conf))
758		return ERR_CANNOTSENDTOCHAN;
759
760		if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
761		return ERR_NOCTRLSONCHAN;
762	<	if (ms || (ms = find_channel_link(source_p, chptr)))
763	<	if (ms->flags & (CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE))
762	>
763	>	if (chptr->mode.mode & MODE_NOCTCP)
764	>	if (*message == '\001' && strncmp(message + 1, "ACTION ", 7))
765	>	return ERR_NOCTCP;
766	>
767	>	if (member || (member = find_channel_link(source_p, chptr)))
768	>	if (member->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
769		return CAN_SEND_OPV;
770	<	if (!ms && (chptr->mode.mode & MODE_NOPRIVMSGS))
770	>
771	>	if (!member && (chptr->mode.mode & MODE_NOPRIVMSGS))
772		return ERR_CANNOTSENDTOCHAN;
773	+
774		if (chptr->mode.mode & MODE_MODERATED)
775		return ERR_CANNOTSENDTOCHAN;
776	+
777		if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
778		return ERR_NEEDREGGEDNICK;
779
780		/* Cache can send if banned */
781		if (MyClient(source_p))
782		{
783	<	if (ms)
783	>	if (member)
784		{
785	<	if (ms->flags & CHFL_BAN_SILENCED)
785	>	if (member->flags & CHFL_BAN_SILENCED)
786		return ERR_CANNOTSENDTOCHAN;
787
788	<	if (!(ms->flags & CHFL_BAN_CHECKED))
788	>	if (!(member->flags & CHFL_BAN_CHECKED))
789		{
790		if (is_banned(chptr, source_p))
791		{
792	<	ms->flags |= (CHFL_BAN_CHECKED|CHFL_BAN_SILENCED);
792	>	member->flags |= (CHFL_BAN_CHECKED | CHFL_BAN_SILENCED);
793		return ERR_CANNOTSENDTOCHAN;
794		}
795
796	<	ms->flags |= CHFL_BAN_CHECKED;
796	>	member->flags |= CHFL_BAN_CHECKED;
797		}
798		}
799		else if (is_banned(chptr, source_p))
#	Line 784 | Line 816 | check_spambot_warning(struct Client *sou
816		int decrement_count = 0;
817
818		if ((GlobalSetOptions.spam_num &&
819	<	(source_p->localClient->join_leave_count >=
819	>	(source_p->connection->join_leave_count >=
820		GlobalSetOptions.spam_num)))
821		{
822	<	if (source_p->localClient->oper_warn_count_down > 0)
823	<	source_p->localClient->oper_warn_count_down--;
822	>	if (source_p->connection->oper_warn_count_down > 0)
823	>	source_p->connection->oper_warn_count_down--;
824		else
825	<	source_p->localClient->oper_warn_count_down = 0;
825	>	source_p->connection->oper_warn_count_down = 0;
826
827	<	if (source_p->localClient->oper_warn_count_down == 0)
827	>	if (source_p->connection->oper_warn_count_down == 0)
828		{
829		/* It's already known as a possible spambot */
830		if (name)
#	Line 805 | Line 837 | check_spambot_warning(struct Client *sou
837		"User %s (%s@%s) is a possible spambot",
838		source_p->name, source_p->username,
839		source_p->host);
840	<	source_p->localClient->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
840	>	source_p->connection->oper_warn_count_down = OPER_SPAM_COUNTDOWN;
841		}
842		}
843		else
844		{
845	<	if ((t_delta = (CurrentTime - source_p->localClient->last_leave_time)) >
845	>	if ((t_delta = (CurrentTime - source_p->connection->last_leave_time)) >
846		JOIN_LEAVE_COUNT_EXPIRE_TIME)
847		{
848		decrement_count = (t_delta / JOIN_LEAVE_COUNT_EXPIRE_TIME);
849	<	if (decrement_count > source_p->localClient->join_leave_count)
850	<	source_p->localClient->join_leave_count = 0;
849	>
850	>	if (decrement_count > source_p->connection->join_leave_count)
851	>	source_p->connection->join_leave_count = 0;
852		else
853	<	source_p->localClient->join_leave_count -= decrement_count;
853	>	source_p->connection->join_leave_count -= decrement_count;
854		}
855		else
856		{
857	<	if ((CurrentTime - (source_p->localClient->last_join_time)) <
857	>	if ((CurrentTime - (source_p->connection->last_join_time)) <
858		GlobalSetOptions.spam_time)
859	<	source_p->localClient->join_leave_count++;  /* It's a possible spambot */
859	>	source_p->connection->join_leave_count++;  /* It's a possible spambot */
860		}
861
862		if (name)
863	<	source_p->localClient->last_join_time = CurrentTime;
863	>	source_p->connection->last_join_time = CurrentTime;
864		else
865	<	source_p->localClient->last_leave_time = CurrentTime;
865	>	source_p->connection->last_leave_time = CurrentTime;
866		}
867		}
868
#	Line 843 | Line 876 | check_splitmode(void *unused)
876		if (splitchecking && (ConfigChannel.no_join_on_split ||
877		ConfigChannel.no_create_on_split))
878		{
879	<	const unsigned int server = dlink_list_length(&global_serv_list);
879	>	const unsigned int server = dlink_list_length(&global_server_list);
880
881		if (!splitmode && ((server < split_servers) || (Count.total < split_users)))
882		{
#	Line 851 | Line 884 | check_splitmode(void *unused)
884
885		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
886		"Network split, activating splitmode");
887	<	event_add(&splitmode_event, NULL);
887	>	event_add(&splitmode_event, NULL);
888		}
889		else if (splitmode && (server >= split_servers) && (Count.total >= split_users))
890		{
#	Line 876 | Line 909 | channel_set_topic(struct Channel *chptr,
909		const char *topic_info, time_t topicts, int local)
910		{
911		if (local)
912	<	strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ServerInfo.max_topic_length + 1));
912	>	strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ConfigServerInfo.max_topic_length + 1));
913		else
914		strlcpy(chptr->topic, topic, sizeof(chptr->topic));
915
#	Line 896 | Line 929 | channel_set_topic(struct Channel *chptr,
929		void
930		channel_do_join_0(struct Client *source_p)
931		{
932	<	dlink_node *ptr = NULL, *ptr_next = NULL;
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(ptr, ptr_next, source_p->channel.head)
938	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
939		{
940	<	struct Channel *chptr = ((struct Membership *)ptr->data)->chptr;
940	>	struct Channel *chptr = ((struct Membership *)node->data)->chptr;
941
942	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s",
943	<	source_p->id, chptr->chname);
944	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s",
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->chname);
946	>	source_p->host, chptr->name);
947
948	<	remove_user_from_channel(ptr->data);
948	>	remove_user_from_channel(node->data);
949		}
950		}
951
#	Line 925 | Line 958 | channel_find_last0(struct Client *source
958		{
959		if (*p == '0' && (*(p + 1) == ',' || *(p + 1) == '\0'))
960		{
961	<	if ((*p + 1) == ',')
961	>	if (*(p + 1) == ',')
962		++p;
963
964		chanlist = p + 1;
#	Line 955 | Line 988 | channel_do_join(struct Client *source_p,
988		char *chan_list = NULL;
989		struct Channel *chptr = NULL;
990		struct MaskItem *conf = NULL;
991	<	const struct ClassItem *class = get_class_ptr(&source_p->localClient->confs);
991	>	const struct ClassItem *const class = get_class_ptr(&source_p->connection->confs);
992		int i = 0;
993		unsigned int flags = 0;
994
995	+	assert(IsClient(source_p));
996	+
997		chan_list = channel_find_last0(source_p, channel);
998
999		for (chan = strtoken(&p, chan_list, ","); chan;
#	Line 981 | Line 1016 | channel_do_join(struct Client *source_p,
1016		}
1017
1018		if (!IsExemptResv(source_p) &&
1019	<	!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv) &&
1019	>	!(HasUMode(source_p, UMODE_OPER) && ConfigGeneral.oper_pass_resv) &&
1020		((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
1021		{
1022		++conf->count;
1023	<	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON,
1024	<	chan, conf->reason ? conf->reason : "Reserved channel");
990	<	sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
1023	>	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON, chan, conf->reason);
1024	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1025		"Forbidding reserved channel %s from user %s",
1026		chan, get_client_name(source_p, HIDE_IP));
1027		continue;
#	Line 1008 | Line 1042 | channel_do_join(struct Client *source_p,
1042		if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1043		ConfigChannel.no_join_on_split)
1044		{
1045	<	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chptr->chname);
1045	>	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chptr->name);
1046		continue;
1047		}
1048
#	Line 1017 | Line 1051 | channel_do_join(struct Client *source_p,
1051		*/
1052		if ((i = can_join(source_p, chptr, key)))
1053		{
1054	<	sendto_one_numeric(source_p, &me, i, chptr->chname);
1054	>	sendto_one_numeric(source_p, &me, i, chptr->name);
1055		continue;
1056		}
1057
#	Line 1025 | Line 1059 | channel_do_join(struct Client *source_p,
1059		* This should never be the case unless there is some sort of
1060		* persistant channels.
1061		*/
1062	<	if (dlink_list_length(&chptr->members) == 0)
1062	>	if (!dlink_list_length(&chptr->members))
1063		flags = CHFL_CHANOP;
1064		else
1065		flags = 0;
#	Line 1044 | Line 1078 | channel_do_join(struct Client *source_p,
1078		}
1079
1080		if (!HasUMode(source_p, UMODE_OPER))
1081	<	check_spambot_warning(source_p, chptr->chname);
1081	>	check_spambot_warning(source_p, chptr->name);
1082
1083		add_user_to_channel(chptr, source_p, flags, 1);
1084
1085		/*
1086	<	*  Set timestamp if appropriate, and propagate
1086	>	* Set timestamp if appropriate, and propagate
1087		*/
1088		if (flags == CHFL_CHANOP)
1089		{
1090	<	chptr->channelts = CurrentTime;
1090	>	chptr->creationtime = CurrentTime;
1091		chptr->mode.mode |= MODE_TOPICLIMIT;
1092		chptr->mode.mode |= MODE_NOPRIVMSGS;
1093
1094	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s SJOIN %lu %s +nt :@%s",
1095	<	me.id, (unsigned long)chptr->channelts,
1096	<	chptr->chname, source_p->id);
1094	>	sendto_server(source_p, 0, 0, ":%s SJOIN %lu %s +nt :@%s",
1095	>	me.id, (unsigned long)chptr->creationtime,
1096	>	chptr->name, source_p->id);
1097
1098		/*
1099		* Notify all other users on the new channel
1100		*/
1101	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s JOIN :%s",
1102	<	source_p->name, source_p->username,
1103	<	source_p->host, chptr->chname);
1104	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s MODE %s +nt",
1105	<	me.name, chptr->chname);
1101	>	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1102	>	source_p->name, source_p->username,
1103	>	source_p->host, chptr->name,
1104	>	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1105	>	source_p->info);
1106	>	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1107	>	source_p->name, source_p->username,
1108	>	source_p->host, chptr->name);
1109	>	sendto_channel_local(0, chptr, ":%s MODE %s +nt",
1110	>	me.name, chptr->name);
1111
1112		if (source_p->away[0])
1113	<	sendto_channel_local_butone(source_p, 0, CAP_AWAY_NOTIFY, chptr,
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);
1117		}
1118		else
1119		{
1120	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s JOIN %lu %s +",
1121	<	source_p->id, (unsigned long)chptr->channelts,
1122	<	chptr->chname);
1123	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s JOIN :%s",
1124	<	source_p->name, source_p->username,
1125	<	source_p->host, chptr->chname);
1120	>	sendto_server(source_p, 0, 0, ":%s JOIN %lu %s +",
1121	>	source_p->id, (unsigned long)chptr->creationtime,
1122	>	chptr->name);
1123	>
1124	>	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, chptr, ":%s!%s@%s JOIN %s %s :%s",
1125	>	source_p->name, source_p->username,
1126	>	source_p->host, chptr->name,
1127	>	(!IsDigit(source_p->account[0]) && source_p->account[0] != '*') ? source_p->account : "*",
1128	>	source_p->info);
1129	>	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN :%s",
1130	>	source_p->name, source_p->username,
1131	>	source_p->host, chptr->name);
1132
1133		if (source_p->away[0])
1134	<	sendto_channel_local_butone(source_p, 0, CAP_AWAY_NOTIFY, chptr,
1134	>	sendto_channel_local_butone(source_p, CAP_AWAY_NOTIFY, 0, chptr,
1135		":%s!%s@%s AWAY :%s",
1136		source_p->name, source_p->username,
1137		source_p->host, source_p->away);
#	Line 1096 | Line 1141 | channel_do_join(struct Client *source_p,
1141
1142		if (chptr->topic[0])
1143		{
1144	<	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->chname, chptr->topic);
1145	<	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->chname,
1144	>	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->name, chptr->topic);
1145	>	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->name,
1146		chptr->topic_info, chptr->topic_time);
1147		}
1148
1149		channel_member_names(source_p, chptr, 1);
1150
1151	<	source_p->localClient->last_join_time = CurrentTime;
1151	>	source_p->connection->last_join_time = CurrentTime;
1152		}
1153		}
1154
#	Line 1116 | Line 1161 | static void
1161		channel_part_one_client(struct Client *source_p, const char *name, const char *reason)
1162		{
1163		struct Channel *chptr = NULL;
1164	<	struct Membership *ms = NULL;
1164	>	struct Membership *member = NULL;
1165
1166		if ((chptr = hash_find_channel(name)) == NULL)
1167		{
#	Line 1124 | Line 1169 | channel_part_one_client(struct Client *s
1169		return;
1170		}
1171
1172	<	if ((ms = find_channel_link(source_p, chptr)) == NULL)
1172	>	if ((member = find_channel_link(source_p, chptr)) == NULL)
1173		{
1174	<	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->chname);
1174	>	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->name);
1175		return;
1176		}
1177
#	Line 1138 | Line 1183 | channel_part_one_client(struct Client *s
1183		* only allow /part reasons in -m chans
1184		*/
1185		if (*reason && (!MyConnect(source_p) ||
1186	<	((can_send(chptr, source_p, ms, reason) &&
1187	<	(source_p->localClient->firsttime + ConfigFileEntry.anti_spam_exit_message_time)
1186	>	((can_send(chptr, source_p, member, reason) &&
1187	>	(source_p->connection->firsttime + ConfigGeneral.anti_spam_exit_message_time)
1188		< CurrentTime))))
1189		{
1190	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s :%s",
1191	<	source_p->id, chptr->chname, reason);
1192	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s :%s",
1190	>	sendto_server(source_p, 0, 0, ":%s PART %s :%s",
1191	>	source_p->id, chptr->name, reason);
1192	>	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s :%s",
1193		source_p->name, source_p->username,
1194	<	source_p->host, chptr->chname, reason);
1194	>	source_p->host, chptr->name, reason);
1195		}
1196		else
1197		{
1198	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s",
1199	<	source_p->id, chptr->chname);
1200	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s",
1198	>	sendto_server(source_p, 0, 0, ":%s PART %s",
1199	>	source_p->id, chptr->name);
1200	>	sendto_channel_local(0, chptr, ":%s!%s@%s PART %s",
1201		source_p->name, source_p->username,
1202	<	source_p->host, chptr->chname);
1202	>	source_p->host, chptr->name);
1203		}
1204
1205	<	remove_user_from_channel(ms);
1205	>	remove_user_from_channel(member);
1206		}
1207
1208		void
1209	<	channel_do_part(struct Client *source_p, char *channel, char *reason)
1209	>	channel_do_part(struct Client *source_p, char *channel, const char *reason)
1210		{
1211		char *p = NULL, *name = NULL;
1212	<	char reasonbuf[KICKLEN + 1] = "";
1212	>	char buf[KICKLEN + 1] = "";
1213	>
1214	>	assert(IsClient(source_p));
1215
1216		if (!EmptyString(reason))
1217	<	strlcpy(reasonbuf, reason, sizeof(reasonbuf));
1217	>	strlcpy(buf, reason, sizeof(buf));
1218
1219		for (name = strtoken(&p, channel, ","); name;
1220		name = strtoken(&p,    NULL, ","))
1221	<	channel_part_one_client(source_p, name, reasonbuf);
1221	>	channel_part_one_client(source_p, name, buf);
1222		}

Diff Legend

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