ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/channel.c (file contents), Revision 1011 by michael, Fri Sep 18 10:14:09 2009 UTC vs.
ircd-hybrid/trunk/src/channel.c (file contents), Revision 3831 by michael, Wed Jun 4 21:47:26 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 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 29 | Line 29
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "hash.h"
33	+	#include "conf.h"
34		#include "hostmask.h"
35		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
36		#include "ircd.h"
37		#include "numeric.h"
38	<	#include "s_serv.h"             /* captab */
40	<	#include "s_user.h"
38	>	#include "server.h"
39		#include "send.h"
42	–	#include "s_conf.h"             /* ConfigFileEntry, ConfigChannel */
40		#include "event.h"
41		#include "memory.h"
42	<	#include "balloc.h"
42	>	#include "mempool.h"
43	>	#include "misc.h"
44	>	#include "resv.h"
45
47	–	struct config_channel_entry ConfigChannel;
48	–	dlink_list global_channel_list = { NULL, NULL, 0 };
49	–	BlockHeap *ban_heap;    /*! \todo ban_heap shouldn't be a global var */
50	–
51	–	static BlockHeap *topic_heap = NULL;
52	–	static BlockHeap *member_heap = NULL;
53	–	static BlockHeap *channel_heap = NULL;
46
47	+	dlink_list global_channel_list;
48	+	mp_pool_t *ban_pool;    /*! \todo ban_pool shouldn't be a global var */
49	+
50	+	static mp_pool_t *member_pool, *channel_pool;
51		static char buf[IRCD_BUFSIZE];
56	–	static char modebuf[MODEBUFLEN];
57	–	static char parabuf[MODEBUFLEN];
52
53
54		/*! \brief Initializes the channel blockheap, adds known channel CAPAB
55		*/
56		void
57	<	init_channels(void)
57	>	channel_init(void)
58		{
59		add_capability("EX", CAP_EX, 1);
60		add_capability("IE", CAP_IE, 1);
67	–	add_capability("CHW", CAP_CHW, 1);
61
62	<	channel_heap = BlockHeapCreate("channel", sizeof(struct Channel), CHANNEL_HEAP_SIZE);
63	<	ban_heap = BlockHeapCreate("ban", sizeof(struct Ban), BAN_HEAP_SIZE);
64	<	topic_heap = BlockHeapCreate("topic", TOPICLEN+1 + USERHOST_REPLYLEN, TOPIC_HEAP_SIZE);
72	<	member_heap = BlockHeapCreate("member", sizeof(struct Membership), CHANNEL_HEAP_SIZE*2);
62	>	channel_pool = mp_pool_new(sizeof(struct Channel), MP_CHUNK_SIZE_CHANNEL);
63	>	ban_pool = mp_pool_new(sizeof(struct Ban), MP_CHUNK_SIZE_BAN);
64	>	member_pool = mp_pool_new(sizeof(struct Membership), MP_CHUNK_SIZE_MEMBER);
65		}
66
67	<	/*! \brief adds a user to a channel by adding another link to the
67	>	/*! \brief Adds a user to a channel by adding another link to the
68		*         channels member chain.
69	<	* \param chptr      pointer to channel to add client to
70	<	* \param who        pointer to client (who) to add
71	<	* \param flags      flags for chanops etc
72	<	* \param flood_ctrl whether to count this join in flood calculations
69	>	* \param chptr      Pointer to channel to add client to
70	>	* \param who        Pointer to client (who) to add
71	>	* \param flags      Flags for chanops etc
72	>	* \param flood_ctrl Whether to count this join in flood calculations
73		*/
74		void
75		add_user_to_channel(struct Channel *chptr, struct Client *who,
#	Line 88 | Line 80 | add_user_to_channel(struct Channel *chpt
80		if (GlobalSetOptions.joinfloodtime > 0)
81		{
82		if (flood_ctrl)
83	<	chptr->number_joined++;
83	>	++chptr->number_joined;
84
85		chptr->number_joined -= (CurrentTime - chptr->last_join_time) *
86		(((float)GlobalSetOptions.joinfloodcount) /
#	Line 106 | Line 98 | add_user_to_channel(struct Channel *chpt
98		if (!IsSetJoinFloodNoticed(chptr))
99		{
100		SetJoinFloodNoticed(chptr);
101	<	sendto_realops_flags(UMODE_BOTS, L_ALL,
101	>	sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
102		"Possible Join Flooder %s on %s target: %s",
103		get_client_name(who, HIDE_IP),
104		who->servptr->name, chptr->chname);
#	Line 116 | Line 108 | add_user_to_channel(struct Channel *chpt
108		chptr->last_join_time = CurrentTime;
109		}
110
111	<	ms = BlockHeapAlloc(member_heap);
111	>	ms = mp_pool_get(member_pool);
112	>	memset(ms, 0, sizeof(*ms));
113	>
114		ms->client_p = who;
115		ms->chptr = chptr;
116		ms->flags = flags;
#	Line 125 | Line 119 | add_user_to_channel(struct Channel *chpt
119		dlinkAdd(ms, &ms->usernode, &who->channel);
120		}
121
122	<	/*! \brief deletes an user from a channel by removing a link in the
122	>	/*! \brief Deletes an user from a channel by removing a link in the
123		*         channels member chain.
124	<	* \param member pointer to Membership struct
124	>	* \param member Pointer to Membership struct
125		*/
126		void
127		remove_user_from_channel(struct Membership *member)
#	Line 138 | Line 132 | remove_user_from_channel(struct Membersh
132		dlinkDelete(&member->channode, &chptr->members);
133		dlinkDelete(&member->usernode, &client_p->channel);
134
135	<	BlockHeapFree(member_heap, member);
135	>	mp_pool_release(member);
136
137		if (chptr->members.head == NULL)
138		destroy_channel(chptr);
#	Line 152 | Line 146 | remove_user_from_channel(struct Membersh
146		*/
147		static void
148		send_members(struct Client *client_p, struct Channel *chptr,
149	<	char *lmodebuf, char *lparabuf)
149	>	char *modebuf, char *parabuf)
150		{
151	<	struct Membership *ms;
158	<	dlink_node *ptr;
151	>	const dlink_node *ptr = NULL;
152		int tlen;              /* length of text to append */
153		char *t, *start;       /* temp char pointer */
154
155	<	start = t = buf + ircsprintf(buf, ":%s SJOIN %lu %s %s %s:",
156	<	ID_or_name(&me, client_p),
157	<	(unsigned long)chptr->channelts,
165	<	chptr->chname, lmodebuf, lparabuf);
155	>	start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %lu %s %s %s:",
156	>	me.id, (unsigned long)chptr->channelts,
157	>	chptr->chname, modebuf, parabuf);
158
159		DLINK_FOREACH(ptr, chptr->members.head)
160		{
161	<	ms = ptr->data;
161	>	const struct Membership *ms = ptr->data;
162
163	<	tlen = strlen(IsCapable(client_p, CAP_TS6) ?
172	<	ID(ms->client_p) : ms->client_p->name) + 1;  /* nick + space */
163	>	tlen = strlen(ms->client_p->id) + 1;  /* nick + space */
164
165		if (ms->flags & CHFL_CHANOP)
166	<	tlen++;
167	<	#ifdef HALFOPS
168	<	else if (ms->flags & CHFL_HALFOP)
169	<	tlen++;
170	<	#endif
180	<	if (ms->flags & CHFL_VOICE)
181	<	tlen++;
166	>	++tlen;
167	>	if (ms->flags & CHFL_HALFOP)
168	>	++tlen;
169	>	ifs (ms->flags & CHFL_VOICE)
170	>	++tlen;
171
172	<	/* space will be converted into CR, but we also need space for LF..
173	<	* That's why we use '- 1' here
174	<	* -adx */
175	<	if (t + tlen - buf > sizeof(buf) - 1)
172	>	/*
173	>	* Space will be converted into CR, but we also need space for LF..
174	>	* That's why we use '- 1' here -adx
175	>	*/
176	>	if (t + tlen - buf > IRCD_BUFSIZE - 1)
177		{
178	<	*(t - 1) = '\0';  /* kill the space and terminate the string */
178	>	*(t - 1) = '\0';  /* Kill the space and terminate the string */
179		sendto_one(client_p, "%s", buf);
180		t = start;
181		}
182
183	<	if ((ms->flags & (CHFL_CHANOP | CHFL_HALFOP)))
184	<	*t++ = (!(ms->flags & CHFL_CHANOP) && IsCapable(client_p, CAP_HOPS)) ?
185	<	'%' : '@';
186	<	if ((ms->flags & CHFL_VOICE))
183	>	if (ms->flags & CHFL_CHANOP)
184	>	*t++ = '@';
185	>	if (ms->flags & CHFL_HALFOP)
186	>	*t++ = '%';
187	>	if (ms->flags & CHFL_VOICE)
188		*t++ = '+';
189
190	<	if (IsCapable(client_p, CAP_TS6))
191	<	strcpy(t, ID(ms->client_p));
201	<	else
202	<	strcpy(t, ms->client_p->name);
190	>	strcpy(t, ms->client_p->id);
191	>
192		t += strlen(t);
193		*t++ = ' ';
194		}
195
196	<	/* should always be non-NULL unless we have a kind of persistent channels */
197	<	if (chptr->members.head != NULL)
198	<	t--;  /* take the space out */
196	>	/* Should always be non-NULL unless we have a kind of persistent channels */
197	>	if (chptr->members.head)
198	>	t--;  /* Take the space out */
199		*t = '\0';
200		sendto_one(client_p, "%s", buf);
201		}
202
203	<	/*! \brief sends +b/+e/+I
204	<	* \param client_p client pointer to server
205	<	* \param chptr    pointer to channel
206	<	* \param top      pointer to top of mode link list to send
207	<	* \param flag     char flag flagging type of mode. Currently this can be 'b', e' or 'I'
203	>	/*! \brief Sends +b/+e/+I
204	>	* \param client_p Client pointer to server
205	>	* \param chptr    Pointer to channel
206	>	* \param top      Pointer to top of mode link list to send
207	>	* \param flag     Char flag flagging type of mode. Currently this can be 'b', e' or 'I'
208		*/
209		static void
210		send_mode_list(struct Client *client_p, struct Channel *chptr,
211	<	dlink_list *top, char flag)
211	>	const dlink_list *top, char flag)
212		{
213	<	int ts5 = !IsCapable(client_p, CAP_TS6);
214	<	dlink_node *lp;
215	<	struct Ban *banptr;
216	<	char pbuf[IRCD_BUFSIZE];
228	<	int tlen, mlen, cur_len, count = 0;
229	<	char *mp = NULL, *pp = pbuf;
213	>	const dlink_node *ptr = NULL;
214	>	char pbuf[IRCD_BUFSIZE] = "";
215	>	int tlen, mlen, cur_len;
216	>	char *pp = pbuf;
217
218	<	if (top == NULL || top->length == 0)
218	>	if (top->length == 0)
219		return;
220
221	<	if (ts5)
222	<	mlen = ircsprintf(buf, ":%s MODE %s +", me.name, chptr->chname);
223	<	else
237	<	mlen = ircsprintf(buf, ":%s BMASK %lu %s %c :", me.id,
238	<	(unsigned long)chptr->channelts, chptr->chname, flag);
221	>	mlen = snprintf(buf, sizeof(buf), ":%s BMASK %lu %s %c :", me.id,
222	>	(unsigned long)chptr->channelts, chptr->chname, flag);
223	>	cur_len = mlen;
224
225	<	/* MODE needs additional one byte for space between buf and pbuf */
241	<	cur_len = mlen + ts5;
242	<	mp = buf + mlen;
243	<
244	<	DLINK_FOREACH(lp, top->head)
225	>	DLINK_FOREACH(ptr, top->head)
226		{
227	<	banptr = lp->data;
227	>	const struct Ban *banptr = ptr->data;
228
229	<	/* must add another b/e/I letter if we use MODE */
249	<	tlen = banptr->len + 3 + ts5;
229	>	tlen = banptr->len + 3;
230
231		/*
232	<	* send buffer and start over if we cannot fit another ban,
232	>	* Send buffer and start over if we cannot fit another ban,
233		* or if the target is non-ts6 and we have too many modes in
234		* in this line.
235		*/
236	<	if (cur_len + (tlen - 1) > IRCD_BUFSIZE - 2 ||
257	<	(!IsCapable(client_p, CAP_TS6) &&
258	<	(count >= MAXMODEPARAMS || pp - pbuf >= MODEBUFLEN)))
236	>	if (cur_len + (tlen - 1) > IRCD_BUFSIZE - 2)
237		{
238	<	*(pp - 1) = '\0';  /* get rid of trailing space on buffer */
239	<	sendto_one(client_p, "%s%s%s", buf, ts5 ? " " : "", pbuf);
238	>	*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
239	>	sendto_one(client_p, "%s%s", buf, pbuf);
240
241	<	cur_len = mlen + ts5;
264	<	mp = buf + mlen;
241	>	cur_len = mlen;
242		pp = pbuf;
266	–	count = 0;
267	–	}
268	–
269	–	count++;
270	–	if (ts5)
271	–	{
272	–	*mp++ = flag;
273	–	*mp = '\0';
243		}
244
245	<	pp += ircsprintf(pp, "%s!%s@%s ", banptr->name, banptr->username,
246	<	banptr->host);
245	>	pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->user,
246	>	banptr->host);
247		cur_len += tlen;
248		}
249
250	<	*(pp - 1) = '\0';  /* get rid of trailing space on buffer */
251	<	sendto_one(client_p, "%s%s%s", buf, ts5 ? " " : "", pbuf);
250	>	*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
251	>	sendto_one(client_p, "%s%s", buf, pbuf);
252		}
253
254	<	/*! \brief send "client_p" a full list of the modes for channel chptr
255	<	* \param client_p pointer to client client_p
256	<	* \param chptr    pointer to channel pointer
254	>	/*! \brief Send "client_p" a full list of the modes for channel chptr
255	>	* \param client_p Pointer to client client_p
256	>	* \param chptr    Pointer to channel pointer
257		*/
258		void
259		send_channel_modes(struct Client *client_p, struct Channel *chptr)
260		{
261	<	if (chptr->chname[0] != '#')
262	<	return;
261	>	char modebuf[MODEBUFLEN] = "";
262	>	char parabuf[MODEBUFLEN] = "";
263
295	–	*modebuf = *parabuf = '\0';
264		channel_modes(chptr, client_p, modebuf, parabuf);
265		send_members(client_p, chptr, modebuf, parabuf);
266
267		send_mode_list(client_p, chptr, &chptr->banlist, 'b');
268	<
269	<	if (IsCapable(client_p, CAP_EX))
302	<	send_mode_list(client_p, chptr, &chptr->exceptlist, 'e');
303	<	if (IsCapable(client_p, CAP_IE))
304	<	send_mode_list(client_p, chptr, &chptr->invexlist, 'I');
268	>	send_mode_list(client_p, chptr, &chptr->exceptlist, 'e');
269	>	send_mode_list(client_p, chptr, &chptr->invexlist, 'I');
270		}
271
272	<	/*! \brief check channel name for invalid characters
273	<	* \param name pointer to channel name string
274	<	* \param local indicates whether it's a local or remote creation
272	>	/*! \brief Check channel name for invalid characters
273	>	* \param name Pointer to channel name string
274	>	* \param local Indicates whether it's a local or remote creation
275		* \return 0 if invalid, 1 otherwise
276		*/
277		int
278	<	check_channel_name(const char *name, int local)
278	>	check_channel_name(const char *name, const int local)
279		{
280		const char *p = name;
281	<	int max_length = local ? LOCAL_CHANNELLEN : CHANNELLEN;
281	>
282		assert(name != NULL);
283
284		if (!IsChanPrefix(*p))
#	Line 332 | Line 297 | check_channel_name(const char *name, int
297		return 0;
298		}
299
300	<	return p - name <= max_length;
300	>	return p - name <= CHANNELLEN;
301		}
302
303		void
#	Line 341 | Line 306 | remove_ban(struct Ban *bptr, dlink_list
306		dlinkDelete(&bptr->node, list);
307
308		MyFree(bptr->name);
309	<	MyFree(bptr->username);
309	>	MyFree(bptr->user);
310		MyFree(bptr->host);
311		MyFree(bptr->who);
312
313	<	BlockHeapFree(ban_heap, bptr);
313	>	mp_pool_release(bptr);
314		}
315
316		/* free_channel_list()
#	Line 357 | Line 322 | remove_ban(struct Ban *bptr, dlink_list
322		void
323		free_channel_list(dlink_list *list)
324		{
325	<	dlink_node *ptr = NULL, *next_ptr = NULL;
325	>	dlink_node *ptr = NULL, *ptr_next = NULL;
326
327	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
327	>	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
328		remove_ban(ptr->data, list);
329
330		assert(list->tail == NULL && list->head == NULL);
#	Line 367 | Line 332 | free_channel_list(dlink_list *list)
332
333		/*! \brief Get Channel block for chname (and allocate a new channel
334		*         block, if it didn't exist before)
335	<	* \param chname channel name
336	<	* \return channel block
335	>	* \param chname Channel name
336	>	* \return Channel block
337		*/
338		struct Channel *
339		make_channel(const char *chname)
#	Line 377 | Line 342 | make_channel(const char *chname)
342
343		assert(!EmptyString(chname));
344
345	<	chptr = BlockHeapAlloc(channel_heap);
345	>	chptr = mp_pool_get(channel_pool);
346	>
347	>	memset(chptr, 0, sizeof(*chptr));
348
349	<	/* doesn't hurt to set it here */
349	>	/* Doesn't hurt to set it here */
350		chptr->channelts = CurrentTime;
351		chptr->last_join_time = CurrentTime;
352
#	Line 391 | Line 358 | make_channel(const char *chname)
358		return chptr;
359		}
360
361	<	/*! \brief walk through this channel, and destroy it.
362	<	* \param chptr channel pointer
361	>	/*! \brief Walk through this channel, and destroy it.
362	>	* \param chptr Channel pointer
363		*/
364		void
365		destroy_channel(struct Channel *chptr)
#	Line 402 | Line 369 | destroy_channel(struct Channel *chptr)
369		DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->invites.head)
370		del_invite(chptr, ptr->data);
371
372	<	/* free ban/exception/invex lists */
372	>	/* Free ban/exception/invex lists */
373		free_channel_list(&chptr->banlist);
374		free_channel_list(&chptr->exceptlist);
375		free_channel_list(&chptr->invexlist);
376
410	–	/* Free the topic */
411	–	free_topic(chptr);
412	–
377		dlinkDelete(&chptr->node, &global_channel_list);
378		hash_del_channel(chptr);
379
380	<	BlockHeapFree(channel_heap, chptr);
380	>	mp_pool_release(chptr);
381		}
382
383		/*!
384	<	* \param chptr pointer to channel
385	<	* \return string pointer "=" if public, "@" if secret else "*"
384	>	* \param chptr Pointer to channel
385	>	* \return String pointer "=" if public, "@" if secret else "*"
386		*/
387		static const char *
388	<	channel_pub_or_secret(struct Channel *chptr)
388	>	channel_pub_or_secret(const struct Channel *chptr)
389		{
390		if (SecretChannel(chptr))
391		return "@";
#	Line 431 | Line 395 | channel_pub_or_secret(struct Channel *ch
395		}
396
397		/*! \brief lists all names on given channel
398	<	* \param source_p pointer to client struct requesting names
399	<	* \param chptr    pointer to channel block
400	<	* \param show_eon show ENDOFNAMES numeric or not
398	>	* \param source_p Pointer to client struct requesting names
399	>	* \param chptr    Pointer to channel block
400	>	* \param show_eon Show RPL_ENDOFNAMES numeric or not
401		*                 (don't want it with /names with no params)
402		*/
403		void
404		channel_member_names(struct Client *source_p, struct Channel *chptr,
405		int show_eon)
406		{
407	<	struct Client *target_p = NULL;
408	<	struct Membership *ms = NULL;
445	<	dlink_node *ptr = NULL;
446	<	char lbuf[IRCD_BUFSIZE + 1];
407	>	const dlink_node *ptr = NULL;
408	>	char lbuf[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 = (source_p->localClient->cap_active & CAP_MULTI_PREFIX) != 0;
412	>	int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
413	>	int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
414
415		if (PubChannel(chptr) || is_member)
416		{
417	<	t = lbuf + ircsprintf(lbuf, form_str(RPL_NAMREPLY),
418	<	me.name, source_p->name,
419	<	channel_pub_or_secret(chptr),
457	<	chptr->chname);
417	>	t = lbuf + snprintf(lbuf, sizeof(lbuf), numeric_form(RPL_NAMREPLY),
418	>	me.name, source_p->name,
419	>	channel_pub_or_secret(chptr), chptr->chname);
420		start = t;
421
422		DLINK_FOREACH(ptr, chptr->members.head)
423		{
424	<	ms       = ptr->data;
463	<	target_p = ms->client_p;
424	>	const struct Membership *ms = ptr->data;
425
426	<	if (IsInvisible(target_p) && !is_member)
426	>	if (HasUMode(ms->client_p, UMODE_INVISIBLE) && !is_member)
427		continue;
428
429	<	tlen = strlen(target_p->name) + 1;  /* nick + space */
429	>	if (!uhnames)
430	>	tlen = strlen(ms->client_p->name) + 1;  /* nick + space */
431	>	else
432	>	tlen = strlen(ms->client_p->name) + strlen(ms->client_p->username) +
433	>	strlen(ms->client_p->host) + 3;
434
435		if (!multi_prefix)
436		{
#	Line 489 | Line 454 | channel_member_names(struct Client *sour
454		t = start;
455		}
456
457	<	t += ircsprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
458	<	target_p->name);
457	>	if (!uhnames)
458	>	t += sprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
459	>	ms->client_p->name);
460	>	else
461	>	t += sprintf(t, "%s%s!%s@%s ", get_member_status(ms, multi_prefix),
462	>	ms->client_p->name, ms->client_p->username,
463	>	ms->client_p->host);
464		}
465
466	<	if (tlen != 0)
466	>	if (tlen)
467		{
468		*(t - 1) = '\0';
469		sendto_one(source_p, "%s", lbuf);
#	Line 501 | Line 471 | channel_member_names(struct Client *sour
471		}
472
473		if (show_eon)
474	<	sendto_one(source_p, form_str(RPL_ENDOFNAMES),
505	<	me.name, source_p->name, chptr->chname);
474	>	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->chname);
475		}
476
477	<	/*! \brief adds client to invite list
478	<	* \param chptr pointer to channel block
479	<	* \param who   pointer to client to add invite to
477	>	/*! \brief Adds client to invite list
478	>	* \param chptr Pointer to channel block
479	>	* \param who   Pointer to client to add invite to
480		*/
481		void
482		add_invite(struct Channel *chptr, struct Client *who)
#	Line 515 | Line 484 | add_invite(struct Channel *chptr, struct
484		del_invite(chptr, who);
485
486		/*
487	<	* delete last link in chain if the list is max length
487	>	* Delete last link in chain if the list is max length
488		*/
489		if (dlink_list_length(&who->localClient->invited) >=
490		ConfigChannel.max_chans_per_user)
491		del_invite(who->localClient->invited.tail->data, who);
492
493	<	/* add client to channel invite list */
493	>	/* Add client to channel invite list */
494		dlinkAdd(who, make_dlink_node(), &chptr->invites);
495
496	<	/* add channel to the end of the client invite list */
496	>	/* Add channel to the end of the client invite list */
497		dlinkAdd(chptr, make_dlink_node(), &who->localClient->invited);
498		}
499
500		/*! \brief Delete Invite block from channel invite list
501		*         and client invite list
502	<	* \param chptr pointer to Channel struct
503	<	* \param who   pointer to client to remove invites from
502	>	* \param chptr Pointer to Channel struct
503	>	* \param who   Pointer to client to remove invites from
504		*/
505		void
506		del_invite(struct Channel *chptr, struct Client *who)
#	Line 557 | Line 526 | del_invite(struct Channel *chptr, struct
526		* (like in get_client_name)
527		*/
528		const char *
529	<	get_member_status(const struct Membership *ms, int combine)
529	>	get_member_status(const struct Membership *ms, const int combine)
530		{
531		static char buffer[4];
532	<	char *p = NULL;
564	<
565	<	if (ms == NULL)
566	<	return "";
567	<	p = buffer;
532	>	char *p = buffer;
533
534		if (ms->flags & CHFL_CHANOP)
535		{
#	Line 573 | Line 538 | get_member_status(const struct Membershi
538		*p++ = '@';
539		}
540
576	–	#ifdef HALFOPS
541		if (ms->flags & CHFL_HALFOP)
542		{
543		if (!combine)
544		return "%";
545		*p++ = '%';
546		}
583	–	#endif
547
548		if (ms->flags & CHFL_VOICE)
549		*p++ = '+';
#	Line 590 | Line 553 | get_member_status(const struct Membershi
553		}
554
555		/*!
556	<	* \param who  pointer to Client to check
557	<	* \param list pointer to ban list to search
556	>	* \param who  Pointer to Client to check
557	>	* \param list Pointer to ban list to search
558		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
559		*
560		*/
#	Line 602 | Line 565 | find_bmask(const struct Client *who, con
565
566		DLINK_FOREACH(ptr, list->head)
567		{
568	<	struct Ban *bp = ptr->data;
568	>	const struct Ban *bp = ptr->data;
569
570	<	if (match(bp->name, who->name) && match(bp->username, who->username))
570	>	if (!match(bp->name, who->name) && !match(bp->user, who->username))
571		{
572		switch (bp->type)
573		{
574		case HM_HOST:
575	<	if (match(bp->host, who->host) || match(bp->host, who->sockhost))
575	>	if (!match(bp->host, who->host) || !match(bp->host, who->sockhost))
576		return 1;
577		break;
578		case HM_IPV4:
#	Line 634 | Line 597 | find_bmask(const struct Client *who, con
597		}
598
599		/*!
600	<	* \param chptr pointer to channel block
601	<	* \param who   pointer to client to check access fo
600	>	* \param chptr Pointer to channel block
601	>	* \param who   Pointer to client to check access fo
602		* \return 0 if not banned, 1 otherwise
603		*/
604		int
605	<	is_banned(struct Channel *chptr, struct Client *who)
605	>	is_banned(const struct Channel *chptr, const struct Client *who)
606		{
607		if (find_bmask(who, &chptr->banlist))
608	<	if (!ConfigChannel.use_except || !find_bmask(who, &chptr->exceptlist))
608	>	if (!find_bmask(who, &chptr->exceptlist))
609		return 1;
610
611		return 0;
612		}
613
614	<	/*!
615	<	* \param source_p pointer to client attempting to join
616	<	* \param chptr    pointer to channel
617	<	* \param key      key sent by client attempting to join if present
614	>	/*! Tests if a client can join a certain channel
615	>	* \param source_p Pointer to client attempting to join
616	>	* \param chptr    Pointer to channel
617	>	* \param key      Key sent by client attempting to join if present
618		* \return ERR_BANNEDFROMCHAN, ERR_INVITEONLYCHAN, ERR_CHANNELISFULL
619		*         or 0 if allowed to join.
620		*/
621		int
622		can_join(struct Client *source_p, struct Channel *chptr, const char *key)
623		{
624	<	if (is_banned(chptr, source_p))
625	<	return ERR_BANNEDFROMCHAN;
624	>	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
625	>	return ERR_SSLONLYCHAN;
626	>
627	>	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(source_p, UMODE_REGISTERED))
628	>	return ERR_NEEDREGGEDNICK;
629	>
630	>	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(source_p, UMODE_OPER))
631	>	return ERR_OPERONLYCHAN;
632
633		if (chptr->mode.mode & MODE_INVITEONLY)
634		if (!dlinkFind(&source_p->localClient->invited, chptr))
635	<	if (!ConfigChannel.use_invex || !find_bmask(source_p, &chptr->invexlist))
635	>	if (!find_bmask(source_p, &chptr->invexlist))
636		return ERR_INVITEONLYCHAN;
637
638	<	if (chptr->mode.key[0] && (!key || irccmp(chptr->mode.key, key)))
638	>	if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
639		return ERR_BADCHANNELKEY;
640
641		if (chptr->mode.limit && dlink_list_length(&chptr->members) >=
642		chptr->mode.limit)
643		return ERR_CHANNELISFULL;
644
645	+	if (is_banned(chptr, source_p))
646	+	return ERR_BANNEDFROMCHAN;
647	+
648		return 0;
649		}
650
651		int
652	<	has_member_flags(struct Membership *ms, unsigned int flags)
652	>	has_member_flags(const struct Membership *ms, const unsigned int flags)
653		{
654	<	if (ms != NULL)
683	<	return ms->flags & flags;
684	<	return 0;
654	>	return ms && (ms->flags & flags);
655		}
656
657		struct Membership *
#	Line 692 | Line 662 | find_channel_link(struct Client *client_
662		if (!IsClient(client_p))
663		return NULL;
664
665	<	DLINK_FOREACH(ptr, client_p->channel.head)
666	<	if (((struct Membership *)ptr->data)->chptr == chptr)
667	<	return (struct Membership *)ptr->data;
665	>	if (dlink_list_length(&chptr->members) < dlink_list_length(&client_p->channel))
666	>	{
667	>	DLINK_FOREACH(ptr, chptr->members.head)
668	>	if (((struct Membership *)ptr->data)->client_p == client_p)
669	>	return ptr->data;
670	>	}
671	>	else
672	>	{
673	>	DLINK_FOREACH(ptr, client_p->channel.head)
674	>	if (((struct Membership *)ptr->data)->chptr == chptr)
675	>	return ptr->data;
676	>	}
677
678		return NULL;
679		}
680
681	<	/*!
682	<	* \param chptr    pointer to Channel struct
683	<	* \param source_p pointer to Client struct
684	<	* \param ms       pointer to Membership struct (can be NULL)
681	>	/*
682	>	* Basically the same functionality as in bahamut
683	>	*/
684	>	static int
685	>	msg_has_ctrls(const char *message)
686	>	{
687	>	const unsigned char *p = (const unsigned char *)message;
688	>
689	>	for (; *p; ++p)
690	>	{
691	>	if (*p > 31 || *p == 1)
692	>	continue;
693	>
694	>	if (*p == 27)
695	>	{
696	>	if (*(p + 1) == '$' ||
697	>	*(p + 1) == '(')
698	>	{
699	>	++p;
700	>	continue;
701	>	}
702	>	}
703	>
704	>	return 1;
705	>	}
706	>
707	>	return 0;
708	>	}
709	>
710	>	/*! Tests if a client can send to a channel
711	>	* \param chptr    Pointer to Channel struct
712	>	* \param source_p Pointer to Client struct
713	>	* \param ms       Pointer to Membership struct (can be NULL)
714	>	* \param message  The actual message string the client wants to send
715		* \return CAN_SEND_OPV if op or voiced on channel\n
716		*         CAN_SEND_NONOP if can send to channel but is not an op\n
717	<	*         CAN_SEND_NO if they cannot send to channel\n
717	>	*         ERR_CANNOTSENDTOCHAN or ERR_NEEDREGGEDNICK if they cannot send to channel\n
718		*/
719		int
720	<	can_send(struct Channel *chptr, struct Client *source_p, struct Membership *ms)
720	>	can_send(struct Channel *chptr, struct Client *source_p,
721	>	struct Membership *ms, const char *message)
722		{
723	<	if (IsServer(source_p))
723	>	struct MaskItem *conf = NULL;
724	>
725	>	if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
726		return CAN_SEND_OPV;
727
728		if (MyClient(source_p) && !IsExemptResv(source_p))
729	<	if (!(IsOper(source_p) && ConfigFileEntry.oper_pass_resv))
730	<	if (!hash_find_resv(chptr->chname) == ConfigChannel.restrict_channels)
731	<	return CAN_SEND_NO;
732	<
733	<	if (ms != NULL || (ms = find_channel_link(source_p, chptr)))
734	<	{
729	>	if (!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv))
730	>	if ((conf = match_find_resv(chptr->chname)) && !resv_find_exempt(source_p, conf))
731	>	return ERR_CANNOTSENDTOCHAN;
732	>
733	>	if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
734	>	return ERR_NOCTRLSONCHAN;
735	>	if (ms || (ms = find_channel_link(source_p, chptr)))
736		if (ms->flags & (CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE))
737		return CAN_SEND_OPV;
738	+	if (!ms && (chptr->mode.mode & MODE_NOPRIVMSGS))
739	+	return ERR_CANNOTSENDTOCHAN;
740	+	if (chptr->mode.mode & MODE_MODERATED)
741	+	return ERR_CANNOTSENDTOCHAN;
742	+	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
743	+	return ERR_NEEDREGGEDNICK;
744
745	<	/* cache can send if quiet_on_ban and banned */
746	<	if (ConfigChannel.quiet_on_ban && MyClient(source_p))
745	>	/* Cache can send if banned */
746	>	if (MyClient(source_p))
747	>	{
748	>	if (ms)
749		{
750		if (ms->flags & CHFL_BAN_SILENCED)
751	<	return CAN_SEND_NO;
751	>	return ERR_CANNOTSENDTOCHAN;
752
753		if (!(ms->flags & CHFL_BAN_CHECKED))
754		{
755		if (is_banned(chptr, source_p))
756		{
757		ms->flags |= (CHFL_BAN_CHECKED|CHFL_BAN_SILENCED);
758	<	return CAN_SEND_NO;
758	>	return ERR_CANNOTSENDTOCHAN;
759		}
760
761		ms->flags |= CHFL_BAN_CHECKED;
762		}
763		}
764	+	else if (is_banned(chptr, source_p))
765	+	return ERR_CANNOTSENDTOCHAN;
766		}
744	–	else if (chptr->mode.mode & MODE_NOPRIVMSGS)
745	–	return CAN_SEND_NO;
746	–
747	–	if (chptr->mode.mode & MODE_MODERATED)
748	–	return CAN_SEND_NO;
767
768		return CAN_SEND_NONOP;
769		}
#	Line 753 | Line 771 | can_send(struct Channel *chptr, struct C
771		/*! \brief Updates the client's oper_warn_count_down, warns the
772		*         IRC operators if necessary, and updates
773		*         join_leave_countdown as needed.
774	<	* \param source_p pointer to struct Client to check
775	<	* \param name     channel name or NULL if this is a part.
774	>	* \param source_p Pointer to struct Client to check
775	>	* \param name     Channel name or NULL if this is a part.
776		*/
777		void
778		check_spambot_warning(struct Client *source_p, const char *name)
#	Line 773 | Line 791 | check_spambot_warning(struct Client *sou
791
792		if (source_p->localClient->oper_warn_count_down == 0)
793		{
794	<	/* Its already known as a possible spambot */
795	<	if (name != NULL)
796	<	sendto_realops_flags(UMODE_BOTS, L_ALL,
794	>	/* It's already known as a possible spambot */
795	>	if (name)
796	>	sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
797		"User %s (%s@%s) trying to join %s is a possible spambot",
798		source_p->name, source_p->username,
799		source_p->host, name);
800		else
801	<	sendto_realops_flags(UMODE_BOTS, L_ALL,
801	>	sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
802		"User %s (%s@%s) is a possible spambot",
803		source_p->name, source_p->username,
804		source_p->host);
#	Line 802 | Line 820 | check_spambot_warning(struct Client *sou
820		{
821		if ((CurrentTime - (source_p->localClient->last_join_time)) <
822		GlobalSetOptions.spam_time)
823	<	{
806	<	/* oh, its a possible spambot */
807	<	source_p->localClient->join_leave_count++;
808	<	}
823	>	source_p->localClient->join_leave_count++;  /* It's a possible spambot */
824		}
825
826	<	if (name != NULL)
826	>	if (name)
827		source_p->localClient->last_join_time = CurrentTime;
828		else
829		source_p->localClient->last_leave_time = CurrentTime;
830		}
831		}
832
833	<	/*! \brief compares usercount and servercount against their split
833	>	/*! \brief Compares usercount and servercount against their split
834		*         values and adjusts splitmode accordingly
835		* \param unused Unused address pointer
836		*/
#	Line 831 | Line 846 | check_splitmode(void *unused)
846		{
847		splitmode = 1;
848
849	<	sendto_realops_flags(UMODE_ALL,L_ALL,
849	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
850		"Network split, activating splitmode");
851		eventAddIsh("check_splitmode", check_splitmode, NULL, 10);
852		}
#	Line 839 | Line 854 | check_splitmode(void *unused)
854		{
855		splitmode = 0;
856
857	<	sendto_realops_flags(UMODE_ALL, L_ALL,
857	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
858		"Network rejoined, deactivating splitmode");
859		eventDelete(check_splitmode, NULL);
860		}
861		}
862		}
863
864	<	/*! \brief Allocates a new topic
850	<	* \param chptr Channel to allocate a new topic for
851	<	*/
852	<	static void
853	<	allocate_topic(struct Channel *chptr)
854	<	{
855	<	void *ptr = NULL;
856	<
857	<	if (chptr == NULL)
858	<	return;
859	<
860	<	ptr = BlockHeapAlloc(topic_heap);
861	<
862	<	/* Basically we allocate one large block for the topic and
863	<	* the topic info.  We then split it up into two and shove it
864	<	* in the chptr
865	<	*/
866	<	chptr->topic       = ptr;
867	<	chptr->topic_info  = (char *)ptr + TOPICLEN+1;
868	<	*chptr->topic      = '\0';
869	<	*chptr->topic_info = '\0';
870	<	}
871	<
872	<	void
873	<	free_topic(struct Channel *chptr)
874	<	{
875	<	void *ptr = NULL;
876	<	assert(chptr);
877	<	if (chptr->topic == NULL)
878	<	return;
879	<
880	<	/*
881	<	* If you change allocate_topic you MUST change this as well
882	<	*/
883	<	ptr = chptr->topic;
884	<	BlockHeapFree(topic_heap, ptr);
885	<	chptr->topic      = NULL;
886	<	chptr->topic_info = NULL;
887	<	}
888	<
889	<	/*! \brief Sets the channel topic for chptr
864	>	/*! \brief Sets the channel topic for a certain channel
865		* \param chptr      Pointer to struct Channel
866		* \param topic      The topic string
867		* \param topic_info n!u\@h formatted string of the topic setter
868	<	* \param topicts    timestamp on the topic
868	>	* \param topicts    Timestamp on the topic
869	>	* \param local      Whether the topic is set by a local client
870		*/
871		void
872		set_channel_topic(struct Channel *chptr, const char *topic,
873	<	const char *topic_info, time_t topicts)
873	>	const char *topic_info, time_t topicts, int local)
874		{
875	<	if (!EmptyString(topic))
876	<	{
901	<	if (chptr->topic == NULL)
902	<	allocate_topic(chptr);
903	<
904	<	strlcpy(chptr->topic, topic, TOPICLEN+1);
905	<	strlcpy(chptr->topic_info, topic_info, USERHOST_REPLYLEN);
906	<	chptr->topic_time = topicts;
907	<	}
875	>	if (local)
876	>	strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ServerInfo.max_topic_length + 1));
877		else
878	<	{
879	<	/*
880	<	* Do not reset chptr->topic_time here, it's required for
881	<	* bursting topics properly.
913	<	*/
914	<	if (chptr->topic != NULL)
915	<	free_topic(chptr);
916	<	}
878	>	strlcpy(chptr->topic, topic, sizeof(chptr->topic));
879	>
880	>	strlcpy(chptr->topic_info, topic_info, sizeof(chptr->topic_info));
881	>	chptr->topic_time = topicts;
882		}

Diff Legend

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